577 files changed, 46531 insertions, 46381 deletions

diff --git a/android/sdl_android/src/androidTest/AndroidManifest.xml b/android/sdl_android/src/androidTest/AndroidManifest.xml
index 28ba9d76e..203bf840b 100644
--- a/android/sdl_android/src/androidTest/AndroidManifest.xml
+++ b/android/sdl_android/src/androidTest/AndroidManifest.xml
@@ -1,17 +1,19 @@
-<manifest package="com.smartdevicelink" xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="16"/>
-        <uses-permission android:name="android.permission.BLUETOOTH" />
+<manifest package="com.smartdevicelink"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-sdk android:minSdkVersion="16" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
     <!-- Required to pair Bluetooth devices -->
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- Required to check if WiFi is enabled -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    
+
     <instrumentation
-    android:name="android.test.InstrumentationTestRunner"
-    android:targetPackage="com.smartdevicelink.test" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    
+        android:name="android.test.InstrumentationTestRunner"
+        android:targetPackage="com.smartdevicelink.test" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
     </application>
diff --git a/android/sdl_android/src/androidTest/assets/json/AddCommand.json b/android/sdl_android/src/androidTest/assets/json/AddCommand.json
index c6567e966..c8dfe5267 100644
--- a/android/sdl_android/src/androidTest/assets/json/AddCommand.json
+++ b/android/sdl_android/src/androidTest/assets/json/AddCommand.json
@@ -1,27 +1,27 @@
 {
-  "request":{
-    "name":"AddCommand",
-    "correlationID":105,
-    "parameters":{
-      "cmdID":1098,
-      "vrCommands":[
+  "request": {
+    "name": "AddCommand",
+    "correlationID": 105,
+    "parameters": {
+      "cmdID": 1098,
+      "vrCommands": [
         "vr1",
         "vr2",
         "vr3"
       ],
-      "cmdIcon":{
-        "value":"cmdImage1.png",
-        "imageType":"DYNAMIC"
+      "cmdIcon": {
+        "value": "cmdImage1.png",
+        "imageType": "DYNAMIC"
       },
-      "menuParams":{
-        "parentID":194,
-        "position":1,
-        "menuName":"My Command"
+      "menuParams": {
+        "parentID": 194,
+        "position": 1,
+        "menuName": "My Command"
       }
     }
   },
-  "response":{
-    "name":"AddCommandResponse",
-    "correlationID":106
+  "response": {
+    "name": "AddCommandResponse",
+    "correlationID": 106
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/AddSubMenu.json b/android/sdl_android/src/androidTest/assets/json/AddSubMenu.json
index 37cc46adb..9b5cbd11b 100644
--- a/android/sdl_android/src/androidTest/assets/json/AddSubMenu.json
+++ b/android/sdl_android/src/androidTest/assets/json/AddSubMenu.json
@@ -1,19 +1,19 @@
 {
-	"request":{
-		"name":"AddSubMenu",
-    "correlationID":107,
-    "parameters":{
-    	"menuID":765,
-    	"position":2,
-    	"menuName":"Menu Name",
-    	"menuIcon":{
-    		"value":"cmdImage1.png",
-    		"imageType":"DYNAMIC"
-    	}
+  "request": {
+    "name": "AddSubMenu",
+    "correlationID": 107,
+    "parameters": {
+      "menuID": 765,
+      "position": 2,
+      "menuName": "Menu Name",
+      "menuIcon": {
+        "value": "cmdImage1.png",
+        "imageType": "DYNAMIC"
+      }
     }
-	},
-	"response":{
-		"name":"AddSubMenuResponse",
-		"correlationID":108
-	}
+  },
+  "response": {
+    "name": "AddSubMenuResponse",
+    "correlationID": 108
+  }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/Alert.json b/android/sdl_android/src/androidTest/assets/json/Alert.json
index 75ff2ca50..70b1fcbe9 100644
--- a/android/sdl_android/src/androidTest/assets/json/Alert.json
+++ b/android/sdl_android/src/androidTest/assets/json/Alert.json
@@ -1,60 +1,60 @@
 {
-	"request":{
-		"name":"Alert",
-		"correlationID":109,
-		"parameters":{
-			"playTone":true,
-			"duration":500,
-			"alertText1":"Line 1",
-			"alertText2":"Line 2",
-			"alertText3":"Line 3",
-			"progressIndicator":true,
-			"cancelID":45,
-			"alertIcon":{
-				"value":"alertIconImage1.png",
-				"imageType":"DYNAMIC"
-			},
-			"ttsChunks":[
-				{
-					"text":"Phrase 1",
-					"type":"TEXT"
-				},
-				{
-					"text":"Phrase 2",
-					"type":"TEXT"
-				}
-			],
-			"softButtons":[
-				{
-					"isHighlighted":true,
-					"softButtonID":6,
-					"systemAction":"STEAL_FOCUS",
-					"text":"Button 1",
-					"type":"IMAGE",
-					"image":{
-						"value":"image.png",
-						"imageType":"STATIC"
-					}
-				},
-				{
-					"isHighlighted":false,
-					"softButtonID":3,
-					"systemAction":"DEFAULT_ACTION",
-					"text":"Button 2",
-					"type":"BOTH",
-					"image":{
-						"value":"image.png",
-						"imageType":"DYNAMIC"
-					}
-				}
-			]
-		}
-	},
-	"response":{
-		"name":"AlertResponse",
-		"correlationID":110,
-		"parameters":{
-			"tryAgainTime":400
-		}
-	}
+  "request": {
+    "name": "Alert",
+    "correlationID": 109,
+    "parameters": {
+      "playTone": true,
+      "duration": 500,
+      "alertText1": "Line 1",
+      "alertText2": "Line 2",
+      "alertText3": "Line 3",
+      "progressIndicator": true,
+      "cancelID": 45,
+      "alertIcon": {
+        "value": "alertIconImage1.png",
+        "imageType": "DYNAMIC"
+      },
+      "ttsChunks": [
+        {
+          "text": "Phrase 1",
+          "type": "TEXT"
+        },
+        {
+          "text": "Phrase 2",
+          "type": "TEXT"
+        }
+      ],
+      "softButtons": [
+        {
+          "isHighlighted": true,
+          "softButtonID": 6,
+          "systemAction": "STEAL_FOCUS",
+          "text": "Button 1",
+          "type": "IMAGE",
+          "image": {
+            "value": "image.png",
+            "imageType": "STATIC"
+          }
+        },
+        {
+          "isHighlighted": false,
+          "softButtonID": 3,
+          "systemAction": "DEFAULT_ACTION",
+          "text": "Button 2",
+          "type": "BOTH",
+          "image": {
+            "value": "image.png",
+            "imageType": "DYNAMIC"
+          }
+        }
+      ]
+    }
+  },
+  "response": {
+    "name": "AlertResponse",
+    "correlationID": 110,
+    "parameters": {
+      "tryAgainTime": 400
+    }
+  }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/AlertManeuver.json b/android/sdl_android/src/androidTest/assets/json/AlertManeuver.json
index 4099f80b0..1c07ae98b 100644
--- a/android/sdl_android/src/androidTest/assets/json/AlertManeuver.json
+++ b/android/sdl_android/src/androidTest/assets/json/AlertManeuver.json
@@ -1,46 +1,46 @@
 {
-  "request":{
-    "name":"AlertManeuver",
-    "correlationID":194,
-    "parameters":{
-      "ttsChunks":[
+  "request": {
+    "name": "AlertManeuver",
+    "correlationID": 194,
+    "parameters": {
+      "ttsChunks": [
         {
-          "text":"Phrase 1",
-          "type":"TEXT"
+          "text": "Phrase 1",
+          "type": "TEXT"
         },
         {
-          "text":"Phrase 2",
-          "type":"TEXT"
+          "text": "Phrase 2",
+          "type": "TEXT"
         }
       ],
-      "softButtons":[
+      "softButtons": [
         {
-          "isHighlighted":true,
-          "softButtonID":6,
-          "systemAction":"STEAL_FOCUS",
-          "text":"Button 1",
-          "type":"IMAGE",
-          "image":{
-            "value":"image.png",
-            "imageType":"STATIC"
+          "isHighlighted": true,
+          "softButtonID": 6,
+          "systemAction": "STEAL_FOCUS",
+          "text": "Button 1",
+          "type": "IMAGE",
+          "image": {
+            "value": "image.png",
+            "imageType": "STATIC"
           }
         },
         {
-          "isHighlighted":false,
-          "softButtonID":3,
-          "systemAction":"DEFAULT_ACTION",
-          "text":"Button 2",
-          "type":"BOTH",
-          "image":{
-            "value":"image.png",
-            "imageType":"DYNAMIC"
+          "isHighlighted": false,
+          "softButtonID": 3,
+          "systemAction": "DEFAULT_ACTION",
+          "text": "Button 2",
+          "type": "BOTH",
+          "image": {
+            "value": "image.png",
+            "imageType": "DYNAMIC"
           }
         }
       ]
     }
   },
-  "response":{
-    "name":"AlertManeuverResponse",
-    "correlationID":195
+  "response": {
+    "name": "AlertManeuverResponse",
+    "correlationID": 195
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/ButtonPress.json b/android/sdl_android/src/androidTest/assets/json/ButtonPress.json
index e74e857be..dcbecfa08 100644
--- a/android/sdl_android/src/androidTest/assets/json/ButtonPress.json
+++ b/android/sdl_android/src/androidTest/assets/json/ButtonPress.json
@@ -1,15 +1,15 @@
 {
-  "request":{
-    "name":"ButtonPress",
-    "correlationID":215,
-    "parameters":{
-      "buttonName":"OK",
-      "buttonPressMode":"LONG",
-      "moduleType":"CLIMATE"
+  "request": {
+    "name": "ButtonPress",
+    "correlationID": 215,
+    "parameters": {
+      "buttonName": "OK",
+      "buttonPressMode": "LONG",
+      "moduleType": "CLIMATE"
     }
   },
-  "response":{
-    "name":"ButtonPressResponse",
-    "correlationID":216
+  "response": {
+    "name": "ButtonPressResponse",
+    "correlationID": 216
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/CancelInteraction.json b/android/sdl_android/src/androidTest/assets/json/CancelInteraction.json
index dc420ad8f..db7c641f2 100644
--- a/android/sdl_android/src/androidTest/assets/json/CancelInteraction.json
+++ b/android/sdl_android/src/androidTest/assets/json/CancelInteraction.json
@@ -1,14 +1,14 @@
 {
-  "request":{
-    "name":"CancelInteraction",
-    "correlationID":554,
-    "parameters":{
-      "cancelID":6052,
-      "functionID":12
+  "request": {
+    "name": "CancelInteraction",
+    "correlationID": 554,
+    "parameters": {
+      "cancelID": 6052,
+      "functionID": 12
     }
   },
-  "response":{
-    "name":"CancelInteractionResponse",
-    "correlationID":554
+  "response": {
+    "name": "CancelInteractionResponse",
+    "correlationID": 554
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/ChangeRegistration.json b/android/sdl_android/src/androidTest/assets/json/ChangeRegistration.json
index ceb93ccd3..fa08a6fea 100644
--- a/android/sdl_android/src/androidTest/assets/json/ChangeRegistration.json
+++ b/android/sdl_android/src/androidTest/assets/json/ChangeRegistration.json
@@ -1,14 +1,14 @@
 {
- "request":{
-    "name":"ChangeRegistration",
-    "correlationID":111,
-    "parameters":{
-    	"language":"ES-ES",
-    	"hmiDisplayLanguage":"EN-US"
+  "request": {
+    "name": "ChangeRegistration",
+    "correlationID": 111,
+    "parameters": {
+      "language": "ES-ES",
+      "hmiDisplayLanguage": "EN-US"
     }
   },
-  "response":{
-    "name":"ChangeRegistrationResponse",
-    "correlationID":112
+  "response": {
+    "name": "ChangeRegistrationResponse",
+    "correlationID": 112
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/CloseApplication.json b/android/sdl_android/src/androidTest/assets/json/CloseApplication.json
index d58666311..5424240ce 100644
--- a/android/sdl_android/src/androidTest/assets/json/CloseApplication.json
+++ b/android/sdl_android/src/androidTest/assets/json/CloseApplication.json
@@ -1,11 +1,11 @@
 {
-  "request":{
-    "name":"CloseApplication",
-    "correlationID":131
+  "request": {
+    "name": "CloseApplication",
+    "correlationID": 131
   },
-  "response":{
-    "name":"CloseApplicationResponse",
-    "correlationID":131,
-    "parameters":{}
+  "response": {
+    "name": "CloseApplicationResponse",
+    "correlationID": 131,
+    "parameters": {}
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/CreateInteractionChoiceSet.json b/android/sdl_android/src/androidTest/assets/json/CreateInteractionChoiceSet.json
index 6f01500db..9dbcac3d1 100644
--- a/android/sdl_android/src/androidTest/assets/json/CreateInteractionChoiceSet.json
+++ b/android/sdl_android/src/androidTest/assets/json/CreateInteractionChoiceSet.json
@@ -1,19 +1,19 @@
 {
- "request":{
-    "name":"CreateInteractionChoiceSet",
-    "correlationID":113,
-    "parameters":{
-      "interactionChoiceSetID":56,
-      "choiceSet":[
+  "request": {
+    "name": "CreateInteractionChoiceSet",
+    "correlationID": 113,
+    "parameters": {
+      "interactionChoiceSetID": 56,
+      "choiceSet": [
         {
-          "secondaryText":"Secondary Text",
-          "tertiaryText":"Tertiary Text",
-          "secondaryImage":{
-            "value":"lessImportantImage.png",
-            "imageType":"STATIC"
+          "secondaryText": "Secondary Text",
+          "tertiaryText": "Tertiary Text",
+          "secondaryImage": {
+            "value": "lessImportantImage.png",
+            "imageType": "STATIC"
           },
-          "menuName":"Menu Name",
-          "vrCommands":[
+          "menuName": "Menu Name",
+          "vrCommands": [
             "vr1",
             "vr2",
             "vr3",
@@ -22,21 +22,21 @@
             "vr6",
             "vr7"
           ],
-          "choiceID":1,
-          "image":{
-            "value":"image.png",
-            "imageType":"DYNAMIC"
+          "choiceID": 1,
+          "image": {
+            "value": "image.png",
+            "imageType": "DYNAMIC"
           }
         },
         {
-          "secondaryText":"Secondary Text 2",
-          "tertiaryText":"Tertiary Text 2",
-          "secondaryImage":{
-            "value":"evenLessImportantImage.png",
-            "imageType":"STATIC"
+          "secondaryText": "Secondary Text 2",
+          "tertiaryText": "Tertiary Text 2",
+          "secondaryImage": {
+            "value": "evenLessImportantImage.png",
+            "imageType": "STATIC"
           },
-          "menuName":"Menu Name 2",
-          "vrCommands":[
+          "menuName": "Menu Name 2",
+          "vrCommands": [
             "vr1",
             "vr2",
             "vr3",
@@ -45,17 +45,17 @@
             "vr6",
             "vr7"
           ],
-          "choiceID":2,
-          "image":{
-            "value":"image.png",
-            "imageType":"DYNAMIC"
+          "choiceID": 2,
+          "image": {
+            "value": "image.png",
+            "imageType": "DYNAMIC"
           }
         }
       ]
     }
   },
-  "response":{
-    "name":"CreateInteractionChoiceSetResponse",
-    "correlationID":114
+  "response": {
+    "name": "CreateInteractionChoiceSetResponse",
+    "correlationID": 114
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/CreateWindow.json b/android/sdl_android/src/androidTest/assets/json/CreateWindow.json
index 6322b5250..fc0ac9093 100644
--- a/android/sdl_android/src/androidTest/assets/json/CreateWindow.json
+++ b/android/sdl_android/src/androidTest/assets/json/CreateWindow.json
@@ -1,17 +1,17 @@
 {
-  "request":{
-    "name":"CreateWindow",
-    "correlationID":107,
-    "parameters":{
-    	"windowID":765,
-    	"windowName":"Window Name",
-    	"type": "MAIN",
-    	"associatedServiceType":"Service Type",
-    	"duplicateUpdatesFromWindowID":766
-	}
+  "request": {
+    "name": "CreateWindow",
+    "correlationID": 107,
+    "parameters": {
+      "windowID": 765,
+      "windowName": "Window Name",
+      "type": "MAIN",
+      "associatedServiceType": "Service Type",
+      "duplicateUpdatesFromWindowID": 766
+    }
   },
-  "response":{
-    "name":"CreateWindowResponse",
-    "correlationID":108
+  "response": {
+    "name": "CreateWindowResponse",
+    "correlationID": 108
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/DeleteCommand.json b/android/sdl_android/src/androidTest/assets/json/DeleteCommand.json
index cba061a03..922e58f0b 100644
--- a/android/sdl_android/src/androidTest/assets/json/DeleteCommand.json
+++ b/android/sdl_android/src/androidTest/assets/json/DeleteCommand.json
@@ -1,13 +1,13 @@
 {
-  "request":{
-    "name":"DeleteCommand",
-    "correlationID":115,
-    "parameters":{
-    	"cmdID":34
-		}
+  "request": {
+    "name": "DeleteCommand",
+    "correlationID": 115,
+    "parameters": {
+      "cmdID": 34
+    }
   },
-  "response":{
-    "name":"DeleteCommandResponse",
-    "correlationID":116
+  "response": {
+    "name": "DeleteCommandResponse",
+    "correlationID": 116
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/DeleteFile.json b/android/sdl_android/src/androidTest/assets/json/DeleteFile.json
index ed3ff0cdc..712f505e3 100644
--- a/android/sdl_android/src/androidTest/assets/json/DeleteFile.json
+++ b/android/sdl_android/src/androidTest/assets/json/DeleteFile.json
@@ -1,16 +1,16 @@
 {
-  "request":{
-    "name":"DeleteFile",
-    "correlationID":117,
-    "parameters":{
-      "syncFileName":"fileName.file"
-		}
+  "request": {
+    "name": "DeleteFile",
+    "correlationID": 117,
+    "parameters": {
+      "syncFileName": "fileName.file"
+    }
   },
-  "response":{
-    "name":"DeleteFileResponse",
-    "correlationID":118,
-    "parameters":{
-      "spaceAvailable":2345678
+  "response": {
+    "name": "DeleteFileResponse",
+    "correlationID": 118,
+    "parameters": {
+      "spaceAvailable": 2345678
     }
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/DeleteInteractionChoiceSet.json b/android/sdl_android/src/androidTest/assets/json/DeleteInteractionChoiceSet.json
index 60f9a6c61..68bd3405f 100644
--- a/android/sdl_android/src/androidTest/assets/json/DeleteInteractionChoiceSet.json
+++ b/android/sdl_android/src/androidTest/assets/json/DeleteInteractionChoiceSet.json
@@ -1,13 +1,13 @@
 {
- "request":{
-    "name":"DeleteInteractionChoiceSet",
-    "correlationID":119,
-    "parameters":{
-      "interactionChoiceSetID":56
+  "request": {
+    "name": "DeleteInteractionChoiceSet",
+    "correlationID": 119,
+    "parameters": {
+      "interactionChoiceSetID": 56
     }
   },
-  "response":{
-    "name":"DeleteInteractionChoiceSetResponse",
-    "correlationID":120
+  "response": {
+    "name": "DeleteInteractionChoiceSetResponse",
+    "correlationID": 120
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/DeleteSubMenu.json b/android/sdl_android/src/androidTest/assets/json/DeleteSubMenu.json
index c31eb189d..7cebf113d 100644
--- a/android/sdl_android/src/androidTest/assets/json/DeleteSubMenu.json
+++ b/android/sdl_android/src/androidTest/assets/json/DeleteSubMenu.json
@@ -1,13 +1,13 @@
 {
-  "request":{
-    "name":"DeleteSubMenu",
-    "correlationID":121,
-    "parameters":{
-      "menuID":765
+  "request": {
+    "name": "DeleteSubMenu",
+    "correlationID": 121,
+    "parameters": {
+      "menuID": 765
     }
   },
-  "response":{
-    "name":"AddCommandResponse",
-    "correlationID":122
+  "response": {
+    "name": "AddCommandResponse",
+    "correlationID": 122
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/DeleteWindow.json b/android/sdl_android/src/androidTest/assets/json/DeleteWindow.json
index 69b9013b1..9c0733593 100644
--- a/android/sdl_android/src/androidTest/assets/json/DeleteWindow.json
+++ b/android/sdl_android/src/androidTest/assets/json/DeleteWindow.json
@@ -1,13 +1,13 @@
 {
-  "request":{
-    "name":"DeleteWindow",
-    "correlationID":109,
-    "parameters":{
-    	"windowID":765
-	}
+  "request": {
+    "name": "DeleteWindow",
+    "correlationID": 109,
+    "parameters": {
+      "windowID": 765
+    }
   },
-  "response":{
-    "name":"DeleteWindowResponse",
-    "correlationID":110
+  "response": {
+    "name": "DeleteWindowResponse",
+    "correlationID": 110
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/DiagnosticMessage.json b/android/sdl_android/src/androidTest/assets/json/DiagnosticMessage.json
index ff5e4a92d..d20eb021e 100644
--- a/android/sdl_android/src/androidTest/assets/json/DiagnosticMessage.json
+++ b/android/sdl_android/src/androidTest/assets/json/DiagnosticMessage.json
@@ -1,11 +1,11 @@
 {
-  "request":{
-    "name":"DiagnosticMessage",
-    "correlationID":123,
-    "parameters":{
-      "targetID":46,
-      "messageLength":231,
-      "messageData":[
+  "request": {
+    "name": "DiagnosticMessage",
+    "correlationID": 123,
+    "parameters": {
+      "targetID": 46,
+      "messageLength": 231,
+      "messageData": [
         33245,
         23456,
         234,
@@ -16,11 +16,11 @@
       ]
     }
   },
-  "response":{
-    "name":"DiagnosticMessageResponse",
-    "correlationID":124,
-    "parameters":{
-      "messageDataResult":[
+  "response": {
+    "name": "DiagnosticMessageResponse",
+    "correlationID": 124,
+    "parameters": {
+      "messageDataResult": [
         33245,
         23456,
         234,
diff --git a/android/sdl_android/src/androidTest/assets/json/DialNumber.json b/android/sdl_android/src/androidTest/assets/json/DialNumber.json
index cb79aad84..34ad2501a 100644
--- a/android/sdl_android/src/androidTest/assets/json/DialNumber.json
+++ b/android/sdl_android/src/androidTest/assets/json/DialNumber.json
@@ -1,13 +1,13 @@
 {
-  "request":{
-    "name":"DialNumber",
-    "correlationID":194,
-    "parameters":{
-      "wayPointType":"DESTINATION"
+  "request": {
+    "name": "DialNumber",
+    "correlationID": 194,
+    "parameters": {
+      "wayPointType": "DESTINATION"
     }
   },
-  "response":{
-    "name":"DialNumberResponse",
-    "correlationID":195
+  "response": {
+    "name": "DialNumberResponse",
+    "correlationID": 195
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/EndAudioPassThru.json b/android/sdl_android/src/androidTest/assets/json/EndAudioPassThru.json
index ed6554bc3..a92933d47 100644
--- a/android/sdl_android/src/androidTest/assets/json/EndAudioPassThru.json
+++ b/android/sdl_android/src/androidTest/assets/json/EndAudioPassThru.json
@@ -1,10 +1,10 @@
 {
-  "request":{
-    "name":"EndAudioPassThru",
-    "correlationID":125
+  "request": {
+    "name": "EndAudioPassThru",
+    "correlationID": 125
   },
-  "response":{
-    "name":"EndAudioPassThruResponse",
-    "correlationID":126
+  "response": {
+    "name": "EndAudioPassThruResponse",
+    "correlationID": 126
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/GetAppServiceData.json b/android/sdl_android/src/androidTest/assets/json/GetAppServiceData.json
index 6e4e9a2e2..62a3c8b1e 100644
--- a/android/sdl_android/src/androidTest/assets/json/GetAppServiceData.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetAppServiceData.json
@@ -1,16 +1,16 @@
 {
-  "request":{
-    "name":"GetAppServiceData",
-    "correlationID":53,
-    "parameters":{
-      "subscribe":true,
-      "serviceType":"MEDIA"
+  "request": {
+    "name": "GetAppServiceData",
+    "correlationID": 53,
+    "parameters": {
+      "subscribe": true,
+      "serviceType": "MEDIA"
     }
   },
-  "response":{
-    "name":"GetAppServiceDataResponse",
-    "correlationID":53,
-    "parameters":{
+  "response": {
+    "name": "GetAppServiceDataResponse",
+    "correlationID": 53,
+    "parameters": {
       "serviceData": {
         "serviceId": "test",
         "serviceType": "MEDIA"
diff --git a/android/sdl_android/src/androidTest/assets/json/GetDTCs.json b/android/sdl_android/src/androidTest/assets/json/GetDTCs.json
index 7a0f0e51d..8f6f0c2de 100644
--- a/android/sdl_android/src/androidTest/assets/json/GetDTCs.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetDTCs.json
@@ -1,21 +1,21 @@
 {
-  "request":{
-    "name":"GetDTCs",
-    "correlationID":127,
-    "parameters":{
-    	"dtcMask":4356,
-    	"ecuName":4567
+  "request": {
+    "name": "GetDTCs",
+    "correlationID": 127,
+    "parameters": {
+      "dtcMask": 4356,
+      "ecuName": 4567
     }
   },
-  "response":{
-    "name":"GetDTCsResponse",
-    "correlationID":128,
-    "parameters":{
-    	"dtc":[
-    		"item1",
-    		"item2",
-    		"item3"
-    	]
+  "response": {
+    "name": "GetDTCsResponse",
+    "correlationID": 128,
+    "parameters": {
+      "dtc": [
+        "item1",
+        "item2",
+        "item3"
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/GetFile.json b/android/sdl_android/src/androidTest/assets/json/GetFile.json
index 422bb4ee6..e985bef38 100644
--- a/android/sdl_android/src/androidTest/assets/json/GetFile.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetFile.json
@@ -1,20 +1,20 @@
 {
-  "request":{
-    "name":"GetFile",
-    "correlationID":1,
-    "parameters":{
-      "fileName":"test",
+  "request": {
+    "name": "GetFile",
+    "correlationID": 1,
+    "parameters": {
+      "fileName": "test",
       "appServiceId": "test",
-      "fileType":"GRAPHIC_JPEG",
+      "fileType": "GRAPHIC_JPEG",
       "offset": 100,
       "length": 100
     }
   },
-  "response":{
-    "name":"GetFileResponse",
-    "correlationID":1,
-    "parameters":{
-      "fileType":"GRAPHIC_JPEG",
+  "response": {
+    "name": "GetFileResponse",
+    "correlationID": 1,
+    "parameters": {
+      "fileType": "GRAPHIC_JPEG",
       "offset": 100,
       "length": 100,
       "crc": 1234
diff --git a/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleData.json b/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleData.json
index 7000d2918..0c5ca2d45 100644
--- a/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleData.json
@@ -1,36 +1,36 @@
 {
-  "request":{
-    "name":"GetInteriorVehicleData",
-    "correlationID":101,
-    "parameters":{
-      "subscribe":true,
-      "moduleType":"CLIMATE"
+  "request": {
+    "name": "GetInteriorVehicleData",
+    "correlationID": 101,
+    "parameters": {
+      "subscribe": true,
+      "moduleType": "CLIMATE"
     }
   },
-  "response":{
-    "name":"GetInteriorVehicleDataResponse",
-    "correlationID":102,
-    "parameters":{
-      "isSubscribed":true,
-      "moduleData":{
-        "moduleType":"CLIMATE",
-        "climateControlData":{
-          "circulateAirEnable":true,
-          "ventilationMode":"UPPER",
-          "acEnable":true,
-          "currentTemperature":{
-            "unit":"CELSIUS",
-            "value":100.0
+  "response": {
+    "name": "GetInteriorVehicleDataResponse",
+    "correlationID": 102,
+    "parameters": {
+      "isSubscribed": true,
+      "moduleData": {
+        "moduleType": "CLIMATE",
+        "climateControlData": {
+          "circulateAirEnable": true,
+          "ventilationMode": "UPPER",
+          "acEnable": true,
+          "currentTemperature": {
+            "unit": "CELSIUS",
+            "value": 100.0
           },
-          "acMaxEnable":true,
-          "desiredTemperature":{
-            "unit":"CELSIUS",
-            "value":100.0
+          "acMaxEnable": true,
+          "desiredTemperature": {
+            "unit": "CELSIUS",
+            "value": 100.0
           },
-          "dualModeEnable":true,
-          "autoModeEnable":true,
-          "fanSpeed":100,
-          "defrostZone":"FRONT"
+          "dualModeEnable": true,
+          "autoModeEnable": true,
+          "fanSpeed": 100,
+          "defrostZone": "FRONT"
         }
       }
     }
diff --git a/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleDataConsent.json b/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleDataConsent.json
index 5ab1c6c41..786df251d 100644
--- a/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleDataConsent.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetInteriorVehicleDataConsent.json
@@ -1,20 +1,20 @@
 {
-  "request":{
-    "name":"GetInteriorVehicleDataConsent",
-    "correlationID":168,
-    "parameters":{
-      "moduleType":"CLIMATE",
-      "moduleIds":[
+  "request": {
+    "name": "GetInteriorVehicleDataConsent",
+    "correlationID": 168,
+    "parameters": {
+      "moduleType": "CLIMATE",
+      "moduleIds": [
         "A0A",
         "R0A"
       ]
     }
   },
-  "response":{
-    "name":"GetInteriorVehicleDataConsent",
-    "correlationID":169,
-    "parameters":{
-      "allowed":[
+  "response": {
+    "name": "GetInteriorVehicleDataConsent",
+    "correlationID": 169,
+    "parameters": {
+      "allowed": [
         true,
         true
       ]
diff --git a/android/sdl_android/src/androidTest/assets/json/GetSystemCapability.json b/android/sdl_android/src/androidTest/assets/json/GetSystemCapability.json
index 5869df406..deb152354 100644
--- a/android/sdl_android/src/androidTest/assets/json/GetSystemCapability.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetSystemCapability.json
@@ -1,18 +1,18 @@
 {
-  "request":{
-    "name":"GetSystemCapability",
-    "correlationID":203,
-    "parameters":{
-      "systemCapabilityType":"NAVIGATION",
+  "request": {
+    "name": "GetSystemCapability",
+    "correlationID": 203,
+    "parameters": {
+      "systemCapabilityType": "NAVIGATION",
       "subscribe": true
     }
   },
-  "response":{
-    "name":"GetSystemCapabilityResponse",
-    "correlationID":204,
-    "parameters":{
-      "systemCapability":{
-        "systemCapabilityType":"NAVIGATION"
+  "response": {
+    "name": "GetSystemCapabilityResponse",
+    "correlationID": 204,
+    "parameters": {
+      "systemCapability": {
+        "systemCapabilityType": "NAVIGATION"
       }
     }
   }
diff --git a/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json b/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json
index 085cfedce..b31a0e4db 100644
--- a/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetVehicleData.json
@@ -1,183 +1,183 @@
 {
-  "request":{
-    "name":"GetVehicleData",
-    "correlationID":129,
-    "parameters":{
-      "speed":true,
-      "rpm":true,
-      "externalTemperature":false,
-      "fuelLevel":true,
-      "vin":true,
-      "prndl":true,
-      "tirePressure":true,
-      "engineTorque":false,
-      "engineOilLife":true,
-      "odometer":true,
-      "gps":false,
-      "fuelLevel_State":true,
-      "instantFuelConsumption":false,
-      "beltStatus":true,
-      "bodyInformation":false,
-      "deviceStatus":true,
-      "driverBraking":true,
-      "wiperStatus":false,
-      "headLampStatus":true,
-      "accPedalPosition":true,
-      "steeringWheelAngle":true,
-      "eCallInfo":false,
-      "airbagStatus":true,
-      "emergencyEvent":false,
-      "clusterModeStatus":true,
-      "myKey":true,
-      "fuelRange":true,
-      "turnSignal":true,
-      "electronicParkBrakeStatus":true,
+  "request": {
+    "name": "GetVehicleData",
+    "correlationID": 129,
+    "parameters": {
+      "speed": true,
+      "rpm": true,
+      "externalTemperature": false,
+      "fuelLevel": true,
+      "vin": true,
+      "prndl": true,
+      "tirePressure": true,
+      "engineTorque": false,
+      "engineOilLife": true,
+      "odometer": true,
+      "gps": false,
+      "fuelLevel_State": true,
+      "instantFuelConsumption": false,
+      "beltStatus": true,
+      "bodyInformation": false,
+      "deviceStatus": true,
+      "driverBraking": true,
+      "wiperStatus": false,
+      "headLampStatus": true,
+      "accPedalPosition": true,
+      "steeringWheelAngle": true,
+      "eCallInfo": false,
+      "airbagStatus": true,
+      "emergencyEvent": false,
+      "clusterModeStatus": true,
+      "myKey": true,
+      "fuelRange": true,
+      "turnSignal": true,
+      "electronicParkBrakeStatus": true,
       "gearStatus": true,
-      "oemCustomVehicleDataName":true,
+      "oemCustomVehicleDataName": true,
       "windowStatus": true,
       "stabilityControlsStatus": true
     }
   },
-  "response":{
-    "name":"GetVehicleDataResponse",
-    "correlationID":130,
-    "parameters":{
-      "speed":35.6,
-      "rpm":2500,
-      "externalTemperature":140.1,
-      "fuelLevel":3.7,
-      "vin":"FIUE4WHR3984579THIRU",
-      "prndl":"SECOND",
-      "tirePressure":{
-        "pressureTellTale":"ON",
-        "leftFront":"NORMAL",
-        "rightFront":"FAULT",
-        "leftRear":"LOW",
-        "innerLeftRear":"NORMAL",
-        "innerRightRear":"LOW",
-        "rightRear":"ALERT"
+  "response": {
+    "name": "GetVehicleDataResponse",
+    "correlationID": 130,
+    "parameters": {
+      "speed": 35.6,
+      "rpm": 2500,
+      "externalTemperature": 140.1,
+      "fuelLevel": 3.7,
+      "vin": "FIUE4WHR3984579THIRU",
+      "prndl": "SECOND",
+      "tirePressure": {
+        "pressureTellTale": "ON",
+        "leftFront": "NORMAL",
+        "rightFront": "FAULT",
+        "leftRear": "LOW",
+        "innerLeftRear": "NORMAL",
+        "innerRightRear": "LOW",
+        "rightRear": "ALERT"
       },
-      "engineTorque":518.3,
-      "engineOilLife":19.3,
-      "odometer":140000,
-      "gps":{
-        "longitudeDegrees":104.2,
-        "latitudeDegrees":56.3,
-        "utcYear":2015,
-        "utcMonth":7,
-        "utcDay":14,
-        "utcHours":11,
-        "utcMinutes":38,
-        "utcSeconds":12,
-        "compassDirection":"NORTHWEST",
-        "pdop":4.1,
-        "vdop":2.4,
-        "hdop":5.5,
-        "actual":true,
-        "satellites":3,
-        "dimension":"_2D",
-        "altitude":768.5,
-        "heading":315.0,
-        "speed":30.5
+      "engineTorque": 518.3,
+      "engineOilLife": 19.3,
+      "odometer": 140000,
+      "gps": {
+        "longitudeDegrees": 104.2,
+        "latitudeDegrees": 56.3,
+        "utcYear": 2015,
+        "utcMonth": 7,
+        "utcDay": 14,
+        "utcHours": 11,
+        "utcMinutes": 38,
+        "utcSeconds": 12,
+        "compassDirection": "NORTHWEST",
+        "pdop": 4.1,
+        "vdop": 2.4,
+        "hdop": 5.5,
+        "actual": true,
+        "satellites": 3,
+        "dimension": "_2D",
+        "altitude": 768.5,
+        "heading": 315.0,
+        "speed": 30.5
       },
-      "fuelLevel_State":"ALERT",
-      "turnSignal":"OFF",
-      "instantFuelConsumption":2.76,
-      "beltStatus":{
-        "driverBeltDeployed":"NO",
-        "passengerBeltDeployed":"YES",
-        "passengerBuckleBelted":"NO",
-        "driverBuckleBelted":"NO",
-        "leftRow2BuckleBelted":"NO_EVENT",
-        "passengerChildDetected":"NO",
-        "rightRow2BuckleBelted":"NO_EVENT",
-        "middleRow2BuckleBelted":"YES",
-        "middleRow3BuckleBelted":"NO_EVENT",
-        "leftRow3BuckleBelted":"NO",
-        "rightRow3BuckleBelted":"NO_EVENT",
-        "rearInflatableBelted":"NO",
-        "rightRearInflatableBelted":"NO_EVENT",
-        "middleRow1BeltDeployed":"NO",
-        "middleRow1BuckleBelted":"YES"
+      "fuelLevel_State": "ALERT",
+      "turnSignal": "OFF",
+      "instantFuelConsumption": 2.76,
+      "beltStatus": {
+        "driverBeltDeployed": "NO",
+        "passengerBeltDeployed": "YES",
+        "passengerBuckleBelted": "NO",
+        "driverBuckleBelted": "NO",
+        "leftRow2BuckleBelted": "NO_EVENT",
+        "passengerChildDetected": "NO",
+        "rightRow2BuckleBelted": "NO_EVENT",
+        "middleRow2BuckleBelted": "YES",
+        "middleRow3BuckleBelted": "NO_EVENT",
+        "leftRow3BuckleBelted": "NO",
+        "rightRow3BuckleBelted": "NO_EVENT",
+        "rearInflatableBelted": "NO",
+        "rightRearInflatableBelted": "NO_EVENT",
+        "middleRow1BeltDeployed": "NO",
+        "middleRow1BuckleBelted": "YES"
       },
-      "bodyInformation":{
-        "parkBrakeActive":false,
-        "ignitionStableStatus":"IGNITION_SWITCH_NOT_STABLE",
-        "ignitionStatus":"ACCESSORY",
-        "driverDoorAjar":true,
-        "passengerDoorAjar":true,
-        "rearLeftDoorAjar":false,
-        "rearRightDoorAjar":true
+      "bodyInformation": {
+        "parkBrakeActive": false,
+        "ignitionStableStatus": "IGNITION_SWITCH_NOT_STABLE",
+        "ignitionStatus": "ACCESSORY",
+        "driverDoorAjar": true,
+        "passengerDoorAjar": true,
+        "rearLeftDoorAjar": false,
+        "rearRightDoorAjar": true
       },
-      "deviceStatus":{
-        "voiceRecOn":true,
-        "btIconOn":true,
-        "callActive":true,
-        "phoneRoaming":false,
-        "textMsgAvailable":false,
-        "battLevelStatus":"TWO_LEVEL_BARS",
-        "stereoAudioOutputMuted":false,
-        "monoAudioOutputMuted":true,
-        "signalLevelStatus":"ONE_LEVEL_BARS",
-        "primaryAudioSource":"BLUETOOTH_STEREO_BTST",
-        "eCallEventActive":false
+      "deviceStatus": {
+        "voiceRecOn": true,
+        "btIconOn": true,
+        "callActive": true,
+        "phoneRoaming": false,
+        "textMsgAvailable": false,
+        "battLevelStatus": "TWO_LEVEL_BARS",
+        "stereoAudioOutputMuted": false,
+        "monoAudioOutputMuted": true,
+        "signalLevelStatus": "ONE_LEVEL_BARS",
+        "primaryAudioSource": "BLUETOOTH_STEREO_BTST",
+        "eCallEventActive": false
       },
-      "driverBraking":"NO",
-      "wiperStatus":"COURTESYWIPE",
-      "headLampStatus":{
-        "ambientLightSensorStatus":"TWILIGHT_3",
-        "highBeamsOn":true,
-        "lowBeamsOn":false
+      "driverBraking": "NO",
+      "wiperStatus": "COURTESYWIPE",
+      "headLampStatus": {
+        "ambientLightSensorStatus": "TWILIGHT_3",
+        "highBeamsOn": true,
+        "lowBeamsOn": false
       },
-      "accPedalPosition":28.29,
-      "steeringWheelAngle":70.5,
-      "eCallInfo":{
-        "eCallNotificationStatus":"NOT_SUPPORTED",
-        "auxECallNotificationStatus":"NOT_USED",
-        "eCallConfirmationStatus":"ECALL_CONFIGURED_OFF"
+      "accPedalPosition": 28.29,
+      "steeringWheelAngle": 70.5,
+      "eCallInfo": {
+        "eCallNotificationStatus": "NOT_SUPPORTED",
+        "auxECallNotificationStatus": "NOT_USED",
+        "eCallConfirmationStatus": "ECALL_CONFIGURED_OFF"
       },
-      "airbagStatus":{
-        "driverAirbagDeployed":"NO",
-        "driverSideAirbagDeployed":"NO",
-        "driverCurtainAirbagDeployed":"YES",
-        "driverKneeAirbagDeployed":"NO",
-        "passengerAirbagDeployed":"NO",
-        "passengerSideAirbagDeployed":"NO",
-        "passengerCurtainAirbagDeployed":"YES",
-        "passengerKneeAirbagDeployed":"NO"
+      "airbagStatus": {
+        "driverAirbagDeployed": "NO",
+        "driverSideAirbagDeployed": "NO",
+        "driverCurtainAirbagDeployed": "YES",
+        "driverKneeAirbagDeployed": "NO",
+        "passengerAirbagDeployed": "NO",
+        "passengerSideAirbagDeployed": "NO",
+        "passengerCurtainAirbagDeployed": "YES",
+        "passengerKneeAirbagDeployed": "NO"
       },
-      "emergencyEvent":{
-        "emergencyEventType":"FRONTAL",
-        "fuelCutoffStatus":"TERMINATE_FUEL",
-        "rolloverEvent":"YES",
-        "maximumChangeVelocity":5,
-        "multipleEvents":"NO"
+      "emergencyEvent": {
+        "emergencyEventType": "FRONTAL",
+        "fuelCutoffStatus": "TERMINATE_FUEL",
+        "rolloverEvent": "YES",
+        "maximumChangeVelocity": 5,
+        "multipleEvents": "NO"
       },
-      "clusterModeStatus":{
-        "powerModeActive":true,
-        "powerModeQualificationStatus":"POWER_MODE_EVALUATION_IN_PROGRESS",
-        "carModeStatus":"TRANSPORT",
-        "powerModeStatus":"POST_ACCESORY_0"
+      "clusterModeStatus": {
+        "powerModeActive": true,
+        "powerModeQualificationStatus": "POWER_MODE_EVALUATION_IN_PROGRESS",
+        "carModeStatus": "TRANSPORT",
+        "powerModeStatus": "POST_ACCESORY_0"
       },
-      "myKey":{
-        "e911Override":"NO_DATA_EXISTS"
+      "myKey": {
+        "e911Override": "NO_DATA_EXISTS"
       },
-      "electronicParkBrakeStatus":"CLOSED",
-      "fuelRange":[
+      "electronicParkBrakeStatus": "CLOSED",
+      "fuelRange": [
         {
-          "type":"GASOLINE",
-          "range":100.0
+          "type": "GASOLINE",
+          "range": 100.0
         },
         {
-          "type":"DIESEL",
-          "range":10.0
+          "type": "DIESEL",
+          "range": 10.0
         }
       ],
       "stabilityControlsStatus": {
         "escSystem": "ON",
         "trailerSwayControl": "OFF"
       },
-      "oemCustomVehicleDataName":"oemCustomVehicleDataState",
+      "oemCustomVehicleDataName": "oemCustomVehicleDataState",
       "gearStatus": {
         "userSelectedGear": "PARK",
         "transmissionType": "ELECTRIC_VARIABLE",
@@ -185,7 +185,7 @@
       },
       "windowStatus": [
         {
-          "location":  {
+          "location": {
             "row": 2,
             "col": 3
           },
diff --git a/android/sdl_android/src/androidTest/assets/json/GetWayPoints.json b/android/sdl_android/src/androidTest/assets/json/GetWayPoints.json
index 8d06a9dd6..f9878976d 100644
--- a/android/sdl_android/src/androidTest/assets/json/GetWayPoints.json
+++ b/android/sdl_android/src/androidTest/assets/json/GetWayPoints.json
@@ -1,17 +1,18 @@
 {
-  "request":{
-    "name":"GetWayPoints",
-    "correlationID":196,
-    "parameters":{
-      "wayPointType":"DESTINATION"
+  "request": {
+    "name": "GetWayPoints",
+    "correlationID": 196,
+    "parameters": {
+      "wayPointType": "DESTINATION"
     }
   },
-  "response":{
-    "name":"GetWayPointsResponse",
-    "correlationID":197,
-    "parameters":{
-      "wayPoints":[
-        {}, {}
+  "response": {
+    "name": "GetWayPointsResponse",
+    "correlationID": 197,
+    "parameters": {
+      "wayPoints": [
+        {},
+        {}
       ]
     }
   }
diff --git a/android/sdl_android/src/androidTest/assets/json/ListFiles.json b/android/sdl_android/src/androidTest/assets/json/ListFiles.json
index d34d64ff0..92f6378ed 100644
--- a/android/sdl_android/src/androidTest/assets/json/ListFiles.json
+++ b/android/sdl_android/src/androidTest/assets/json/ListFiles.json
@@ -1,18 +1,18 @@
 {
-  "request":{
-    "name":"ListFiles",
-    "correlationID":131
+  "request": {
+    "name": "ListFiles",
+    "correlationID": 131
   },
-  "response":{
-    "name":"ListFilesResponse",
-    "correlationID":132,
-    "parameters":{
-      "filenames":[
+  "response": {
+    "name": "ListFilesResponse",
+    "correlationID": 132,
+    "parameters": {
+      "filenames": [
         "file1",
         "file2",
         "file3"
       ],
-      "spaceAvailable":1947255
+      "spaceAvailable": 1947255
     }
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/PerformAppServiceInteraction.json b/android/sdl_android/src/androidTest/assets/json/PerformAppServiceInteraction.json
index e16bc880f..fbd1f6159 100644
--- a/android/sdl_android/src/androidTest/assets/json/PerformAppServiceInteraction.json
+++ b/android/sdl_android/src/androidTest/assets/json/PerformAppServiceInteraction.json
@@ -1,18 +1,18 @@
 {
-  "request":{
-    "name":"PerformAppServiceInteraction",
-    "correlationID":55,
-    "parameters":{
+  "request": {
+    "name": "PerformAppServiceInteraction",
+    "correlationID": 55,
+    "parameters": {
       "serviceUri": "test",
       "appServiceId": "test",
       "originApp": "test",
       "requestServiceActive": true
     }
   },
-  "response":{
-    "name":"PerformAppServiceInteractionResponse",
-    "correlationID":55,
-    "parameters":{
+  "response": {
+    "name": "PerformAppServiceInteractionResponse",
+    "correlationID": 55,
+    "parameters": {
       "serviceSpecificResult": "test"
     }
   }
diff --git a/android/sdl_android/src/androidTest/assets/json/PerformAudioPassThru.json b/android/sdl_android/src/androidTest/assets/json/PerformAudioPassThru.json
index 60e88b694..3711de408 100644
--- a/android/sdl_android/src/androidTest/assets/json/PerformAudioPassThru.json
+++ b/android/sdl_android/src/androidTest/assets/json/PerformAudioPassThru.json
@@ -1,29 +1,29 @@
 {
-  "request":{
-    "name":"PerformAudioPassThru",
-    "correlationID":133,
-    "parameters":{
-      "maxDuration":5,
-      "audioPassThruDisplayText1":"Text 1",
-      "audioPassThruDisplayText2":"Text 2",
-      "muteAudio":true,
-      "samplingRate":"8KHZ",
-      "audioType":"PCM",
-      "initialPrompt":[
+  "request": {
+    "name": "PerformAudioPassThru",
+    "correlationID": 133,
+    "parameters": {
+      "maxDuration": 5,
+      "audioPassThruDisplayText1": "Text 1",
+      "audioPassThruDisplayText2": "Text 2",
+      "muteAudio": true,
+      "samplingRate": "8KHZ",
+      "audioType": "PCM",
+      "initialPrompt": [
         {
-          "text":"TEXT",
-          "type":"Hello"
+          "text": "TEXT",
+          "type": "Hello"
         },
         {
-          "text":"TEXT",
-          "type":"Goodbye"
+          "text": "TEXT",
+          "type": "Goodbye"
         }
       ],
-      "bitsPerSample":"8_BIT"
+      "bitsPerSample": "8_BIT"
     }
   },
-  "response":{
-    "name":"PerformAudioPassThruResponse",
-    "correlationID":134
+  "response": {
+    "name": "PerformAudioPassThruResponse",
+    "correlationID": 134
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/PerformInteraction.json b/android/sdl_android/src/androidTest/assets/json/PerformInteraction.json
index 583a72b1c..333ae65b7 100644
--- a/android/sdl_android/src/androidTest/assets/json/PerformInteraction.json
+++ b/android/sdl_android/src/androidTest/assets/json/PerformInteraction.json
@@ -1,76 +1,76 @@
 {
-  "request":{
-    "name":"PerformInteraction",
-    "correlationID":135,
-    "parameters":{
-      "initialText":"Initial Text",
-      "interactionMode":"VR_ONLY",
-      "interactionChoiceSetIDList":[
+  "request": {
+    "name": "PerformInteraction",
+    "correlationID": 135,
+    "parameters": {
+      "initialText": "Initial Text",
+      "interactionMode": "VR_ONLY",
+      "interactionChoiceSetIDList": [
         442,
         2352,
         4623,
         8954
       ],
-      "interactionLayout":"ICON_ONLY",
-      "initialPrompt":[
+      "interactionLayout": "ICON_ONLY",
+      "initialPrompt": [
         {
-          "text":"TEXT",
-          "type":"Hello"
+          "text": "TEXT",
+          "type": "Hello"
         },
         {
-          "text":"TEXT",
-          "type":"Goodbye"
+          "text": "TEXT",
+          "type": "Goodbye"
         }
       ],
-      "helpPrompt":[
+      "helpPrompt": [
         {
-          "text":"TEXT",
-          "type":"Hello2"
+          "text": "TEXT",
+          "type": "Hello2"
         },
         {
-          "text":"TEXT",
-          "type":"Goodbye2"
+          "text": "TEXT",
+          "type": "Goodbye2"
         }
       ],
-      "timeoutPrompt":[
+      "timeoutPrompt": [
         {
-          "text":"TEXT",
-          "type":"Hello3"
+          "text": "TEXT",
+          "type": "Hello3"
         },
         {
-          "text":"TEXT",
-          "type":"Goodbye3"
+          "text": "TEXT",
+          "type": "Goodbye3"
         }
       ],
-      "timeout":0,
-      "cancelID":45,
-      "vrHelp":[
+      "timeout": 0,
+      "cancelID": 45,
+      "vrHelp": [
         {
-          "position":7,
-          "text":"Voice Recognition Text",
-          "image":{
-            "value":"image.png",
-            "imageType":"DYNAMIC"
+          "position": 7,
+          "text": "Voice Recognition Text",
+          "image": {
+            "value": "image.png",
+            "imageType": "DYNAMIC"
           }
         },
         {
-          "position":3,
-          "text":"Voice Recognition Text 2",
-          "image":{
-            "value":"image2.png",
-            "imageType":"STATIC"
+          "position": 3,
+          "text": "Voice Recognition Text 2",
+          "image": {
+            "value": "image2.png",
+            "imageType": "STATIC"
           }
         }
       ]
     }
   },
-  "response":{
-    "name":"PerformInteractionResponse",
-    "correlationID":136,
-    "parameters":{
-      "manualTextEntry":"Text Entry",
-      "triggerSource":"MENU",
-      "choiceID":45
+  "response": {
+    "name": "PerformInteractionResponse",
+    "correlationID": 136,
+    "parameters": {
+      "manualTextEntry": "Text Entry",
+      "triggerSource": "MENU",
+      "choiceID": 45
     }
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/PublishAppService.json b/android/sdl_android/src/androidTest/assets/json/PublishAppService.json
index 1a6edf9db..8d16dfb66 100644
--- a/android/sdl_android/src/androidTest/assets/json/PublishAppService.json
+++ b/android/sdl_android/src/androidTest/assets/json/PublishAppService.json
@@ -1,25 +1,29 @@
 {
-  "request":{
-    "name":"PublishAppService",
-    "correlationID":52,
-    "parameters":{
-      "appServiceManifest":{
-        "allowAppConsumers":true,
+  "request": {
+    "name": "PublishAppService",
+    "correlationID": 52,
+    "parameters": {
+      "appServiceManifest": {
+        "allowAppConsumers": true,
         "serviceIcon": "test",
-        "rpcSpecVersion":{
-          "majorVersion":5,
-          "minorVersion":1,
-          "patchVersion":0},
-        "serviceName":"Mobile_MEDIA",
-        "serviceType":"MEDIA",
-        "handledRPCs":[39,41]
+        "rpcSpecVersion": {
+          "majorVersion": 5,
+          "minorVersion": 1,
+          "patchVersion": 0
+        },
+        "serviceName": "Mobile_MEDIA",
+        "serviceType": "MEDIA",
+        "handledRPCs": [
+          39,
+          41
+        ]
       }
     }
   },
-  "response":{
-    "name":"PublishAppServiceResponse",
-    "correlationID":52,
-    "parameters":{
+  "response": {
+    "name": "PublishAppServiceResponse",
+    "correlationID": 52,
+    "parameters": {
       "appServiceRecord": {
         "serviceID": "test",
         "serviceManifest": {
@@ -32,10 +36,13 @@
           "serviceName": "Mobile_MEDIA",
           "serviceType": "MEDIA",
           "serviceIcon": "test",
-          "handledRPCs": [39,41]
+          "handledRPCs": [
+            39,
+            41
+          ]
         },
         "servicePublished": true,
-        "serviceActive":true
+        "serviceActive": true
       }
     }
   }
diff --git a/android/sdl_android/src/androidTest/assets/json/PutFile.json b/android/sdl_android/src/androidTest/assets/json/PutFile.json
index e989a62aa..9bec8540d 100644
--- a/android/sdl_android/src/androidTest/assets/json/PutFile.json
+++ b/android/sdl_android/src/androidTest/assets/json/PutFile.json
@@ -1,27 +1,27 @@
 {
-  "request":{
-    "name":"PutFile",
-    "correlationID":137,
-    "parameters":{
-      "persistentFile":true,
-      "systemFile":false,
-      "fileType":"GRAPHIC_JPEG",
-      "syncFileName":"filename.txt",
-      "offset":2,
-      "length":456,
-      "crc":2020,
-      "bulkData":[
+  "request": {
+    "name": "PutFile",
+    "correlationID": 137,
+    "parameters": {
+      "persistentFile": true,
+      "systemFile": false,
+      "fileType": "GRAPHIC_JPEG",
+      "syncFileName": "filename.txt",
+      "offset": 2,
+      "length": 456,
+      "crc": 2020,
+      "bulkData": [
         0,
         1,
         2
       ]
     }
   },
-  "response":{
-    "name":"PutFileResponse",
-    "correlationID":138,
-    "parameters":{
-      "spaceAvailable":43567543
+  "response": {
+    "name": "PutFileResponse",
+    "correlationID": 138,
+    "parameters": {
+      "spaceAvailable": 43567543
     }
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/ReadDID.json b/android/sdl_android/src/androidTest/assets/json/ReadDID.json
index 5cb3403fb..159b921bd 100644
--- a/android/sdl_android/src/androidTest/assets/json/ReadDID.json
+++ b/android/sdl_android/src/androidTest/assets/json/ReadDID.json
@@ -1,10 +1,10 @@
 {
-  "request":{
-    "name":"ReadDID",
-    "correlationID":139,
-    "parameters":{
-      "ecuName":526,
-      "didLocation":[
+  "request": {
+    "name": "ReadDID",
+    "correlationID": 139,
+    "parameters": {
+      "ecuName": 526,
+      "didLocation": [
         5436,
         34574,
         27,
@@ -16,20 +16,20 @@
       ]
     }
   },
-  "response":{
-    "name":"ReadDIDResponse",
-    "correlationID":140,
-    "parameters":{
-      "didResult":[
+  "response": {
+    "name": "ReadDIDResponse",
+    "correlationID": 140,
+    "parameters": {
+      "didResult": [
         {
-          "resultCode":"USER_DISALLOWED",
-          "data":"dataGoesHere",
-          "didLocation":56484
+          "resultCode": "USER_DISALLOWED",
+          "data": "dataGoesHere",
+          "didLocation": 56484
         },
         {
-          "resultCode":"SUCCESS",
-          "data":"moreDataGoesHere",
-          "didLocation":1647
+          "resultCode": "SUCCESS",
+          "data": "moreDataGoesHere",
+          "didLocation": 1647
         }
       ]
     }
diff --git a/android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json b/android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json
index 3c5271d9c..de12859f8 100644
--- a/android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json
+++ b/android/sdl_android/src/androidTest/assets/json/RegisterAppInterface.json
@@ -1,43 +1,43 @@
 {
-  "request":{
-    "name":"RegisterAppInterface",
-    "correlationID":141,
-    "parameters":{
-      "ttsName":[
+  "request": {
+    "name": "RegisterAppInterface",
+    "correlationID": 141,
+    "parameters": {
+      "ttsName": [
         {
-          "text":"Phrase 1",
-          "type":"TEXT"
+          "text": "Phrase 1",
+          "type": "TEXT"
         },
         {
-          "text":"Phrase 2",
-          "type":"TEXT"
+          "text": "Phrase 2",
+          "type": "TEXT"
         }
       ],
-      "hmiDisplayLanguageDesired":"EN-US",
-      "appHMIType":[
+      "hmiDisplayLanguageDesired": "EN-US",
+      "appHMIType": [
         "SOCIAL",
         "MEDIA"
       ],
-      "appID":"123e4567e8",
-      "fullAppID":"123e4567-e89b-12d3-a456-426655440000",
-      "languageDesired":"PT-BR",
-      "deviceInfo":{
-        "hardware":"My Hardware",
-        "firmwareRev":"My Firmware Revision",
-        "os":"Windows",
-        "osVersion":"95",
-        "carrier":"nobody",
-        "maxNumberRFCOMMPorts":2
+      "appID": "123e4567e8",
+      "fullAppID": "123e4567-e89b-12d3-a456-426655440000",
+      "languageDesired": "PT-BR",
+      "deviceInfo": {
+        "hardware": "My Hardware",
+        "firmwareRev": "My Firmware Revision",
+        "os": "Windows",
+        "osVersion": "95",
+        "carrier": "nobody",
+        "maxNumberRFCOMMPorts": 2
       },
-      "appInfo":{
-        "appDisplayName":"Test",
-        "appBundleID":"com.sample.test",
-        "appVersion":"1.0",
-        "appIcon":"icon.png"
+      "appInfo": {
+        "appDisplayName": "Test",
+        "appBundleID": "com.sample.test",
+        "appVersion": "1.0",
+        "appIcon": "icon.png"
       },
-      "appName":"Dumb app",
-      "ngnMediaScreenAppName":"DA",
-      "isMediaApplication":true,
+      "appName": "Dumb app",
+      "ngnMediaScreenAppName": "DA",
+      "isMediaApplication": true,
       "dayColorScheme": {
         "backgroundColor": {
           "blue": 9,
@@ -72,169 +72,174 @@
           "red": 10
         }
       },
-      "vrSynonyms":[
+      "vrSynonyms": [
         "dumb",
         "really dumb app"
       ],
-      "syncMsgVersion":{
-        "majorVersion":3,
-        "minorVersion":64
+      "syncMsgVersion": {
+        "majorVersion": 3,
+        "minorVersion": 64
       },
-      "hashID":"y534htz"
+      "hashID": "y534htz"
     }
   },
-  "response":{
-    "name":"RegisterAppInterfaceResponse",
-    "correlationID":142,
-    "parameters":{
-      "vehicleType":{
-        "make":"Chrysler",
-        "model":"Crossfire",
-        "modelYear":"1820",
-        "trim":"Gold"
+  "response": {
+    "name": "RegisterAppInterfaceResponse",
+    "correlationID": 142,
+    "parameters": {
+      "vehicleType": {
+        "make": "Chrysler",
+        "model": "Crossfire",
+        "modelYear": "1820",
+        "trim": "Gold"
       },
-      "speechCapabilities":[
+      "speechCapabilities": [
         "SAPI_PHONEMES",
         "TEXT",
         "PRE_RECORDED"
       ],
-      "vrCapabilities":[
+      "vrCapabilities": [
         "Text"
       ],
-      "audioPassThruCapabilities":[
+      "pcmStreamCapabilities": {
+        "samplingRate": "16KHZ",
+        "audioType": "PCM",
+        "bitsPerSample": "16_BIT"
+      },
+      "audioPassThruCapabilities": [
         {
-          "samplingRate":"16KHZ",
-          "audioType":"PCM",
-          "bitsPerSample":"16_BIT"
+          "samplingRate": "16KHZ",
+          "audioType": "PCM",
+          "bitsPerSample": "16_BIT"
         },
         {
-          "samplingRate":"44KHZ",
-          "audioType":"PCM",
-          "bitsPerSample":"8_BIT"
+          "samplingRate": "44KHZ",
+          "audioType": "PCM",
+          "bitsPerSample": "8_BIT"
         }
       ],
-      "hmiZoneCapabilities":[
+      "hmiZoneCapabilities": [
         "FRONT",
         "BACK"
       ],
-      "prerecordedSpeech":[
+      "prerecordedSpeech": [
         "HELP_JINGLE",
         "LISTEN_JINGLE",
         "NEGATIVE_JINGLE"
       ],
-      "supportedDiagModes":[
+      "supportedDiagModes": [
         324,
         2356,
         865,
         211,
         8098
       ],
-      "syncMsgVersion":{
-        "majorVersion":3,
-        "minorVersion":64
+      "syncMsgVersion": {
+        "majorVersion": 3,
+        "minorVersion": 64
       },
-      "language":"EN-US",
-      "buttonCapabilities":[
+      "language": "EN-US",
+      "buttonCapabilities": [
         {
-          "name":"SEEKRIGHT",
-          "shortPressAvailable":true,
-          "longPressAvailable":false,
-          "upDownAvailable":true
+          "name": "SEEKRIGHT",
+          "shortPressAvailable": true,
+          "longPressAvailable": false,
+          "upDownAvailable": true
         },
         {
-          "name":"TUNEDOWN",
-          "shortPressAvailable":false,
-          "longPressAvailable":true,
-          "upDownAvailable":false
+          "name": "TUNEDOWN",
+          "shortPressAvailable": false,
+          "longPressAvailable": true,
+          "upDownAvailable": false
         }
       ],
-      "displayCapabilities":{
-        "displayType":"TYPE2",
-        "mediaClockFormats":[
+      "displayCapabilities": {
+        "displayType": "TYPE2",
+        "mediaClockFormats": [
           "CLOCKTEXT3",
           "CLOCK1"
         ],
-        "textFields":[
+        "textFields": [
           {
-            "width":480,
-            "characterSet":"TYPE5SET",
-            "rows":360,
-            "name":"alertText2"
+            "width": 480,
+            "characterSet": "TYPE5SET",
+            "rows": 360,
+            "name": "alertText2"
           },
           {
-            "width":1980,
-            "characterSet":"UTF_8",
-            "rows":960,
-            "name":"scrollableMessageBody"
-          },
+            "width": 1980,
+            "characterSet": "UTF_8",
+            "rows": 960,
+            "name": "scrollableMessageBody"
+          }
         ],
-        "imageFields":[
+        "imageFields": [
           {
-            "imageTypeSupported":[
+            "imageTypeSupported": [
               "GRAPHIC_JPEG",
               "AUDIO_AAC"
             ],
-            "imageResolution":{
-              "resolutionWidth":640,
-              "resolutionHeight":480
+            "imageResolution": {
+              "resolutionWidth": 640,
+              "resolutionHeight": 480
             },
-            "name":"menuIcon"
+            "name": "menuIcon"
           },
           {
-            "imageTypeSupported":[
+            "imageTypeSupported": [
               "BINARY",
               "AUDIO_WAVE"
             ],
-            "imageResolution":{
-              "resolutionWidth":320,
-              "resolutionHeight":240
+            "imageResolution": {
+              "resolutionWidth": 320,
+              "resolutionHeight": 240
             },
-            "name":"graphic"
+            "name": "graphic"
           }
         ],
-        "graphicSupported":true,
-        "screenParams":{
-          "resolution":{
-            "resolutionWidth":1200,
-            "resolutionHeight":800
+        "graphicSupported": true,
+        "screenParams": {
+          "resolution": {
+            "resolutionWidth": 1200,
+            "resolutionHeight": 800
           },
-          "touchEventAvailable":{
-            "pressAvailable":true,
-            "multiTouchAvailable":false,
-            "doublePressAvailable":true
+          "touchEventAvailable": {
+            "pressAvailable": true,
+            "multiTouchAvailable": false,
+            "doublePressAvailable": true
           }
         },
-        "templatesAvailable":[
+        "templatesAvailable": [
           "Template 1",
           "Template 2",
           "Template 3"
         ],
-        "numCustomPresetsAvailable":5
+        "numCustomPresetsAvailable": 5
       },
-      "hmiDisplayLanguage":"ES-ES",
-      "softButtonCapabilities":[
+      "hmiDisplayLanguage": "ES-ES",
+      "softButtonCapabilities": [
         {
-          "imageSupported":false,
-          "shortPressAvailable":true,
-          "longPressAvailable":false,
-          "upDownAvailable":true
+          "imageSupported": false,
+          "shortPressAvailable": true,
+          "longPressAvailable": false,
+          "upDownAvailable": true
         },
         {
-          "imageSupported":true,
-          "shortPressAvailable":false,
-          "longPressAvailable":true,
-          "upDownAvailable":false
+          "imageSupported": true,
+          "shortPressAvailable": false,
+          "longPressAvailable": true,
+          "upDownAvailable": false
         }
       ],
-      "presetBankCapabilities":{
-        "OnScreenPresetsAvailable":false
+      "presetBankCapabilities": {
+        "OnScreenPresetsAvailable": false
       },
-      "bulkData":[
+      "bulkData": [
         0,
         1,
         2
       ],
-      "iconResumed":true
+      "iconResumed": true
     }
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/ReleaseInteriorVehicleDataModule.json b/android/sdl_android/src/androidTest/assets/json/ReleaseInteriorVehicleDataModule.json
index 9f9f60096..fedeb72fc 100644
--- a/android/sdl_android/src/androidTest/assets/json/ReleaseInteriorVehicleDataModule.json
+++ b/android/sdl_android/src/androidTest/assets/json/ReleaseInteriorVehicleDataModule.json
@@ -1,14 +1,14 @@
 {
-  "request":{
-    "name":"ReleaseInteriorVehicleDataModule",
-    "correlationID":172,
-    "parameters":{
-      "moduleType":"CLIMATE",
-      "moduleIds":"A0A"
+  "request": {
+    "name": "ReleaseInteriorVehicleDataModule",
+    "correlationID": 172,
+    "parameters": {
+      "moduleType": "CLIMATE",
+      "moduleIds": "A0A"
     }
   },
-  "response":{
-    "name":"ReleaseInteriorVehicleDataModule",
-    "correlationID":173
+  "response": {
+    "name": "ReleaseInteriorVehicleDataModule",
+    "correlationID": 173
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/ResetGlobalProperties.json b/android/sdl_android/src/androidTest/assets/json/ResetGlobalProperties.json
index 02ff2ba26..d9de374e9 100644
--- a/android/sdl_android/src/androidTest/assets/json/ResetGlobalProperties.json
+++ b/android/sdl_android/src/androidTest/assets/json/ResetGlobalProperties.json
@@ -1,17 +1,17 @@
 {
-  "request":{
-    "name":"ResetGlobalProperties",
-    "correlationID":143,
-    "parameters":{
-      "properties":[
+  "request": {
+    "name": "ResetGlobalProperties",
+    "correlationID": 143,
+    "parameters": {
+      "properties": [
         "HELPPROMPT",
         "VRHELPTITLE",
         "VRHELPITEMS"
       ]
     }
   },
-  "response":{
-    "name":"ResetGlobalPropertiesResponse",
-    "correlationID":144
+  "response": {
+    "name": "ResetGlobalPropertiesResponse",
+    "correlationID": 144
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/ScrollableMessage.json b/android/sdl_android/src/androidTest/assets/json/ScrollableMessage.json
index 3b14d1a43..7a5dea217 100644
--- a/android/sdl_android/src/androidTest/assets/json/ScrollableMessage.json
+++ b/android/sdl_android/src/androidTest/assets/json/ScrollableMessage.json
@@ -1,39 +1,39 @@
 {
-  "request":{
-    "name":"ScrollableMessage",
-    "correlationID":145,
-    "parameters":{
-      "scrollableMessageBody":"Sample body text",
-      "timeout":1000,
-      "cancelID":45,
-      "softButtons":[
+  "request": {
+    "name": "ScrollableMessage",
+    "correlationID": 145,
+    "parameters": {
+      "scrollableMessageBody": "Sample body text",
+      "timeout": 1000,
+      "cancelID": 45,
+      "softButtons": [
         {
-          "isHighlighted":true,
-          "softButtonID":6,
-          "systemAction":"STEAL_FOCUS",
-          "text":"Button 1",
-          "type":"IMAGE",
-          "image":{
-            "value":"image.png",
-            "imageType":"STATIC"
+          "isHighlighted": true,
+          "softButtonID": 6,
+          "systemAction": "STEAL_FOCUS",
+          "text": "Button 1",
+          "type": "IMAGE",
+          "image": {
+            "value": "image.png",
+            "imageType": "STATIC"
           }
         },
         {
-          "isHighlighted":false,
-          "softButtonID":3,
-          "systemAction":"DEFAULT_ACTION",
-          "text":"Button 2",
-          "type":"BOTH",
-          "image":{
-            "value":"image.png",
-            "imageType":"DYNAMIC"
+          "isHighlighted": false,
+          "softButtonID": 3,
+          "systemAction": "DEFAULT_ACTION",
+          "text": "Button 2",
+          "type": "BOTH",
+          "image": {
+            "value": "image.png",
+            "imageType": "DYNAMIC"
           }
         }
       ]
     }
   },
-  "response":{
-    "name":"ScrollableMessageResponse",
-    "correlationID":146
+  "response": {
+    "name": "ScrollableMessageResponse",
+    "correlationID": 146
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/SendHapticData.json b/android/sdl_android/src/androidTest/assets/json/SendHapticData.json
index 42b863aae..522b1c282 100644
--- a/android/sdl_android/src/androidTest/assets/json/SendHapticData.json
+++ b/android/sdl_android/src/androidTest/assets/json/SendHapticData.json
@@ -1,22 +1,23 @@
 {
-  "request":{
-    "name":"SendHapticData",
-    "correlationID":1234,
-    "parameters":{
-      "hapticRectData":[
-        {"id":123,
-          "rect":{
-            "height":1,
-            "width":1,
-            "x":1,
-            "y":1
+  "request": {
+    "name": "SendHapticData",
+    "correlationID": 1234,
+    "parameters": {
+      "hapticRectData": [
+        {
+          "id": 123,
+          "rect": {
+            "height": 1,
+            "width": 1,
+            "x": 1,
+            "y": 1
           }
         }
       ]
     }
   },
-  "response":{
-    "name":"SendHapticData",
-    "correlationID":1234
+  "response": {
+    "name": "SendHapticData",
+    "correlationID": 1234
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/SendLocation.json b/android/sdl_android/src/androidTest/assets/json/SendLocation.json
index 9b0ae8901..5c2df8c76 100644
--- a/android/sdl_android/src/androidTest/assets/json/SendLocation.json
+++ b/android/sdl_android/src/androidTest/assets/json/SendLocation.json
@@ -1,26 +1,26 @@
 {
-  "request":{
-    "name":"SendLocation",
-    "correlationID":190,
-    "parameters":{
-      "latitudeDegrees":42,
-      "longitudeDegrees":42,
-      "locationName":"location",
-      "locationDescription":"description",
-      "phoneNumber":"999-999-9999",
-      "locationImage":{
-        "value":"locationImage.png",
-        "imageType":"DYNAMIC"
+  "request": {
+    "name": "SendLocation",
+    "correlationID": 190,
+    "parameters": {
+      "latitudeDegrees": 42,
+      "longitudeDegrees": 42,
+      "locationName": "location",
+      "locationDescription": "description",
+      "phoneNumber": "999-999-9999",
+      "locationImage": {
+        "value": "locationImage.png",
+        "imageType": "DYNAMIC"
       },
-      "addressLines":[
+      "addressLines": [
         "line1",
         "line2",
         "line3"
       ]
     }
   },
-  "response":{
-    "name":"SendLocationResponse",
-    "correlationID":191
+  "response": {
+    "name": "SendLocationResponse",
+    "correlationID": 191
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/SetAppIcon.json b/android/sdl_android/src/androidTest/assets/json/SetAppIcon.json
index 67f3b0b41..b46d3a5a3 100644
--- a/android/sdl_android/src/androidTest/assets/json/SetAppIcon.json
+++ b/android/sdl_android/src/androidTest/assets/json/SetAppIcon.json
@@ -1,13 +1,13 @@
 {
-  "request":{
-    "name":"SetAppIcon",
-    "correlationID":147,
-    "parameters":{
-      "syncFileName":"filename.txt"
+  "request": {
+    "name": "SetAppIcon",
+    "correlationID": 147,
+    "parameters": {
+      "syncFileName": "filename.txt"
     }
   },
-  "response":{
-    "name":"SetAppIconResponse",
-    "correlationID":148
+  "response": {
+    "name": "SetAppIconResponse",
+    "correlationID": 148
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json b/android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json
index 5ff32ac6a..b4e3e7961 100644
--- a/android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json
+++ b/android/sdl_android/src/androidTest/assets/json/SetDisplayLayout.json
@@ -1,9 +1,9 @@
 {
-  "request":{
-    "name":"SetDisplayLayout",
-    "correlationID":149,
-    "parameters":{
-      "displayLayout":"someDisplayLayout",
+  "request": {
+    "name": "SetDisplayLayout",
+    "correlationID": 149,
+    "parameters": {
+      "displayLayout": "someDisplayLayout",
       "dayColorScheme": {
         "backgroundColor": {
           "blue": 9,
@@ -40,103 +40,103 @@
       }
     }
   },
-  "response":{
-    "name":"SetDisplayLayoutResponse",
-    "correlationID":150,
-    "parameters":{
-      "buttonCapabilities":[
+  "response": {
+    "name": "SetDisplayLayoutResponse",
+    "correlationID": 150,
+    "parameters": {
+      "buttonCapabilities": [
         {
-          "name":"SEEKRIGHT",
-          "shortPressAvailable":true,
-          "longPressAvailable":false,
-          "upDownAvailable":true
+          "name": "SEEKRIGHT",
+          "shortPressAvailable": true,
+          "longPressAvailable": false,
+          "upDownAvailable": true
         },
         {
-          "name":"TUNEDOWN",
-          "shortPressAvailable":false,
-          "longPressAvailable":true,
-          "upDownAvailable":false
+          "name": "TUNEDOWN",
+          "shortPressAvailable": false,
+          "longPressAvailable": true,
+          "upDownAvailable": false
         }
       ],
-      "displayCapabilities":{
-        "displayType":"TYPE2",
-        "mediaClockFormats":[
+      "displayCapabilities": {
+        "displayType": "TYPE2",
+        "mediaClockFormats": [
           "CLOCKTEXT3",
           "CLOCK1"
         ],
-        "textFields":[
+        "textFields": [
           {
-            "width":480,
-            "characterSet":"TYPE5SET",
-            "rows":360,
-            "name":"alertText2"
+            "width": 480,
+            "characterSet": "TYPE5SET",
+            "rows": 360,
+            "name": "alertText2"
           },
           {
-            "width":1980,
-            "characterSet":"UTF_8",
-            "rows":960,
-            "name":"scrollableMessageBody"
-          },
+            "width": 1980,
+            "characterSet": "UTF_8",
+            "rows": 960,
+            "name": "scrollableMessageBody"
+          }
         ],
-        "imageFields":[
+        "imageFields": [
           {
-            "imageTypeSupported":[
+            "imageTypeSupported": [
               "GRAPHIC_JPEG",
               "AUDIO_AAC"
             ],
-            "imageResolution":{
-              "resolutionWidth":640,
-              "resolutionHeight":480
+            "imageResolution": {
+              "resolutionWidth": 640,
+              "resolutionHeight": 480
             },
-            "name":"menuIcon"
+            "name": "menuIcon"
           },
           {
-            "imageTypeSupported":[
+            "imageTypeSupported": [
               "BINARY",
               "AUDIO_WAVE"
             ],
-            "imageResolution":{
-              "resolutionWidth":320,
-              "resolutionHeight":240
+            "imageResolution": {
+              "resolutionWidth": 320,
+              "resolutionHeight": 240
             },
-            "name":"graphic"
+            "name": "graphic"
           }
         ],
-        "graphicSupported":true,
-        "screenParams":{
-          "resolution":{
-            "resolutionWidth":1200,
-            "resolutionHeight":800
+        "graphicSupported": true,
+        "screenParams": {
+          "resolution": {
+            "resolutionWidth": 1200,
+            "resolutionHeight": 800
           },
-          "touchEventAvailable":{
-            "pressAvailable":true,
-            "multiTouchAvailable":false,
-            "doublePressAvailable":true
+          "touchEventAvailable": {
+            "pressAvailable": true,
+            "multiTouchAvailable": false,
+            "doublePressAvailable": true
           }
         },
-        "templatesAvailable":[
+        "templatesAvailable": [
           "Template 1",
           "Template 2",
           "Template 3"
         ],
-        "numCustomPresetsAvailable":5
+        "numCustomPresetsAvailable": 5
       },
-      "softButtonCapabilities":[
+      "softButtonCapabilities": [
         {
-          "imageSupported":false,
-          "shortPressAvailable":true,
-          "longPressAvailable":false,
-          "upDownAvailable":true
+          "imageSupported": false,
+          "shortPressAvailable": true,
+          "longPressAvailable": false,
+          "upDownAvailable": true
         },
         {
-          "imageSupported":true,
-          "shortPressAvailable":false,
-          "longPressAvailable":true,
-          "upDownAvailable":false
+          "imageSupported": true,
+          "shortPressAvailable": false,
+          "longPressAvailable": true,
+          "upDownAvailable": false
         }
       ],
-      "presetBankCapabilities":{
-        "OnScreenPresetsAvailable":false
+      "presetBankCapabilities": {
+        "OnScreenPresetsAvailable": false
       }
     }
   }
diff --git a/android/sdl_android/src/androidTest/assets/json/SetGlobalProperties.json b/android/sdl_android/src/androidTest/assets/json/SetGlobalProperties.json
index 60cdfbffb..0746a0461 100644
--- a/android/sdl_android/src/androidTest/assets/json/SetGlobalProperties.json
+++ b/android/sdl_android/src/androidTest/assets/json/SetGlobalProperties.json
@@ -1,66 +1,66 @@
 {
-  "request":{
-    "name":"SetGlobalProperties",
-    "correlationID":151,
-    "parameters":{
-      "vrHelpTitle":"Help Title",
-      "menuTitle":"Menu Title",
-      "menuIcon":{
-        "value":"imageMenu.png",
-        "imageType":"STATIC"
+  "request": {
+    "name": "SetGlobalProperties",
+    "correlationID": 151,
+    "parameters": {
+      "vrHelpTitle": "Help Title",
+      "menuTitle": "Menu Title",
+      "menuIcon": {
+        "value": "imageMenu.png",
+        "imageType": "STATIC"
       },
-      "keyboardProperties":{
-        "keypressMode":"SINGLE_KEYPRESS",
-        "keyboardLayout":"QWERTY",
-        "limitedCharacterList":[
+      "keyboardProperties": {
+        "keypressMode": "SINGLE_KEYPRESS",
+        "keyboardLayout": "QWERTY",
+        "limitedCharacterList": [
           "a",
           "b"
         ],
-        "autoCompleteText":"something goes here",
-        "language":"EN-US"
+        "autoCompleteText": "something goes here",
+        "language": "EN-US"
       },
-      "helpPrompt":[
+      "helpPrompt": [
         {
-          "text":"Phrase 1",
-          "type":"TEXT"
+          "text": "Phrase 1",
+          "type": "TEXT"
         },
         {
-          "text":"Phrase 2",
-          "type":"TEXT"
+          "text": "Phrase 2",
+          "type": "TEXT"
         }
       ],
-      "timeoutPrompt":[
+      "timeoutPrompt": [
         {
-          "text":"Phrase 1",
-          "type":"TEXT"
+          "text": "Phrase 1",
+          "type": "TEXT"
         },
         {
-          "text":"Phrase 2",
-          "type":"TEXT"
+          "text": "Phrase 2",
+          "type": "TEXT"
         }
       ],
-      "vrHelp":[
+      "vrHelp": [
         {
-          "position":2,
-          "text":"Text 1",
-          "image":{
-            "value":"image.png",
-            "imageType":"STATIC"
+          "position": 2,
+          "text": "Text 1",
+          "image": {
+            "value": "image.png",
+            "imageType": "STATIC"
           }
         },
         {
-          "position":5,
-          "text":"Text 2",
-          "image":{
-            "value":"image2.png",
-            "imageType":"DYNAMIC"
+          "position": 5,
+          "text": "Text 2",
+          "image": {
+            "value": "image2.png",
+            "imageType": "DYNAMIC"
           }
         }
       ]
     }
   },
-  "response":{
-    "name":"SetGlobalPropertiesResponse",
-    "correlationID":152
+  "response": {
+    "name": "SetGlobalPropertiesResponse",
+    "correlationID": 152
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/SetInteriorVehicleData.json b/android/sdl_android/src/androidTest/assets/json/SetInteriorVehicleData.json
index 9bcdc01dc..aed8e59d5 100644
--- a/android/sdl_android/src/androidTest/assets/json/SetInteriorVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/SetInteriorVehicleData.json
@@ -1,54 +1,54 @@
 {
-  "request":{
-    "name":"SetInteriorVehicleData",
-    "correlationID":126,
-    "parameters":{
-      "moduleData":{
-        "moduleType":"CLIMATE",
-        "climateControlData":{
-          "circulateAirEnable":true,
-          "ventilationMode":"BOTH",
-          "acEnable":true,
-          "currentTemperature":{
-            "unit":"CELSIUS",
-            "value":100.0
+  "request": {
+    "name": "SetInteriorVehicleData",
+    "correlationID": 126,
+    "parameters": {
+      "moduleData": {
+        "moduleType": "CLIMATE",
+        "climateControlData": {
+          "circulateAirEnable": true,
+          "ventilationMode": "BOTH",
+          "acEnable": true,
+          "currentTemperature": {
+            "unit": "CELSIUS",
+            "value": 100.0
           },
-          "acMaxEnable":true,
-          "desiredTemperature":{
-            "unit":"CELSIUS",
-            "value":100.0
+          "acMaxEnable": true,
+          "desiredTemperature": {
+            "unit": "CELSIUS",
+            "value": 100.0
           },
-          "dualModeEnable":true,
-          "autoModeEnable":true,
-          "fanSpeed":100,
-          "defrostZone":"ALL"
+          "dualModeEnable": true,
+          "autoModeEnable": true,
+          "fanSpeed": 100,
+          "defrostZone": "ALL"
         }
       }
     }
   },
-  "response":{
-    "name":"SetInteriorVehicleDataResponse",
-    "correlationID":127,
-    "parameters":{
-      "moduleData":{
-        "moduleType":"CLIMATE",
-        "climateControlData":{
-          "circulateAirEnable":true,
-          "ventilationMode":"BOTH",
-          "acEnable":true,
-          "currentTemperature":{
-            "unit":"CELSIUS",
-            "value":100.0
+  "response": {
+    "name": "SetInteriorVehicleDataResponse",
+    "correlationID": 127,
+    "parameters": {
+      "moduleData": {
+        "moduleType": "CLIMATE",
+        "climateControlData": {
+          "circulateAirEnable": true,
+          "ventilationMode": "BOTH",
+          "acEnable": true,
+          "currentTemperature": {
+            "unit": "CELSIUS",
+            "value": 100.0
           },
-          "acMaxEnable":true,
-          "desiredTemperature":{
-            "unit":"CELSIUS",
-            "value":100.0
+          "acMaxEnable": true,
+          "desiredTemperature": {
+            "unit": "CELSIUS",
+            "value": 100.0
           },
-          "dualModeEnable":true,
-          "autoModeEnable":true,
-          "fanSpeed":100,
-          "defrostZone":"ALL"
+          "dualModeEnable": true,
+          "autoModeEnable": true,
+          "fanSpeed": 100,
+          "defrostZone": "ALL"
         }
       }
     }
diff --git a/android/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json b/android/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json
index e4950d05d..bd1297398 100644
--- a/android/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json
+++ b/android/sdl_android/src/androidTest/assets/json/SetMediaClockTimer.json
@@ -1,24 +1,24 @@
 {
-  "request":{
-    "name":"SetMediaClockTimer",
-    "correlationID":153,
-    "parameters":{
-      "startTime":{
-        "minutes":49,
-        "seconds":37,
-        "hours":12
+  "request": {
+    "name": "SetMediaClockTimer",
+    "correlationID": 153,
+    "parameters": {
+      "startTime": {
+        "minutes": 49,
+        "seconds": 37,
+        "hours": 12
       },
-      "endTime":{
-        "minutes":55,
-        "seconds":19,
-        "hours":12
+      "endTime": {
+        "minutes": 55,
+        "seconds": 19,
+        "hours": 12
       },
-      "updateMode":"COUNTDOWN",
-      "audioStreamingIndicator":"PLAY"
+      "updateMode": "COUNTDOWN",
+      "audioStreamingIndicator": "PLAY"
     }
   },
-  "response":{
-    "name":"SetMediaClockTimerResponse",
-    "correlationID":154
+  "response": {
+    "name": "SetMediaClockTimerResponse",
+    "correlationID": 154
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/Show.json b/android/sdl_android/src/androidTest/assets/json/Show.json
index 6afe27d72..05f0826e7 100644
--- a/android/sdl_android/src/androidTest/assets/json/Show.json
+++ b/android/sdl_android/src/androidTest/assets/json/Show.json
@@ -1,28 +1,28 @@
 {
-  "request":{
-    "name":"Show",
-    "correlationID":155,
-    "parameters":{
-      "graphic":{
-        "value":"image.png",
-        "imageType":"DYNAMIC"
+  "request": {
+    "name": "Show",
+    "correlationID": 155,
+    "parameters": {
+      "graphic": {
+        "value": "image.png",
+        "imageType": "DYNAMIC"
       },
-      "customPresets":[
+      "customPresets": [
         "Preset 1",
         "Preset 2",
         "Preset 3",
         "Preset 4"
       ],
-      "mainField1":"Main Field 1",
-      "mainField2":"Main Field 2",
-      "mainField3":"Main Field 3",
-      "mainField4":"Main Field 4",
-      "templateTitle":"Template Title",
-      "statusBar":"Status",
-      "mediaClock":"Media Clock",
-      "alignment":"LEFT_ALIGNED",
-      "mediaTrack":"Media Track",
-      "windowID":10,
+      "mainField1": "Main Field 1",
+      "mainField2": "Main Field 2",
+      "mainField3": "Main Field 3",
+      "mainField4": "Main Field 4",
+      "templateTitle": "Template Title",
+      "statusBar": "Status",
+      "mediaClock": "Media Clock",
+      "alignment": "LEFT_ALIGNED",
+      "mediaTrack": "Media Track",
+      "windowID": 10,
       "templateConfiguration": {
         "template": "template",
         "dayColorScheme": {
@@ -60,38 +60,38 @@
           }
         }
       },
-      "secondaryGraphic":{
-        "value":"image2.png",
-        "imageType":"STATIC"
+      "secondaryGraphic": {
+        "value": "image2.png",
+        "imageType": "STATIC"
       },
-      "softButtons":[
+      "softButtons": [
         {
-          "isHighlighted":true,
-          "softButtonID":6,
-          "systemAction":"STEAL_FOCUS",
-          "text":"Button 1",
-          "type":"IMAGE",
-          "image":{
-            "value":"image.png",
-            "imageType":"STATIC"
+          "isHighlighted": true,
+          "softButtonID": 6,
+          "systemAction": "STEAL_FOCUS",
+          "text": "Button 1",
+          "type": "IMAGE",
+          "image": {
+            "value": "image.png",
+            "imageType": "STATIC"
           }
         },
         {
-          "isHighlighted":false,
-          "softButtonID":3,
-          "systemAction":"DEFAULT_ACTION",
-          "text":"Button 2",
-          "type":"BOTH",
-          "image":{
-            "value":"image.png",
-            "imageType":"DYNAMIC"
+          "isHighlighted": false,
+          "softButtonID": 3,
+          "systemAction": "DEFAULT_ACTION",
+          "text": "Button 2",
+          "type": "BOTH",
+          "image": {
+            "value": "image.png",
+            "imageType": "DYNAMIC"
           }
         }
       ]
     }
   },
-  "response":{
-    "name":"ShowResponse",
-    "correlationID":156
+  "response": {
+    "name": "ShowResponse",
+    "correlationID": 156
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/ShowAppMenu.json b/android/sdl_android/src/androidTest/assets/json/ShowAppMenu.json
index 8870423de..137d38afa 100644
--- a/android/sdl_android/src/androidTest/assets/json/ShowAppMenu.json
+++ b/android/sdl_android/src/androidTest/assets/json/ShowAppMenu.json
@@ -1,13 +1,13 @@
 {
-  "request":{
-    "name":"ShowAppMenu",
-    "correlationID":187,
-    "parameters":{
-      "menuID":100
+  "request": {
+    "name": "ShowAppMenu",
+    "correlationID": 187,
+    "parameters": {
+      "menuID": 100
     }
   },
-  "response":{
-    "name":"ShowAppMenuResponse",
-    "correlationID":188
+  "response": {
+    "name": "ShowAppMenuResponse",
+    "correlationID": 188
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/ShowConstantTBT.json b/android/sdl_android/src/androidTest/assets/json/ShowConstantTBT.json
index 0a0c30b0c..765e48062 100644
--- a/android/sdl_android/src/androidTest/assets/json/ShowConstantTBT.json
+++ b/android/sdl_android/src/androidTest/assets/json/ShowConstantTBT.json
@@ -1,52 +1,52 @@
 {
-  "request":{
-    "name":"ShowConstantTbt",
-    "correlationID":196,
-    "parameters":{      
-      "navigationText1":"text1",
-      "navigationText2":"text2",
-      "eta":"10 minutes",
-      "totalDistance":"10km",
-      "distanceToManeuver":10.00,
-      "distanceToManeuverScale":1.00,
-      "turnIcon":{
-          "value":"turn.png",
-          "imageType":"STATIC"
-        },
-      "nextTurnIcon":{
-          "value":"nextTurn.png",
-          "imageType":"STATIC"
-        },
-      "maneuverComplete":true,
-      "softButtons":[
+  "request": {
+    "name": "ShowConstantTbt",
+    "correlationID": 196,
+    "parameters": {
+      "navigationText1": "text1",
+      "navigationText2": "text2",
+      "eta": "10 minutes",
+      "totalDistance": "10km",
+      "distanceToManeuver": 10.00,
+      "distanceToManeuverScale": 1.00,
+      "turnIcon": {
+        "value": "turn.png",
+        "imageType": "STATIC"
+      },
+      "nextTurnIcon": {
+        "value": "nextTurn.png",
+        "imageType": "STATIC"
+      },
+      "maneuverComplete": true,
+      "softButtons": [
         {
-          "isHighlighted":true,
-          "softButtonID":6,
-          "systemAction":"STEAL_FOCUS",
-          "text":"Button 1",
-          "type":"IMAGE",
-          "image":{
-            "value":"image.png",
-            "imageType":"STATIC"
+          "isHighlighted": true,
+          "softButtonID": 6,
+          "systemAction": "STEAL_FOCUS",
+          "text": "Button 1",
+          "type": "IMAGE",
+          "image": {
+            "value": "image.png",
+            "imageType": "STATIC"
           }
         },
         {
-          "isHighlighted":false,
-          "softButtonID":3,
-          "systemAction":"DEFAULT_ACTION",
-          "text":"Button 2",
-          "type":"BOTH",
-          "image":{
-            "value":"image.png",
-            "imageType":"DYNAMIC"
+          "isHighlighted": false,
+          "softButtonID": 3,
+          "systemAction": "DEFAULT_ACTION",
+          "text": "Button 2",
+          "type": "BOTH",
+          "image": {
+            "value": "image.png",
+            "imageType": "DYNAMIC"
           }
         }
       ],
-      "timeToDestination":"52 minutes"
+      "timeToDestination": "52 minutes"
     }
   },
-  "response":{
-    "name":"ShowConstantTbtResponse",
-    "correlationID":197
+  "response": {
+    "name": "ShowConstantTbtResponse",
+    "correlationID": 197
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/Slider.json b/android/sdl_android/src/androidTest/assets/json/Slider.json
index 5b69f4728..73a0859d7 100644
--- a/android/sdl_android/src/androidTest/assets/json/Slider.json
+++ b/android/sdl_android/src/androidTest/assets/json/Slider.json
@@ -1,26 +1,26 @@
 {
-  "request":{
-    "name":"Slider",
-    "correlationID":157,
-    "parameters":{
-      "numTicks":6,
-      "sliderHeader":"Example Header",
-      "sliderFooter":[
+  "request": {
+    "name": "Slider",
+    "correlationID": 157,
+    "parameters": {
+      "numTicks": 6,
+      "sliderHeader": "Example Header",
+      "sliderFooter": [
         "Header Line 1",
         "Header Line 2",
         "Header Line 3",
         "Header Line 4"
       ],
-      "position":11,
-      "timeout":30000,
-      "cancelID":45
+      "position": 11,
+      "timeout": 30000,
+      "cancelID": 45
     }
   },
-  "response":{
-    "name":"SliderResponse",
-    "correlationID":158,
-    "parameters":{
-      "sliderPosition":4
+  "response": {
+    "name": "SliderResponse",
+    "correlationID": 158,
+    "parameters": {
+      "sliderPosition": 4
     }
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/Speak.json b/android/sdl_android/src/androidTest/assets/json/Speak.json
index 413535ac6..6ecd05aec 100644
--- a/android/sdl_android/src/androidTest/assets/json/Speak.json
+++ b/android/sdl_android/src/androidTest/assets/json/Speak.json
@@ -1,22 +1,22 @@
 {
-  "request":{
-    "name":"Speak",
-    "correlationID":159,
-    "parameters":{
-      "ttsChunks":[
+  "request": {
+    "name": "Speak",
+    "correlationID": 159,
+    "parameters": {
+      "ttsChunks": [
         {
-          "text":"Phrase 1",
-          "type":"TEXT"
+          "text": "Phrase 1",
+          "type": "TEXT"
         },
         {
-          "text":"Phrase 2",
-          "type":"TEXT"
+          "text": "Phrase 2",
+          "type": "TEXT"
         }
       ]
     }
   },
-  "response":{
-    "name":"SpeakResponse",
-    "correlationID":160
+  "response": {
+    "name": "SpeakResponse",
+    "correlationID": 160
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/SubscribeButton.json b/android/sdl_android/src/androidTest/assets/json/SubscribeButton.json
index bfb660c7e..f5037ed7a 100644
--- a/android/sdl_android/src/androidTest/assets/json/SubscribeButton.json
+++ b/android/sdl_android/src/androidTest/assets/json/SubscribeButton.json
@@ -1,13 +1,13 @@
 {
-  "request":{
-    "name":"SubscribeButton",
-    "correlationID":161,
-    "parameters":{
-      "buttonName":"TUNEUP"
+  "request": {
+    "name": "SubscribeButton",
+    "correlationID": 161,
+    "parameters": {
+      "buttonName": "TUNEUP"
     }
   },
-  "response":{
-    "name":"SubscribeButtonResponse",
-    "correlationID":162
+  "response": {
+    "name": "SubscribeButtonResponse",
+    "correlationID": 162
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json b/android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
index 697e830bf..51123213c 100644
--- a/android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json
@@ -1,178 +1,178 @@
 {
-  "request":{
-    "name":"SubscribeVehicleData",
-    "correlationID":163,
-    "parameters":{
-      "speed":true,
-      "rpm":true,
-      "externalTemperature":false,
-      "fuelLevel":true,
-      "prndl":true,
-      "tirePressure":true,
-      "engineTorque":false,
-      "engineOilLife":true,
-      "odometer":true,
-      "gps":false,
-      "fuelLevel_State":true,
-      "instantFuelConsumption":false,
-      "beltStatus":true,
-      "bodyInformation":false,
-      "deviceStatus":true,
-      "driverBraking":true,
-      "wiperStatus":false,
-      "headLampStatus":true,
-      "accPedalPosition":true,
-      "steeringWheelAngle":true,
-      "eCallInfo":false,
-      "airbagStatus":true,
-      "emergencyEvent":false,
-      "clusterModeStatus":true,
-      "myKey":true,
-      "fuelRange":true,
-      "turnSignal":true,
-      "electronicParkBrakeStatus":true,
+  "request": {
+    "name": "SubscribeVehicleData",
+    "correlationID": 163,
+    "parameters": {
+      "speed": true,
+      "rpm": true,
+      "externalTemperature": false,
+      "fuelLevel": true,
+      "prndl": true,
+      "tirePressure": true,
+      "engineTorque": false,
+      "engineOilLife": true,
+      "odometer": true,
+      "gps": false,
+      "fuelLevel_State": true,
+      "instantFuelConsumption": false,
+      "beltStatus": true,
+      "bodyInformation": false,
+      "deviceStatus": true,
+      "driverBraking": true,
+      "wiperStatus": false,
+      "headLampStatus": true,
+      "accPedalPosition": true,
+      "steeringWheelAngle": true,
+      "eCallInfo": false,
+      "airbagStatus": true,
+      "emergencyEvent": false,
+      "clusterModeStatus": true,
+      "myKey": true,
+      "fuelRange": true,
+      "turnSignal": true,
+      "electronicParkBrakeStatus": true,
       "stabilityControlsStatus": true,
       "gearStatus": true,
-      "oemCustomVehicleDataName":true,
+      "oemCustomVehicleDataName": true,
       "windowStatus": true,
       "handsOffSteering": true
     }
   },
-  "response":{
-    "name":"SubscribeVehicleDataResponse",
-    "correlationID":164,
-    "parameters":{
-      "speed":{
-        "dataType":"VEHICLEDATA_SPEED",
-        "resultCode":"SUCCESS"
-      },
-      "rpm":{
-        "dataType":"VEHICLEDATA_RPM",
-        "resultCode":"SUCCESS"
-      },
-      "externalTemperature":{
-        "dataType":"VEHICLEDATA_EXTERNTEMP",
-        "resultCode":"SUCCESS"
-      },
-      "fuelLevel":{
-        "dataType":"VEHICLEDATA_FUELLEVEL",
-        "resultCode":"SUCCESS"
-      },
-      "prndl":{
-        "dataType":"VEHICLEDATA_PRNDL",
-        "resultCode":"SUCCESS"
-      },
-      "tirePressure":{
-        "dataType":"VEHICLEDATA_TIREPRESSURE",
-        "resultCode":"VEHICLE_DATA_NOT_AVAILABLE"
-      },
-      "engineTorque":{
-        "dataType":"VEHICLEDATA_SPEED",
-        "resultCode":"INVALID_ID"
-      },
-      "engineOilLife":{
-        "dataType":"VEHICLEDATA_ENGINEOILLIFE",
-        "resultCode":"SUCCESS"
-      },
-      "odometer":{
-        "dataType":"VEHICLEDATA_ODOMETER",
-        "resultCode":"SUCCESS"
-      },
-      "gps":{
-        "dataType":"VEHICLEDATA_GPS",
-        "resultCode":"SUCCESS"
-      },
-      "fuelLevel_State":{
-        "dataType":"VEHICLEDATA_FUELLEVEL_STATE",
-        "resultCode":"DISALLOWED"
-      },
-      "instantFuelConsumption":{
-        "dataType":"VEHICLEDATA_FUELCONSUMPTION",
-        "resultCode":"USER_DISALLOWED"
-      },
-      "beltStatus":{
-        "dataType":"VEHICLEDATA_BELTSTATUS",
-        "resultCode":"SUCCESS"
-      },
-      "bodyInformation":{
-        "dataType":"VEHICLEDATA_BODYINFO",
-        "resultCode":"SUCCESS"
-      },
-      "deviceStatus":{
-        "dataType":"VEHICLEDATA_DEVICESTATUS",
-        "resultCode":"SUCCESS"
-      },
-      "driverBraking":{
-        "dataType":"VEHICLEDATA_BRAKING",
-        "resultCode":"DISALLOWED"
-      },
-      "wiperStatus":{
-        "dataType":"VEHICLEDATA_WIPERSTATUS",
-        "resultCode":"VEHICLE_DATA_NOT_AVAILABLE"
-      },
-      "headLampStatus":{
-        "dataType":"VEHICLEDATA_HEADLAMPSTATUS",
-        "resultCode":"USER_DISALLOWED"
-      },
-      "accPedalPosition":{
-        "dataType":"VEHICLEDATA_ACCPEDAL",
-        "resultCode":"DISALLOWED"
-      },
-      "steeringWheelAngle":{
-        "dataType":"VEHICLEDATA_STEERINGWHEEL",
-        "resultCode":"DATA_NOT_SUBSCRIBED"
-      },
-      "eCallInfo":{
-        "dataType":"VEHICLEDATA_ECALLINFO",
-        "resultCode":"SUCCESS"
-      },
-      "airbagStatus":{
-        "dataType":"VEHICLEDATA_AIRBAGSTATUS",
-        "resultCode":"DATA_ALREADY_SUBSCRIBED"
-      },
-      "emergencyEvent":{
-        "dataType":"VEHICLEDATA_EMERGENCYEVENT",
-        "resultCode":"DISALLOWED"
-      },
-      "clusterModes":{
-        "dataType":"VEHICLEDATA_CLUSTERMODESTATUS",
-        "resultCode":"SUCCESS"
-      },
-      "myKey":{
-        "dataType":"VEHICLEDATA_MYKEY",
-        "resultCode":"IGNORED"
-      },
-      "fuelRange":{
-        "dataType":"VEHICLEDATA_FUELRANGE",
-        "resultCode":"SUCCESS"
+  "response": {
+    "name": "SubscribeVehicleDataResponse",
+    "correlationID": 164,
+    "parameters": {
+      "speed": {
+        "dataType": "VEHICLEDATA_SPEED",
+        "resultCode": "SUCCESS"
+      },
+      "rpm": {
+        "dataType": "VEHICLEDATA_RPM",
+        "resultCode": "SUCCESS"
+      },
+      "externalTemperature": {
+        "dataType": "VEHICLEDATA_EXTERNTEMP",
+        "resultCode": "SUCCESS"
+      },
+      "fuelLevel": {
+        "dataType": "VEHICLEDATA_FUELLEVEL",
+        "resultCode": "SUCCESS"
+      },
+      "prndl": {
+        "dataType": "VEHICLEDATA_PRNDL",
+        "resultCode": "SUCCESS"
+      },
+      "tirePressure": {
+        "dataType": "VEHICLEDATA_TIREPRESSURE",
+        "resultCode": "VEHICLE_DATA_NOT_AVAILABLE"
+      },
+      "engineTorque": {
+        "dataType": "VEHICLEDATA_SPEED",
+        "resultCode": "INVALID_ID"
+      },
+      "engineOilLife": {
+        "dataType": "VEHICLEDATA_ENGINEOILLIFE",
+        "resultCode": "SUCCESS"
+      },
+      "odometer": {
+        "dataType": "VEHICLEDATA_ODOMETER",
+        "resultCode": "SUCCESS"
+      },
+      "gps": {
+        "dataType": "VEHICLEDATA_GPS",
+        "resultCode": "SUCCESS"
+      },
+      "fuelLevel_State": {
+        "dataType": "VEHICLEDATA_FUELLEVEL_STATE",
+        "resultCode": "DISALLOWED"
+      },
+      "instantFuelConsumption": {
+        "dataType": "VEHICLEDATA_FUELCONSUMPTION",
+        "resultCode": "USER_DISALLOWED"
+      },
+      "beltStatus": {
+        "dataType": "VEHICLEDATA_BELTSTATUS",
+        "resultCode": "SUCCESS"
+      },
+      "bodyInformation": {
+        "dataType": "VEHICLEDATA_BODYINFO",
+        "resultCode": "SUCCESS"
+      },
+      "deviceStatus": {
+        "dataType": "VEHICLEDATA_DEVICESTATUS",
+        "resultCode": "SUCCESS"
+      },
+      "driverBraking": {
+        "dataType": "VEHICLEDATA_BRAKING",
+        "resultCode": "DISALLOWED"
+      },
+      "wiperStatus": {
+        "dataType": "VEHICLEDATA_WIPERSTATUS",
+        "resultCode": "VEHICLE_DATA_NOT_AVAILABLE"
+      },
+      "headLampStatus": {
+        "dataType": "VEHICLEDATA_HEADLAMPSTATUS",
+        "resultCode": "USER_DISALLOWED"
+      },
+      "accPedalPosition": {
+        "dataType": "VEHICLEDATA_ACCPEDAL",
+        "resultCode": "DISALLOWED"
+      },
+      "steeringWheelAngle": {
+        "dataType": "VEHICLEDATA_STEERINGWHEEL",
+        "resultCode": "DATA_NOT_SUBSCRIBED"
+      },
+      "eCallInfo": {
+        "dataType": "VEHICLEDATA_ECALLINFO",
+        "resultCode": "SUCCESS"
+      },
+      "airbagStatus": {
+        "dataType": "VEHICLEDATA_AIRBAGSTATUS",
+        "resultCode": "DATA_ALREADY_SUBSCRIBED"
+      },
+      "emergencyEvent": {
+        "dataType": "VEHICLEDATA_EMERGENCYEVENT",
+        "resultCode": "DISALLOWED"
+      },
+      "clusterModes": {
+        "dataType": "VEHICLEDATA_CLUSTERMODESTATUS",
+        "resultCode": "SUCCESS"
+      },
+      "myKey": {
+        "dataType": "VEHICLEDATA_MYKEY",
+        "resultCode": "IGNORED"
+      },
+      "fuelRange": {
+        "dataType": "VEHICLEDATA_FUELRANGE",
+        "resultCode": "SUCCESS"
       },
-      "turnSignal":{
-        "dataType":"VEHICLEDATA_TURNSIGNAL",
-        "resultCode":"IGNORED"
+      "turnSignal": {
+        "dataType": "VEHICLEDATA_TURNSIGNAL",
+        "resultCode": "IGNORED"
       },
-      "electronicParkBrakeStatus":{
-        "dataType":"VEHICLEDATA_ELECTRONICPARKBRAKESTATUS",
-        "resultCode":"SUCCESS"
+      "electronicParkBrakeStatus": {
+        "dataType": "VEHICLEDATA_ELECTRONICPARKBRAKESTATUS",
+        "resultCode": "SUCCESS"
       },
-      "handsOffSteering":{
-        "dataType":"VEHICLEDATA_HANDSOFFSTEERING",
-        "resultCode":"SUCCESS"
+      "handsOffSteering": {
+        "dataType": "VEHICLEDATA_HANDSOFFSTEERING",
+        "resultCode": "SUCCESS"
       },
-      "stabilityControlsStatus":{
-        "dataType":"VEHICLEDATA_STABILITYCONTROLSSTATUS",
-        "resultCode":"SUCCESS"
+      "stabilityControlsStatus": {
+        "dataType": "VEHICLEDATA_STABILITYCONTROLSSTATUS",
+        "resultCode": "SUCCESS"
       },
-      "gearStatus":{
-        "dataType":"VEHICLEDATA_GEARSTATUS",
-        "resultCode":"SUCCESS"
+      "gearStatus": {
+        "dataType": "VEHICLEDATA_GEARSTATUS",
+        "resultCode": "SUCCESS"
       },
-      "oemCustomVehicleDataName":{
-        "oemCustomDataType":"oemCustomVehicleDataName",
-        "resultCode":"SUCCESS"
+      "oemCustomVehicleDataName": {
+        "oemCustomDataType": "oemCustomVehicleDataName",
+        "resultCode": "SUCCESS"
       },
-      "windowStatus":{
-        "dataType":"VEHICLEDATA_WINDOWSTATUS",
-        "resultCode":"SUCCESS"
+      "windowStatus": {
+        "dataType": "VEHICLEDATA_WINDOWSTATUS",
+        "resultCode": "SUCCESS"
       }
     }
   }
diff --git a/android/sdl_android/src/androidTest/assets/json/SubscribeWayPoints.json b/android/sdl_android/src/androidTest/assets/json/SubscribeWayPoints.json
index bd1eee5c6..578da9a7d 100644
--- a/android/sdl_android/src/androidTest/assets/json/SubscribeWayPoints.json
+++ b/android/sdl_android/src/androidTest/assets/json/SubscribeWayPoints.json
@@ -1,10 +1,10 @@
 {
-  "request":{
-    "name":"SubscribeWayPoints",
-    "correlationID":199
+  "request": {
+    "name": "SubscribeWayPoints",
+    "correlationID": 199
   },
-  "response":{
-    "name":"SubscribeWayPointsResponse",
-    "correlationID":200
+  "response": {
+    "name": "SubscribeWayPointsResponse",
+    "correlationID": 200
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/SystemRequest.json b/android/sdl_android/src/androidTest/assets/json/SystemRequest.json
index 44c6d5205..d0495236b 100644
--- a/android/sdl_android/src/androidTest/assets/json/SystemRequest.json
+++ b/android/sdl_android/src/androidTest/assets/json/SystemRequest.json
@@ -1,12 +1,12 @@
 {
-  "request":{
-    "name":"SystemRequest",
-    "correlationID":165,
-    "parameters":{
-      "fileName":"fileName.txt",
-      "requestType":"OEM_SPECIFIC",
-      "requestSubType":"TEST",
-      "data":[
+  "request": {
+    "name": "SystemRequest",
+    "correlationID": 165,
+    "parameters": {
+      "fileName": "fileName.txt",
+      "requestType": "OEM_SPECIFIC",
+      "requestSubType": "TEST",
+      "data": [
         "data1",
         "data2",
         "data3",
@@ -14,8 +14,8 @@
       ]
     }
   },
-  "response":{
-    "name":"SystemRequestResponse",
-    "correlationID":166
+  "response": {
+    "name": "SystemRequestResponse",
+    "correlationID": 166
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/UnpublishAppService.json b/android/sdl_android/src/androidTest/assets/json/UnpublishAppService.json
index 70521a278..ce99ad1b7 100644
--- a/android/sdl_android/src/androidTest/assets/json/UnpublishAppService.json
+++ b/android/sdl_android/src/androidTest/assets/json/UnpublishAppService.json
@@ -1,13 +1,13 @@
 {
-  "request":{
-    "name":"UnpublishAppService",
-    "correlationID":184,
-    "parameters":{
-      "serviceID":"test"
+  "request": {
+    "name": "UnpublishAppService",
+    "correlationID": 184,
+    "parameters": {
+      "serviceID": "test"
     }
   },
-  "response":{
-    "name":"UnpublishAppServiceResponse",
-    "correlationID":185
+  "response": {
+    "name": "UnpublishAppServiceResponse",
+    "correlationID": 185
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/UnregisterAppInterface.json b/android/sdl_android/src/androidTest/assets/json/UnregisterAppInterface.json
index f9cc9f0de..e31c4c70b 100644
--- a/android/sdl_android/src/androidTest/assets/json/UnregisterAppInterface.json
+++ b/android/sdl_android/src/androidTest/assets/json/UnregisterAppInterface.json
@@ -1,10 +1,10 @@
 {
-  "request":{
-    "name":"UnregisterAppInterface",
-    "correlationID":167
+  "request": {
+    "name": "UnregisterAppInterface",
+    "correlationID": 167
   },
-  "response":{
-    "name":"UnregisterAppInterfaceResponse",
-    "correlationID":168
+  "response": {
+    "name": "UnregisterAppInterfaceResponse",
+    "correlationID": 168
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/UnsubscribeButton.json b/android/sdl_android/src/androidTest/assets/json/UnsubscribeButton.json
index cb2164d94..6d8efc1cd 100644
--- a/android/sdl_android/src/androidTest/assets/json/UnsubscribeButton.json
+++ b/android/sdl_android/src/androidTest/assets/json/UnsubscribeButton.json
@@ -1,13 +1,13 @@
 {
-  "request":{
-    "name":"UnsubscribeButton",
-    "correlationID":169,
-    "parameters":{
-      "buttonName":"OK"
+  "request": {
+    "name": "UnsubscribeButton",
+    "correlationID": 169,
+    "parameters": {
+      "buttonName": "OK"
     }
   },
-  "response":{
-    "name":"UnsubscribeButtonResponse",
-    "correlationID":170
+  "response": {
+    "name": "UnsubscribeButtonResponse",
+    "correlationID": 170
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json b/android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
index 5202f1b30..7f57869a5 100644
--- a/android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
+++ b/android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json
@@ -1,178 +1,178 @@
 {
-  "request":{
-    "name":"UnsubscribeVehicleData",
-    "correlationID":171,
-    "parameters":{
-      "speed":true,
-      "rpm":true,
-      "externalTemperature":false,
-      "fuelLevel":true,
-      "prndl":true,
-      "tirePressure":true,
-      "engineTorque":false,
-      "engineOilLife":true,
-      "odometer":true,
-      "gps":false,
-      "fuelLevel_State":true,
-      "instantFuelConsumption":false,
-      "beltStatus":true,
-      "bodyInformation":false,
-      "deviceStatus":true,
-      "driverBraking":true,
-      "wiperStatus":false,
-      "headLampStatus":true,
-      "accPedalPosition":true,
-      "steeringWheelAngle":true,
-      "eCallInfo":false,
-      "airbagStatus":true,
-      "emergencyEvent":false,
-      "clusterModeStatus":true,
-      "myKey":true,
-      "fuelRange":true,
-      "turnSignal":true,
-      "electronicParkBrakeStatus":true,
+  "request": {
+    "name": "UnsubscribeVehicleData",
+    "correlationID": 171,
+    "parameters": {
+      "speed": true,
+      "rpm": true,
+      "externalTemperature": false,
+      "fuelLevel": true,
+      "prndl": true,
+      "tirePressure": true,
+      "engineTorque": false,
+      "engineOilLife": true,
+      "odometer": true,
+      "gps": false,
+      "fuelLevel_State": true,
+      "instantFuelConsumption": false,
+      "beltStatus": true,
+      "bodyInformation": false,
+      "deviceStatus": true,
+      "driverBraking": true,
+      "wiperStatus": false,
+      "headLampStatus": true,
+      "accPedalPosition": true,
+      "steeringWheelAngle": true,
+      "eCallInfo": false,
+      "airbagStatus": true,
+      "emergencyEvent": false,
+      "clusterModeStatus": true,
+      "myKey": true,
+      "fuelRange": true,
+      "turnSignal": true,
+      "electronicParkBrakeStatus": true,
       "stabilityControlsStatus": true,
       "handsOffSteering": true,
       "gearStatus": true,
-      "oemCustomVehicleDataName":true,
+      "oemCustomVehicleDataName": true,
       "windowStatus": true
     }
   },
-  "response":{
-    "name":"UnsubscribeVehicleDataResponse",
-    "correlationID":172,
-    "parameters":{
-      "speed":{
-        "dataType":"VEHICLEDATA_SPEED",
-        "resultCode":"SUCCESS"
-      },
-      "rpm":{
-        "dataType":"VEHICLEDATA_RPM",
-        "resultCode":"SUCCESS"
-      },
-      "externalTemperature":{
-        "dataType":"VEHICLEDATA_EXTERNTEMP",
-        "resultCode":"SUCCESS"
-      },
-      "fuelLevel":{
-        "dataType":"VEHICLEDATA_FUELLEVEL",
-        "resultCode":"SUCCESS"
-      },
-      "prndl":{
-        "dataType":"VEHICLEDATA_PRNDL",
-        "resultCode":"SUCCESS"
-      },
-      "tirePressure":{
-        "dataType":"VEHICLEDATA_TIREPRESSURE",
-        "resultCode":"VEHICLE_DATA_NOT_AVAILABLE"
-      },
-      "engineTorque":{
-        "dataType":"VEHICLEDATA_SPEED",
-        "resultCode":"INVALID_ID"
-      },
-      "engineOilLife":{
-        "dataType":"VEHICLEDATA_ENGINEOILLIFE",
-        "resultCode":"SUCCESS"
-      },
-      "odometer":{
-        "dataType":"VEHICLEDATA_ODOMETER",
-        "resultCode":"SUCCESS"
-      },
-      "gps":{
-        "dataType":"VEHICLEDATA_GPS",
-        "resultCode":"SUCCESS"
-      },
-      "fuelLevel_State":{
-        "dataType":"VEHICLEDATA_FUELLEVEL_STATE",
-        "resultCode":"DISALLOWED"
-      },
-      "instantFuelConsumption":{
-        "dataType":"VEHICLEDATA_FUELCONSUMPTION",
-        "resultCode":"USER_DISALLOWED"
-      },
-      "beltStatus":{
-        "dataType":"VEHICLEDATA_BELTSTATUS",
-        "resultCode":"SUCCESS"
-      },
-      "bodyInformation":{
-        "dataType":"VEHICLEDATA_BODYINFO",
-        "resultCode":"SUCCESS"
-      },
-      "deviceStatus":{
-        "dataType":"VEHICLEDATA_DEVICESTATUS",
-        "resultCode":"SUCCESS"
-      },
-      "driverBraking":{
-        "dataType":"VEHICLEDATA_BRAKING",
-        "resultCode":"DISALLOWED"
-      },
-      "wiperStatus":{
-        "dataType":"VEHICLEDATA_WIPERSTATUS",
-        "resultCode":"VEHICLE_DATA_NOT_AVAILABLE"
-      },
-      "headLampStatus":{
-        "dataType":"VEHICLEDATA_HEADLAMPSTATUS",
-        "resultCode":"USER_DISALLOWED"
-      },
-      "accPedalPosition":{
-        "dataType":"VEHICLEDATA_ACCPEDAL",
-        "resultCode":"DISALLOWED"
-      },
-      "steeringWheelAngle":{
-        "dataType":"VEHICLEDATA_STEERINGWHEEL",
-        "resultCode":"DATA_NOT_SUBSCRIBED"
-      },
-      "eCallInfo":{
-        "dataType":"VEHICLEDATA_ECALLINFO",
-        "resultCode":"SUCCESS"
-      },
-      "airbagStatus":{
-        "dataType":"VEHICLEDATA_AIRBAGSTATUS",
-        "resultCode":"DATA_ALREADY_SUBSCRIBED"
-      },
-      "emergencyEvent":{
-        "dataType":"VEHICLEDATA_EMERGENCYEVENT",
-        "resultCode":"DISALLOWED"
-      },
-      "clusterModes":{
-        "dataType":"VEHICLEDATA_CLUSTERMODESTATUS",
-        "resultCode":"SUCCESS"
-      },
-      "myKey":{
-        "dataType":"VEHICLEDATA_MYKEY",
-        "resultCode":"IGNORED"
-      },
-      "fuelRange":{
-        "dataType":"VEHICLEDATA_FUELRANGE",
-        "resultCode":"SUCCESS"
+  "response": {
+    "name": "UnsubscribeVehicleDataResponse",
+    "correlationID": 172,
+    "parameters": {
+      "speed": {
+        "dataType": "VEHICLEDATA_SPEED",
+        "resultCode": "SUCCESS"
+      },
+      "rpm": {
+        "dataType": "VEHICLEDATA_RPM",
+        "resultCode": "SUCCESS"
+      },
+      "externalTemperature": {
+        "dataType": "VEHICLEDATA_EXTERNTEMP",
+        "resultCode": "SUCCESS"
+      },
+      "fuelLevel": {
+        "dataType": "VEHICLEDATA_FUELLEVEL",
+        "resultCode": "SUCCESS"
+      },
+      "prndl": {
+        "dataType": "VEHICLEDATA_PRNDL",
+        "resultCode": "SUCCESS"
+      },
+      "tirePressure": {
+        "dataType": "VEHICLEDATA_TIREPRESSURE",
+        "resultCode": "VEHICLE_DATA_NOT_AVAILABLE"
+      },
+      "engineTorque": {
+        "dataType": "VEHICLEDATA_SPEED",
+        "resultCode": "INVALID_ID"
+      },
+      "engineOilLife": {
+        "dataType": "VEHICLEDATA_ENGINEOILLIFE",
+        "resultCode": "SUCCESS"
+      },
+      "odometer": {
+        "dataType": "VEHICLEDATA_ODOMETER",
+        "resultCode": "SUCCESS"
+      },
+      "gps": {
+        "dataType": "VEHICLEDATA_GPS",
+        "resultCode": "SUCCESS"
+      },
+      "fuelLevel_State": {
+        "dataType": "VEHICLEDATA_FUELLEVEL_STATE",
+        "resultCode": "DISALLOWED"
+      },
+      "instantFuelConsumption": {
+        "dataType": "VEHICLEDATA_FUELCONSUMPTION",
+        "resultCode": "USER_DISALLOWED"
+      },
+      "beltStatus": {
+        "dataType": "VEHICLEDATA_BELTSTATUS",
+        "resultCode": "SUCCESS"
+      },
+      "bodyInformation": {
+        "dataType": "VEHICLEDATA_BODYINFO",
+        "resultCode": "SUCCESS"
+      },
+      "deviceStatus": {
+        "dataType": "VEHICLEDATA_DEVICESTATUS",
+        "resultCode": "SUCCESS"
+      },
+      "driverBraking": {
+        "dataType": "VEHICLEDATA_BRAKING",
+        "resultCode": "DISALLOWED"
+      },
+      "wiperStatus": {
+        "dataType": "VEHICLEDATA_WIPERSTATUS",
+        "resultCode": "VEHICLE_DATA_NOT_AVAILABLE"
+      },
+      "headLampStatus": {
+        "dataType": "VEHICLEDATA_HEADLAMPSTATUS",
+        "resultCode": "USER_DISALLOWED"
+      },
+      "accPedalPosition": {
+        "dataType": "VEHICLEDATA_ACCPEDAL",
+        "resultCode": "DISALLOWED"
+      },
+      "steeringWheelAngle": {
+        "dataType": "VEHICLEDATA_STEERINGWHEEL",
+        "resultCode": "DATA_NOT_SUBSCRIBED"
+      },
+      "eCallInfo": {
+        "dataType": "VEHICLEDATA_ECALLINFO",
+        "resultCode": "SUCCESS"
+      },
+      "airbagStatus": {
+        "dataType": "VEHICLEDATA_AIRBAGSTATUS",
+        "resultCode": "DATA_ALREADY_SUBSCRIBED"
+      },
+      "emergencyEvent": {
+        "dataType": "VEHICLEDATA_EMERGENCYEVENT",
+        "resultCode": "DISALLOWED"
+      },
+      "clusterModes": {
+        "dataType": "VEHICLEDATA_CLUSTERMODESTATUS",
+        "resultCode": "SUCCESS"
+      },
+      "myKey": {
+        "dataType": "VEHICLEDATA_MYKEY",
+        "resultCode": "IGNORED"
+      },
+      "fuelRange": {
+        "dataType": "VEHICLEDATA_FUELRANGE",
+        "resultCode": "SUCCESS"
       },
-      "turnSignal":{
-        "dataType":"VEHICLEDATA_TURNSIGNAL",
-        "resultCode":"IGNORED"
+      "turnSignal": {
+        "dataType": "VEHICLEDATA_TURNSIGNAL",
+        "resultCode": "IGNORED"
       },
-      "electronicParkBrakeStatus":{
-        "dataType":"VEHICLEDATA_ELECTRONICPARKBRAKESTATUS",
-        "resultCode":"SUCCESS"
+      "electronicParkBrakeStatus": {
+        "dataType": "VEHICLEDATA_ELECTRONICPARKBRAKESTATUS",
+        "resultCode": "SUCCESS"
       },
-      "handsOffSteering":{
-        "dataType":"VEHICLEDATA_HANDSOFFSTEERING",
-        "resultCode":"SUCCESS"
+      "handsOffSteering": {
+        "dataType": "VEHICLEDATA_HANDSOFFSTEERING",
+        "resultCode": "SUCCESS"
       },
-      "gearStatus":{
-        "dataType":"VEHICLEDATA_GEARSTATUS",
-        "resultCode":"SUCCESS"
+      "gearStatus": {
+        "dataType": "VEHICLEDATA_GEARSTATUS",
+        "resultCode": "SUCCESS"
       },
-      "stabilityControlsStatus":{
-        "dataType":"VEHICLEDATA_STABILITYCONTROLSSTATUS",
-        "resultCode":"SUCCESS"
+      "stabilityControlsStatus": {
+        "dataType": "VEHICLEDATA_STABILITYCONTROLSSTATUS",
+        "resultCode": "SUCCESS"
       },
-      "oemCustomVehicleDataName":{
-        "oemCustomDataType":"oemCustomVehicleDataName",
-        "resultCode":"SUCCESS"
+      "oemCustomVehicleDataName": {
+        "oemCustomDataType": "oemCustomVehicleDataName",
+        "resultCode": "SUCCESS"
       },
-      "windowStatus":{
-        "dataType":"VEHICLEDATA_WINDOWSTATUS",
-        "resultCode":"SUCCESS"
+      "windowStatus": {
+        "dataType": "VEHICLEDATA_WINDOWSTATUS",
+        "resultCode": "SUCCESS"
       }
     }
   }
diff --git a/android/sdl_android/src/androidTest/assets/json/UnsubscribeWayPoints.json b/android/sdl_android/src/androidTest/assets/json/UnsubscribeWayPoints.json
index 60e2a98e4..ff33e3281 100644
--- a/android/sdl_android/src/androidTest/assets/json/UnsubscribeWayPoints.json
+++ b/android/sdl_android/src/androidTest/assets/json/UnsubscribeWayPoints.json
@@ -1,10 +1,10 @@
 {
-  "request":{
-    "name":"UnsubscribeWayPoints",
-    "correlationID":201
+  "request": {
+    "name": "UnsubscribeWayPoints",
+    "correlationID": 201
   },
-  "response":{
-    "name":"UnsubscribeWayPointsResponse",
-    "correlationID":202
+  "response": {
+    "name": "UnsubscribeWayPointsResponse",
+    "correlationID": 202
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/assets/json/UpdateTurnList.json b/android/sdl_android/src/androidTest/assets/json/UpdateTurnList.json
index 9cd449acd..fbeb08de5 100644
--- a/android/sdl_android/src/androidTest/assets/json/UpdateTurnList.json
+++ b/android/sdl_android/src/androidTest/assets/json/UpdateTurnList.json
@@ -1,52 +1,52 @@
 {
-  "request":{
-    "name":"UpdateTurnList",
-    "correlationID":192,
-    "parameters":{
-      "softButtons":[
+  "request": {
+    "name": "UpdateTurnList",
+    "correlationID": 192,
+    "parameters": {
+      "softButtons": [
         {
-          "isHighlighted":true,
-          "softButtonID":6,
-          "systemAction":"STEAL_FOCUS",
-          "text":"Button 1",
-          "type":"IMAGE",
-          "image":{
-            "value":"image.png",
-            "imageType":"STATIC"
+          "isHighlighted": true,
+          "softButtonID": 6,
+          "systemAction": "STEAL_FOCUS",
+          "text": "Button 1",
+          "type": "IMAGE",
+          "image": {
+            "value": "image.png",
+            "imageType": "STATIC"
           }
         },
         {
-          "isHighlighted":false,
-          "softButtonID":3,
-          "systemAction":"DEFAULT_ACTION",
-          "text":"Button 2",
-          "type":"BOTH",
-          "image":{
-            "value":"image.png",
-            "imageType":"DYNAMIC"
+          "isHighlighted": false,
+          "softButtonID": 3,
+          "systemAction": "DEFAULT_ACTION",
+          "text": "Button 2",
+          "type": "BOTH",
+          "image": {
+            "value": "image.png",
+            "imageType": "DYNAMIC"
           }
         }
       ],
-      "turnList":[
+      "turnList": [
         {
-          "navigationText":"nav text 1",
-          "turnIcon":{
-            "value":"image.png",
-            "imageType":"DYNAMIC"
+          "navigationText": "nav text 1",
+          "turnIcon": {
+            "value": "image.png",
+            "imageType": "DYNAMIC"
           }
         },
         {
-          "navigationText":"nav text 2",
-          "turnIcon":{
-            "value":"image.png",
-            "imageType":"STATIC"
+          "navigationText": "nav text 2",
+          "turnIcon": {
+            "value": "image.png",
+            "imageType": "STATIC"
           }
         }
       ]
     }
   },
-  "response":{
-    "name":"UpdateTurnListResponse",
-    "correlationID":193
+  "response": {
+    "name": "UpdateTurnListResponse",
+    "correlationID": 193
   }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java
index 0257be444..268335ffc 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java
@@ -31,174 +31,174 @@ import static junit.framework.TestCase.assertTrue;
 public class ManagerUtilityTests {
 
 
-	@Before
-	public void setUp() throws Exception{
-
-	}
-
-	// TESTS
-
-	@Test
-	public void testGetAllImageFields(){
-
-		List<ImageField> fields = ManagerUtility.WindowCapabilityUtility.getAllImageFields();
-		assertNotNull(fields);
-		int size = fields.size();
-		assertEquals(ImageFieldName.values().length, size);
-
-		ImageFieldName[] names = ImageFieldName.values();
-
-		boolean found;
-		for (ImageFieldName name : names) {
-			found = false;
-			for(ImageField field : fields) {
-				if(field != null
-						&& field.getName() != null
-						&& field.getName().equals(name)) {
-					found = true;
-					break;
-				}
-			}
-			assertTrue(found);
-		}
+    @Before
+    public void setUp() throws Exception {
+
+    }
+
+    // TESTS
+
+    @Test
+    public void testGetAllImageFields() {
+
+        List<ImageField> fields = ManagerUtility.WindowCapabilityUtility.getAllImageFields();
+        assertNotNull(fields);
+        int size = fields.size();
+        assertEquals(ImageFieldName.values().length, size);
+
+        ImageFieldName[] names = ImageFieldName.values();
+
+        boolean found;
+        for (ImageFieldName name : names) {
+            found = false;
+            for (ImageField field : fields) {
+                if (field != null
+                        && field.getName() != null
+                        && field.getName().equals(name)) {
+                    found = true;
+                    break;
+                }
+            }
+            assertTrue(found);
+        }
 
-	}
-
-	@Test
-	public void testGetAllTextFields(){
-
-		List<TextField> fields = ManagerUtility.WindowCapabilityUtility.getAllTextFields();
-		assertNotNull(fields);
-		int size = fields.size();
-		assertEquals(TextFieldName.values().length, size);
-
-		TextFieldName[] names = TextFieldName.values();
-
-		boolean found;
-		for (TextFieldName name : names) {
-			found = false;
-			for(TextField field : fields) {
-				if(field != null
-						&& field.getName() != null
-						&& field.getName().equals(name)) {
-					found = true;
-					break;
-				}
-			}
-			assertTrue(found);
-		}
-
-	}
-
-	@Test
-	public void testHasTextFieldOfName() {
-		WindowCapability capability = new WindowCapability();
-		List<TextField> textFieldList = new ArrayList<>();
-		textFieldList.add(new TextField(TextFieldName.mainField1, CharacterSet.UTF_8, 500, 8));
-		capability.setTextFields(textFieldList);
-
-		assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1));
-		assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3));
-
-		textFieldList.add(new TextField(TextFieldName.alertText3, CharacterSet.UTF_8, 500, 8));
-		capability.setTextFields(textFieldList);
-		assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1));
-		assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3));
-
-		textFieldList.clear();
-		textFieldList.add(null);
-		capability.setTextFields(textFieldList);
-		assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1));
-		assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3));
-
-		textFieldList.add(new TextField(TextFieldName.alertText3, CharacterSet.UTF_8, 500, 8));
-		capability.setTextFields(textFieldList);
-		assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1));
-		assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3));
-
-	}
-
-	@Test
-	public void testHasImageFieldOfName() {
-
-		WindowCapability capability = new WindowCapability();
-		List<FileType> allImageFileTypes = Arrays.asList(FileType.GRAPHIC_BMP, FileType.GRAPHIC_JPEG, FileType.GRAPHIC_PNG);
-
-		List<ImageField> imageFieldList = new ArrayList<>();
-		imageFieldList.add(new ImageField(ImageFieldName.graphic, allImageFileTypes));
-		capability.setImageFields(imageFieldList);
-
-		assertTrue(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.graphic));
-		assertFalse(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.alertIcon));
-
-		imageFieldList.add(new ImageField(ImageFieldName.alertIcon, allImageFileTypes));
-		capability.setImageFields(imageFieldList);
-		assertTrue(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.graphic));
-		assertTrue(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.alertIcon));;
-
-		imageFieldList.clear();
-		imageFieldList.add(null);
-		capability.setImageFields(imageFieldList);
-		assertFalse(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.graphic));
-		assertFalse(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.alertIcon));
-
-		imageFieldList.add(new ImageField(ImageFieldName.alertIcon, allImageFileTypes));
-		capability.setImageFields(imageFieldList);
-		assertFalse(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.graphic));
-		assertTrue(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.alertIcon));
-
-	}
-
-
-	@Test
-	public void testGetMaxNumberOfMainFieldLines() {
-
-		WindowCapability capability = new WindowCapability();
-		capability.setTextFields(ManagerUtility.WindowCapabilityUtility.getAllTextFields());
-
-		int maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
-
-		assertEquals(4, maxNumerOfLines);
-
-		//Single line
-		List<TextField> singleLineList = new ArrayList<>();
-		singleLineList.add(new TextField(TextFieldName.mainField1, CharacterSet.UTF_8, 500, 8));
-		capability.setTextFields(singleLineList);
-		maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
-		assertEquals(1, maxNumerOfLines);
-
-		singleLineList.add(new TextField(TextFieldName.mainField2, CharacterSet.UTF_8, 500, 8));
-		capability.setTextFields(singleLineList);
-		maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
-		assertEquals(2, maxNumerOfLines);
-
-		singleLineList.add(new TextField(TextFieldName.mainField3, CharacterSet.UTF_8, 500, 8));
-		capability.setTextFields(singleLineList);
-		maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
-		assertEquals(3, maxNumerOfLines);
-
-		singleLineList.add(new TextField(TextFieldName.mainField4, CharacterSet.UTF_8, 500, 8));
-		capability.setTextFields(singleLineList);
-		maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
-		assertEquals(4, maxNumerOfLines);
-
-		List<TextField> nullList = new ArrayList<>();
-		nullList.add(null);
-		assertNotNull(nullList);
-		capability.setTextFields(nullList);
-		assertNotNull(capability);
-		assertNotNull(capability.getTextFields());
-
-		maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
-		assertEquals(0, maxNumerOfLines);
-
-		nullList.add(new TextField(TextFieldName.mainField4, CharacterSet.UTF_8, 500, 8));
-		assertNotNull(nullList);
-		capability.setTextFields(nullList);
-		assertNotNull(capability);
-		assertNotNull(capability.getTextFields());
-		maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
-		assertEquals(4, maxNumerOfLines);
+    }
+
+    @Test
+    public void testGetAllTextFields() {
+
+        List<TextField> fields = ManagerUtility.WindowCapabilityUtility.getAllTextFields();
+        assertNotNull(fields);
+        int size = fields.size();
+        assertEquals(TextFieldName.values().length, size);
+
+        TextFieldName[] names = TextFieldName.values();
+
+        boolean found;
+        for (TextFieldName name : names) {
+            found = false;
+            for (TextField field : fields) {
+                if (field != null
+                        && field.getName() != null
+                        && field.getName().equals(name)) {
+                    found = true;
+                    break;
+                }
+            }
+            assertTrue(found);
+        }
+
+    }
+
+    @Test
+    public void testHasTextFieldOfName() {
+        WindowCapability capability = new WindowCapability();
+        List<TextField> textFieldList = new ArrayList<>();
+        textFieldList.add(new TextField(TextFieldName.mainField1, CharacterSet.UTF_8, 500, 8));
+        capability.setTextFields(textFieldList);
+
+        assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1));
+        assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3));
+
+        textFieldList.add(new TextField(TextFieldName.alertText3, CharacterSet.UTF_8, 500, 8));
+        capability.setTextFields(textFieldList);
+        assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1));
+        assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3));
+
+        textFieldList.clear();
+        textFieldList.add(null);
+        capability.setTextFields(textFieldList);
+        assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1));
+        assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3));
+
+        textFieldList.add(new TextField(TextFieldName.alertText3, CharacterSet.UTF_8, 500, 8));
+        capability.setTextFields(textFieldList);
+        assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1));
+        assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3));
+
+    }
+
+    @Test
+    public void testHasImageFieldOfName() {
+
+        WindowCapability capability = new WindowCapability();
+        List<FileType> allImageFileTypes = Arrays.asList(FileType.GRAPHIC_BMP, FileType.GRAPHIC_JPEG, FileType.GRAPHIC_PNG);
+
+        List<ImageField> imageFieldList = new ArrayList<>();
+        imageFieldList.add(new ImageField(ImageFieldName.graphic, allImageFileTypes));
+        capability.setImageFields(imageFieldList);
+
+        assertTrue(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.graphic));
+        assertFalse(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.alertIcon));
+
+        imageFieldList.add(new ImageField(ImageFieldName.alertIcon, allImageFileTypes));
+        capability.setImageFields(imageFieldList);
+        assertTrue(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.graphic));
+        assertTrue(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.alertIcon));
+
+        imageFieldList.clear();
+        imageFieldList.add(null);
+        capability.setImageFields(imageFieldList);
+        assertFalse(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.graphic));
+        assertFalse(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.alertIcon));
+
+        imageFieldList.add(new ImageField(ImageFieldName.alertIcon, allImageFileTypes));
+        capability.setImageFields(imageFieldList);
+        assertFalse(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.graphic));
+        assertTrue(ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(capability, ImageFieldName.alertIcon));
+
+    }
+
+
+    @Test
+    public void testGetMaxNumberOfMainFieldLines() {
+
+        WindowCapability capability = new WindowCapability();
+        capability.setTextFields(ManagerUtility.WindowCapabilityUtility.getAllTextFields());
+
+        int maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
+
+        assertEquals(4, maxNumerOfLines);
+
+        //Single line
+        List<TextField> singleLineList = new ArrayList<>();
+        singleLineList.add(new TextField(TextFieldName.mainField1, CharacterSet.UTF_8, 500, 8));
+        capability.setTextFields(singleLineList);
+        maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
+        assertEquals(1, maxNumerOfLines);
+
+        singleLineList.add(new TextField(TextFieldName.mainField2, CharacterSet.UTF_8, 500, 8));
+        capability.setTextFields(singleLineList);
+        maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
+        assertEquals(2, maxNumerOfLines);
+
+        singleLineList.add(new TextField(TextFieldName.mainField3, CharacterSet.UTF_8, 500, 8));
+        capability.setTextFields(singleLineList);
+        maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
+        assertEquals(3, maxNumerOfLines);
+
+        singleLineList.add(new TextField(TextFieldName.mainField4, CharacterSet.UTF_8, 500, 8));
+        capability.setTextFields(singleLineList);
+        maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
+        assertEquals(4, maxNumerOfLines);
+
+        List<TextField> nullList = new ArrayList<>();
+        nullList.add(null);
+        assertNotNull(nullList);
+        capability.setTextFields(nullList);
+        assertNotNull(capability);
+        assertNotNull(capability.getTextFields());
+
+        maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
+        assertEquals(0, maxNumerOfLines);
+
+        nullList.add(new TextField(TextFieldName.mainField4, CharacterSet.UTF_8, 500, 8));
+        assertNotNull(nullList);
+        capability.setTextFields(nullList);
+        assertNotNull(capability);
+        assertNotNull(capability.getTextFields());
+        maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability);
+        assertEquals(4, maxNumerOfLines);
 
-	}
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
index 760a8e40d..c263db59d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
@@ -51,364 +51,364 @@ import static org.mockito.Mockito.when;
 @RunWith(AndroidJUnit4.class)
 public class SdlManagerTests {
 
-	public static BaseTransportConfig transport = null;
-	private Context mTestContext;
-	private Vector<AppHMIType> appType;
-	private TemplateColorScheme templateColorScheme;
-	private int listenerCalledCounter;
-	private SdlManager sdlManager;
-	private ISdl internalInterface;
-
-	// transport related
-	@SuppressWarnings("FieldCanBeLocal")
-	private int TCP_PORT = 12345;
-	@SuppressWarnings("FieldCanBeLocal")
-	private String DEV_MACHINE_IP_ADDRESS = "0.0.0.0";
-
-	@Before
-	public void setUp() throws Exception{
-		mTestContext = Mockito.mock(Context.class);
-
-		// set transport
-		transport = new TCPTransportConfig(TCP_PORT, DEV_MACHINE_IP_ADDRESS, true);
-
-		// add AppTypes
-		appType = new Vector<>();
-		appType.add(AppHMIType.DEFAULT);
-
-		// Color Scheme
-		templateColorScheme = new TemplateColorScheme();
-		templateColorScheme.setBackgroundColor(TestValues.GENERAL_RGBCOLOR);
-		templateColorScheme.setPrimaryColor(TestValues.GENERAL_RGBCOLOR);
-		templateColorScheme.setSecondaryColor(TestValues.GENERAL_RGBCOLOR);
-
-		sdlManager = createSampleManager("heyApp", "123456", TestValues.GENERAL_LOCKSCREENCONFIG);
-	}
-
-	// SETUP / HELPERS
-
-	private Context getTestContext() {
-		return mTestContext;
-	}
-
-	private SdlManager createSampleManager(String appName, String appId, LockScreenConfig lockScreenConfig){
-		SdlManager manager;
-
-		SdlManagerListener listener = new SdlManagerListener() {
-			@Override
-			public void onStart() {
-				listenerCalledCounter++;
-			}
-
-			@Override
-			public void onDestroy() {
-
-			}
-
-			@Override
-			public void onError(String info, Exception e) {
-
-			}
-
-			@Override
-			public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language, Language hmiLanguage) {
-				return null;
-			}
-		};
-
-		// build manager object - use all setters, will test using getters below
-		SdlManager.Builder builder = new SdlManager.Builder(getTestContext(),appId,appName,listener);
-		builder.setShortAppName(appName);
-		builder.setAppTypes(appType);
-		builder.setTransportType(transport);
-		builder.setLanguage(Language.EN_US);
-		builder.setDayColorScheme(templateColorScheme);
-		builder.setNightColorScheme(templateColorScheme);
-		builder.setVrSynonyms(TestValues.GENERAL_VECTOR_STRING);
-		builder.setTtsName(TestValues.GENERAL_VECTOR_TTS_CHUNKS);
-		builder.setLockScreenConfig(lockScreenConfig);
-		builder.setMinimumProtocolVersion(TestValues.GENERAL_VERSION);
-		builder.setMinimumRPCVersion(TestValues.GENERAL_VERSION);
-		builder.setContext(mTestContext);
-		manager = builder.build();
-
-		// mock internalInterface and set it manually
-		internalInterface = mock(ISdl.class);
-		when(internalInterface.getTaskmaster()).thenReturn(new Taskmaster.Builder().build());
-		manager._internalInterface = internalInterface;
-
-		return manager;
-	}
-
-	// TESTS
-
-	@Test
-	public void testNotNull(){
-		assertNotNull(createSampleManager("app","123456", TestValues.GENERAL_LOCKSCREENCONFIG));
-	}
-
-	@Test
-	public void testMissingAppName() {
-		try {
-			createSampleManager(null,"123456", TestValues.GENERAL_LOCKSCREENCONFIG);
-		} catch (IllegalArgumentException ex) {
-			assertSame(ex.getMessage(), "You must specify an app name by calling setAppName");
-		}
-	}
-
-	@Test
-	public void testMissingAppId() {
-		try {
-			createSampleManager("app",null, TestValues.GENERAL_LOCKSCREENCONFIG);
-		} catch (IllegalArgumentException ex) {
-			assertSame(ex.getMessage(), "You must specify an app ID by calling setAppId");
-		}
-	}
-
-	@Test
-	public void testManagerSetters() {
-		assertEquals("123456", sdlManager.getAppId());
-		assertEquals("heyApp", sdlManager.getAppName());
-		assertEquals("heyApp", sdlManager.getShortAppName());
-		assertEquals(appType, sdlManager.getAppTypes());
-		assertEquals(Language.EN_US, sdlManager.getHmiLanguage());
-		assertEquals(Language.EN_US, sdlManager.getLanguage());
-		assertEquals(transport, sdlManager.getTransport());
-		assertEquals(templateColorScheme, sdlManager.getDayColorScheme());
-		assertEquals(templateColorScheme, sdlManager.getNightColorScheme());
-		assertEquals(TestValues.GENERAL_VECTOR_STRING, sdlManager.getVrSynonyms());
-		assertEquals(TestValues.GENERAL_VECTOR_TTS_CHUNKS, sdlManager.getTtsChunks());
-		assertEquals(TestValues.GENERAL_LOCKSCREENCONFIG, sdlManager.getLockScreenConfig());
-		assertEquals(TestValues.GENERAL_VERSION, sdlManager.getMinimumProtocolVersion());
-		assertEquals(TestValues.GENERAL_VERSION, sdlManager.getMinimumRPCVersion());
-	}
-
-	@Test
-	public void testStartingManager(){
-		listenerCalledCounter = 0;
-		
-		try {
-			sdlManager.start();
-		} catch (Exception e) {
-		}
-
-		// Create and force all sub managers to be ready manually. Because SdlManager will not start until all sub managers are ready.
-		// Note: SdlManager.initialize() will not be called automatically by proxy as in real life because we have mock proxy not a real one
-		sdlManager.initialize();
-
-		// Set all sub managers' states to ready
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
-
-		// Make sure the listener is called exactly once
-		assertEquals("Listener was not called or called more/less frequently than expected", 1, listenerCalledCounter);
-	}
-
-	@Test
-	public void testManagerStates() {
-		SdlManager sdlManager = createSampleManager("test", "00000", new LockScreenConfig());
-		sdlManager.initialize();
-
-
-		// Case 1-A:
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.checkState();
-		assertEquals(BaseSubManager.READY, sdlManager.getState());
-
-
-		// Case 1-B:
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
-		sdlManager.checkState();
-		assertEquals(BaseSubManager.READY, sdlManager.getState());
-
-
-		// Case 2-A:
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.checkState();
-		assertEquals(BaseSubManager.ERROR, sdlManager.getState());
-
-
-		// Case 1-B:
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
-		sdlManager.checkState();
-		assertEquals(BaseSubManager.ERROR, sdlManager.getState());
-
-
-		// Case 3-A:
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.SETTING_UP);
-		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.LIMITED);
-		sdlManager.checkState();
-		assertEquals(BaseSubManager.SETTING_UP, sdlManager.getState());
-
-
-		// Case 3-B:
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.SETTING_UP);
-		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
-		sdlManager.checkState();
-		assertEquals(BaseSubManager.SETTING_UP, sdlManager.getState());
-
-
-		// Case 4-A:
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.checkState();
-		assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
-
-
-		// Case 4-B:
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
-		sdlManager.checkState();
-		assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
-
-
-		// Case 5-A:
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.LIMITED);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.checkState();
-		assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
-
-
-		// Case 5-B:
-		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getFileManager().transitionToState(BaseSubManager.LIMITED);
-		sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
-		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
-		sdlManager.checkState();
-		assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
-
-
-		// Case 6
-		sdlManager.dispose();
-		assertEquals(BaseSubManager.SHUTDOWN, sdlManager.getState());
-	}
-
-	@Test
-	public void testSendRPC(){
-		listenerCalledCounter = 0;
-
-		// When internalInterface.sendRPC() is called, create a fake success response
-		Answer<Void> answer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				RPCRequest request = (RPCRequest) args[0];
-				RPCResponse response = new RPCResponse(FunctionID.GET_VEHICLE_DATA.toString());
-				response.setSuccess(true);
-				request.getOnRPCResponseListener().onResponse(0, response);
-				return null;
-			}
-		};
-		doAnswer(answer).when(internalInterface).sendRPC(any(RPCMessage.class));
-
-
-		// Test send RPC request
-		final GetVehicleData request = new GetVehicleData();
-		request.setGps(true);
-		request.setOnRPCResponseListener(new OnRPCResponseListener() {
-			@Override
-			public void onResponse(int correlationId, RPCResponse response) {
-				assertTrue(response.getSuccess());
-				listenerCalledCounter++;
-			}
-		});
-
-		sdlManager.sendRPC(request);
-
-		// Make sure the listener is called exactly once
-		assertEquals("Listener was not called or called more/less frequently than expected", 1, listenerCalledCounter);
-	}
-
-	@Test
-	public void testSendRPCs(){
-		testSendMultipleRPCs(false);
-	}
-
-	@Test
-	public void testSendSequentialRPCs(){
-		testSendMultipleRPCs(true);
-	}
-
-	private void testSendMultipleRPCs(boolean sequentialSend) {
-		listenerCalledCounter = 0;
-
-		// When internalInterface.sendRPCs() is called, call listener.onFinished() to fake the response
-		final Answer<Void> answer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
-				listener.onFinished();
-				return null;
-			}
-		};
-
-		if (sequentialSend) {
-			doAnswer(answer).when(internalInterface).sendSequentialRPCs(any(List.class), any(OnMultipleRequestListener.class));
-
-		} else {
-			doAnswer(answer).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-		}
-
-
-		// Test send RPC requests
-		List<RPCMessage> rpcsList = Arrays.asList(new GetVehicleData(), new Show(), new OnAppServiceData(), new GetAppServiceDataResponse());
-		OnMultipleRequestListener onMultipleRequestListener = new OnMultipleRequestListener() {
-			@Override
-			public void onUpdate(int remainingRequests) {
-			}
-
-			@Override
-			public void onFinished() {
-				listenerCalledCounter++;
-			}
-
-			@Override
-			public void onResponse(int correlationId, RPCResponse response) {
-			}
-		};
-		if (sequentialSend) {
-			sdlManager.sendSequentialRPCs(rpcsList, onMultipleRequestListener);
-		} else {
-			sdlManager.sendRPCs(rpcsList, onMultipleRequestListener);
-		}
-
-
-		// Make sure the listener is called exactly once
-		assertEquals("Listener was not called or called more/less frequently than expected", 1, listenerCalledCounter);
-	}
+    public static BaseTransportConfig transport = null;
+    private Context mTestContext;
+    private Vector<AppHMIType> appType;
+    private TemplateColorScheme templateColorScheme;
+    private int listenerCalledCounter;
+    private SdlManager sdlManager;
+    private ISdl internalInterface;
+
+    // transport related
+    @SuppressWarnings("FieldCanBeLocal")
+    private int TCP_PORT = 12345;
+    @SuppressWarnings("FieldCanBeLocal")
+    private String DEV_MACHINE_IP_ADDRESS = "0.0.0.0";
+
+    @Before
+    public void setUp() throws Exception {
+        mTestContext = Mockito.mock(Context.class);
+
+        // set transport
+        transport = new TCPTransportConfig(TCP_PORT, DEV_MACHINE_IP_ADDRESS, true);
+
+        // add AppTypes
+        appType = new Vector<>();
+        appType.add(AppHMIType.DEFAULT);
+
+        // Color Scheme
+        templateColorScheme = new TemplateColorScheme();
+        templateColorScheme.setBackgroundColor(TestValues.GENERAL_RGBCOLOR);
+        templateColorScheme.setPrimaryColor(TestValues.GENERAL_RGBCOLOR);
+        templateColorScheme.setSecondaryColor(TestValues.GENERAL_RGBCOLOR);
+
+        sdlManager = createSampleManager("heyApp", "123456", TestValues.GENERAL_LOCKSCREENCONFIG);
+    }
+
+    // SETUP / HELPERS
+
+    private Context getTestContext() {
+        return mTestContext;
+    }
+
+    private SdlManager createSampleManager(String appName, String appId, LockScreenConfig lockScreenConfig) {
+        SdlManager manager;
+
+        SdlManagerListener listener = new SdlManagerListener() {
+            @Override
+            public void onStart() {
+                listenerCalledCounter++;
+            }
+
+            @Override
+            public void onDestroy() {
+
+            }
+
+            @Override
+            public void onError(String info, Exception e) {
+
+            }
+
+            @Override
+            public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language, Language hmiLanguage) {
+                return null;
+            }
+        };
+
+        // build manager object - use all setters, will test using getters below
+        SdlManager.Builder builder = new SdlManager.Builder(getTestContext(), appId, appName, listener);
+        builder.setShortAppName(appName);
+        builder.setAppTypes(appType);
+        builder.setTransportType(transport);
+        builder.setLanguage(Language.EN_US);
+        builder.setDayColorScheme(templateColorScheme);
+        builder.setNightColorScheme(templateColorScheme);
+        builder.setVrSynonyms(TestValues.GENERAL_VECTOR_STRING);
+        builder.setTtsName(TestValues.GENERAL_VECTOR_TTS_CHUNKS);
+        builder.setLockScreenConfig(lockScreenConfig);
+        builder.setMinimumProtocolVersion(TestValues.GENERAL_VERSION);
+        builder.setMinimumRPCVersion(TestValues.GENERAL_VERSION);
+        builder.setContext(mTestContext);
+        manager = builder.build();
+
+        // mock internalInterface and set it manually
+        internalInterface = mock(ISdl.class);
+        when(internalInterface.getTaskmaster()).thenReturn(new Taskmaster.Builder().build());
+        manager._internalInterface = internalInterface;
+
+        return manager;
+    }
+
+    // TESTS
+
+    @Test
+    public void testNotNull() {
+        assertNotNull(createSampleManager("app", "123456", TestValues.GENERAL_LOCKSCREENCONFIG));
+    }
+
+    @Test
+    public void testMissingAppName() {
+        try {
+            createSampleManager(null, "123456", TestValues.GENERAL_LOCKSCREENCONFIG);
+        } catch (IllegalArgumentException ex) {
+            assertSame(ex.getMessage(), "You must specify an app name by calling setAppName");
+        }
+    }
+
+    @Test
+    public void testMissingAppId() {
+        try {
+            createSampleManager("app", null, TestValues.GENERAL_LOCKSCREENCONFIG);
+        } catch (IllegalArgumentException ex) {
+            assertSame(ex.getMessage(), "You must specify an app ID by calling setAppId");
+        }
+    }
+
+    @Test
+    public void testManagerSetters() {
+        assertEquals("123456", sdlManager.getAppId());
+        assertEquals("heyApp", sdlManager.getAppName());
+        assertEquals("heyApp", sdlManager.getShortAppName());
+        assertEquals(appType, sdlManager.getAppTypes());
+        assertEquals(Language.EN_US, sdlManager.getHmiLanguage());
+        assertEquals(Language.EN_US, sdlManager.getLanguage());
+        assertEquals(transport, sdlManager.getTransport());
+        assertEquals(templateColorScheme, sdlManager.getDayColorScheme());
+        assertEquals(templateColorScheme, sdlManager.getNightColorScheme());
+        assertEquals(TestValues.GENERAL_VECTOR_STRING, sdlManager.getVrSynonyms());
+        assertEquals(TestValues.GENERAL_VECTOR_TTS_CHUNKS, sdlManager.getTtsChunks());
+        assertEquals(TestValues.GENERAL_LOCKSCREENCONFIG, sdlManager.getLockScreenConfig());
+        assertEquals(TestValues.GENERAL_VERSION, sdlManager.getMinimumProtocolVersion());
+        assertEquals(TestValues.GENERAL_VERSION, sdlManager.getMinimumRPCVersion());
+    }
+
+    @Test
+    public void testStartingManager() {
+        listenerCalledCounter = 0;
+
+        try {
+            sdlManager.start();
+        } catch (Exception e) {
+        }
+
+        // Create and force all sub managers to be ready manually. Because SdlManager will not start until all sub managers are ready.
+        // Note: SdlManager.initialize() will not be called automatically by proxy as in real life because we have mock proxy not a real one
+        sdlManager.initialize();
+
+        // Set all sub managers' states to ready
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
+
+        // Make sure the listener is called exactly once
+        assertEquals("Listener was not called or called more/less frequently than expected", 1, listenerCalledCounter);
+    }
+
+    @Test
+    public void testManagerStates() {
+        SdlManager sdlManager = createSampleManager("test", "00000", new LockScreenConfig());
+        sdlManager.initialize();
+
+
+        // Case 1-A:
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
+        sdlManager.checkState();
+        assertEquals(BaseSubManager.READY, sdlManager.getState());
+
+
+        // Case 1-B:
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
+        sdlManager.checkState();
+        assertEquals(BaseSubManager.READY, sdlManager.getState());
+
+
+        // Case 2-A:
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.checkState();
+        assertEquals(BaseSubManager.ERROR, sdlManager.getState());
+
+
+        // Case 1-B:
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
+        sdlManager.checkState();
+        assertEquals(BaseSubManager.ERROR, sdlManager.getState());
+
+
+        // Case 3-A:
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.SETTING_UP);
+        sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.LIMITED);
+        sdlManager.checkState();
+        assertEquals(BaseSubManager.SETTING_UP, sdlManager.getState());
+
+
+        // Case 3-B:
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.SETTING_UP);
+        sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
+        sdlManager.checkState();
+        assertEquals(BaseSubManager.SETTING_UP, sdlManager.getState());
+
+
+        // Case 4-A:
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
+        sdlManager.checkState();
+        assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
+
+
+        // Case 4-B:
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
+        sdlManager.checkState();
+        assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
+
+
+        // Case 5-A:
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.LIMITED);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
+        sdlManager.checkState();
+        assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
+
+
+        // Case 5-B:
+        sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
+        sdlManager.getFileManager().transitionToState(BaseSubManager.LIMITED);
+        sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
+        sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
+        sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
+        sdlManager.checkState();
+        assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
+
+
+        // Case 6
+        sdlManager.dispose();
+        assertEquals(BaseSubManager.SHUTDOWN, sdlManager.getState());
+    }
+
+    @Test
+    public void testSendRPC() {
+        listenerCalledCounter = 0;
+
+        // When internalInterface.sendRPC() is called, create a fake success response
+        Answer<Void> answer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                RPCRequest request = (RPCRequest) args[0];
+                RPCResponse response = new RPCResponse(FunctionID.GET_VEHICLE_DATA.toString());
+                response.setSuccess(true);
+                request.getOnRPCResponseListener().onResponse(0, response);
+                return null;
+            }
+        };
+        doAnswer(answer).when(internalInterface).sendRPC(any(RPCMessage.class));
+
+
+        // Test send RPC request
+        final GetVehicleData request = new GetVehicleData();
+        request.setGps(true);
+        request.setOnRPCResponseListener(new OnRPCResponseListener() {
+            @Override
+            public void onResponse(int correlationId, RPCResponse response) {
+                assertTrue(response.getSuccess());
+                listenerCalledCounter++;
+            }
+        });
+
+        sdlManager.sendRPC(request);
+
+        // Make sure the listener is called exactly once
+        assertEquals("Listener was not called or called more/less frequently than expected", 1, listenerCalledCounter);
+    }
+
+    @Test
+    public void testSendRPCs() {
+        testSendMultipleRPCs(false);
+    }
+
+    @Test
+    public void testSendSequentialRPCs() {
+        testSendMultipleRPCs(true);
+    }
+
+    private void testSendMultipleRPCs(boolean sequentialSend) {
+        listenerCalledCounter = 0;
+
+        // When internalInterface.sendRPCs() is called, call listener.onFinished() to fake the response
+        final Answer<Void> answer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
+                listener.onFinished();
+                return null;
+            }
+        };
+
+        if (sequentialSend) {
+            doAnswer(answer).when(internalInterface).sendSequentialRPCs(any(List.class), any(OnMultipleRequestListener.class));
+
+        } else {
+            doAnswer(answer).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+        }
+
+
+        // Test send RPC requests
+        List<RPCMessage> rpcsList = Arrays.asList(new GetVehicleData(), new Show(), new OnAppServiceData(), new GetAppServiceDataResponse());
+        OnMultipleRequestListener onMultipleRequestListener = new OnMultipleRequestListener() {
+            @Override
+            public void onUpdate(int remainingRequests) {
+            }
+
+            @Override
+            public void onFinished() {
+                listenerCalledCounter++;
+            }
+
+            @Override
+            public void onResponse(int correlationId, RPCResponse response) {
+            }
+        };
+        if (sequentialSend) {
+            sdlManager.sendSequentialRPCs(rpcsList, onMultipleRequestListener);
+        } else {
+            sdlManager.sendRPCs(rpcsList, onMultipleRequestListener);
+        }
+
+
+        // Make sure the listener is called exactly once
+        assertEquals("Listener was not called or called more/less frequently than expected", 1, listenerCalledCounter);
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
index cf6735ab6..ce8183b9d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
@@ -9,20 +9,20 @@ import android.util.Log;
 

 import androidx.test.platform.app.InstrumentationRegistry;

 

-import com.smartdevicelink.session.SdlSession;

 import com.smartdevicelink.managers.CompletionListener;

+import com.smartdevicelink.managers.ISdl;

 import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;

 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;

 import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;

-import com.smartdevicelink.protocol.enums.SessionType;

-import com.smartdevicelink.streaming.audio.IAudioStreamListener;

-import com.smartdevicelink.managers.ISdl;

 import com.smartdevicelink.protocol.ISdlServiceListener;

+import com.smartdevicelink.protocol.enums.SessionType;

 import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities;

 import com.smartdevicelink.proxy.rpc.enums.AudioType;

 import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;

 import com.smartdevicelink.proxy.rpc.enums.SamplingRate;

 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;

+import com.smartdevicelink.session.SdlSession;

+import com.smartdevicelink.streaming.audio.IAudioStreamListener;

 

 import junit.framework.TestCase;

 

@@ -83,6 +83,7 @@ public class AudioStreamManagerTest extends TestCase {
 

         Answer<Void> audioServiceAnswer = new Answer<Void>() {

             ISdlServiceListener serviceListener = null;

+

             @Override

             public Void answer(InvocationOnMock invocation) {

                 Method method = invocation.getMethod();

@@ -228,6 +229,7 @@ public class AudioStreamManagerTest extends TestCase {
 

     private int testFullAudioManagerDecodeFlowCorrectCounter = 0;

     private int testFullAudioManagerDecodeFlowWrongCounter = 0;

+

     private void runFullAudioManagerDecodeFlowWithSquareSampleAudio(final int sampleRate, final @SampleType int sampleType, final AudioPassThruCapabilities audioCapabilities) {

         testFullAudioManagerDecodeFlowCorrectCounter = 0;

         testFullAudioManagerDecodeFlowWrongCounter = 0;

@@ -272,6 +274,7 @@ public class AudioStreamManagerTest extends TestCase {
 

         Answer<Void> audioServiceAnswer = new Answer<Void>() {

             ISdlServiceListener serviceListener = null;

+

             @Override

             public Void answer(InvocationOnMock invocation) {

                 Method method = invocation.getMethod();

@@ -310,7 +313,7 @@ public class AudioStreamManagerTest extends TestCase {
                 assertEquals(true, success);

 

                 // not more than 2.5 percent samples must be wrong

-                double relation = 100.0 * (double)testFullAudioManagerDecodeFlowWrongCounter / (double)testFullAudioManagerDecodeFlowCorrectCounter;

+                double relation = 100.0 * (double) testFullAudioManagerDecodeFlowWrongCounter / (double) testFullAudioManagerDecodeFlowCorrectCounter;

                 Log.v(TAG, "Validating number of correct samples (" + Math.round(relation) + "%)");

                 if (relation > 2.5) {

                     fail("Validating raw audio failed. " + Math.round(relation) + " % wrong samples detected. Correct: " + testFullAudioManagerDecodeFlowCorrectCounter + ", Wrong: " + testFullAudioManagerDecodeFlowWrongCounter);

@@ -411,11 +414,11 @@ public class AudioStreamManagerTest extends TestCase {
 

             // channel count, sample rate, sample type

             int key_channel_count = 0, key_sample_rate = 1, key_sample_type = 2, key_sample_type_result = 3;

-            int[][] tests = new int[][] {

-                    { 47, 42000, AudioFormat.ENCODING_PCM_8BIT, SampleType.UNSIGNED_8_BIT },

-                    { 2, 16000, AudioFormat.ENCODING_PCM_16BIT, SampleType.SIGNED_16_BIT },

-                    { 1, 22050, AudioFormat.ENCODING_PCM_FLOAT, SampleType.FLOAT },

-                    { 3, 48000, AudioFormat.ENCODING_INVALID, SampleType.SIGNED_16_BIT },

+            int[][] tests = new int[][]{

+                    {47, 42000, AudioFormat.ENCODING_PCM_8BIT, SampleType.UNSIGNED_8_BIT},

+                    {2, 16000, AudioFormat.ENCODING_PCM_16BIT, SampleType.SIGNED_16_BIT},

+                    {1, 22050, AudioFormat.ENCODING_PCM_FLOAT, SampleType.FLOAT},

+                    {3, 48000, AudioFormat.ENCODING_INVALID, SampleType.SIGNED_16_BIT},

             };

 

             for (int[] test : tests) {

@@ -502,6 +505,7 @@ public class AudioStreamManagerTest extends TestCase {
 

         Answer<Void> audioServiceAnswer = new Answer<Void>() {

             ISdlServiceListener serviceListener = null;

+

             @Override

             public Void answer(InvocationOnMock invocation) {

                 Method method = invocation.getMethod();

@@ -629,7 +633,7 @@ public class AudioStreamManagerTest extends TestCase {
             }

         });

 

-        verify(audioStreamListener, timeout(10000)).sendAudio(any(ByteBuffer.class), any(Long.class),  eq(completionListener));

+        verify(audioStreamListener, timeout(10000)).sendAudio(any(ByteBuffer.class), any(Long.class), eq(completionListener));

     }

 

     private Method getSampleAtTargetMethod() {

@@ -666,10 +670,10 @@ public class AudioStreamManagerTest extends TestCase {
         header[2] = 'F';

         header[3] = 'F';

         // Total data length (UInt32).

-        header[4] = (byte)((datalength) & 0xff);

-        header[5] = (byte)((datalength >> 8) & 0xff);

-        header[6] = (byte)((datalength >> 16) & 0xff);

-        header[7] = (byte)((datalength >> 24) & 0xff);

+        header[4] = (byte) ((datalength) & 0xff);

+        header[5] = (byte) ((datalength >> 8) & 0xff);

+        header[6] = (byte) ((datalength >> 16) & 0xff);

+        header[7] = (byte) ((datalength >> 24) & 0xff);

         // WAVE header.

         header[8] = 'W';

         header[9] = 'A';

@@ -686,42 +690,44 @@ public class AudioStreamManagerTest extends TestCase {
         header[18] = 0;

         header[19] = 0;

         // Format type (UInt16). Set 1 for PCM.

-        header[20] = (byte)((format) & 0xff);

-        header[21] = (byte)((format >> 8) & 0xff);

+        header[20] = (byte) ((format) & 0xff);

+        header[21] = (byte) ((format >> 8) & 0xff);

         // Channels

-        header[22] = (byte)((channels) & 0xff);

-        header[23] = (byte)((channels >> 8) & 0xff);

+        header[22] = (byte) ((channels) & 0xff);

+        header[23] = (byte) ((channels >> 8) & 0xff);

         // Sample rate (UInt32).

-        header[24] = (byte)((samplerate) & 0xff);

-        header[25] = (byte)((samplerate >> 8) & 0xff);

-        header[26] = (byte)((samplerate >> 16) & 0xff);

-        header[27] = (byte)((samplerate >> 24) & 0xff);

+        header[24] = (byte) ((samplerate) & 0xff);

+        header[25] = (byte) ((samplerate >> 8) & 0xff);

+        header[26] = (byte) ((samplerate >> 16) & 0xff);

+        header[27] = (byte) ((samplerate >> 24) & 0xff);

         // Byte rate (UInt32).

-        header[28] = (byte)((byterate) & 0xff);

-        header[29] = (byte)((byterate >> 8) & 0xff);

-        header[30] = (byte)((byterate >> 16) & 0xff);

-        header[31] = (byte)((byterate >> 24) & 0xff);

+        header[28] = (byte) ((byterate) & 0xff);

+        header[29] = (byte) ((byterate >> 8) & 0xff);

+        header[30] = (byte) ((byterate >> 16) & 0xff);

+        header[31] = (byte) ((byterate >> 24) & 0xff);

         // Block alignment (UInt16).

-        header[32] = (byte)((blockalign) & 0xff);

-        header[33] = (byte)((blockalign >> 8) & 0xff);

+        header[32] = (byte) ((blockalign) & 0xff);

+        header[33] = (byte) ((blockalign >> 8) & 0xff);

         // Bits per sample (UInt16).

-        header[34] = (byte)((bitspersample) & 0xff);

-        header[35] = (byte)((bitspersample >> 8) & 0xff);

+        header[34] = (byte) ((bitspersample) & 0xff);

+        header[35] = (byte) ((bitspersample >> 8) & 0xff);

         // Data header

         header[36] = 'd';

         header[37] = 'a';

         header[38] = 't';

         header[39] = 'a';

         // Total audio length (UInt32).

-        header[40] = (byte)((audiolength) & 0xff);

-        header[41] = (byte)((audiolength >> 8) & 0xff);

-        header[42] = (byte)((audiolength >> 16) & 0xff);

-        header[43] = (byte)((audiolength >> 24) & 0xff);

+        header[40] = (byte) ((audiolength) & 0xff);

+        header[41] = (byte) ((audiolength >> 8) & 0xff);

+        header[42] = (byte) ((audiolength >> 16) & 0xff);

+        header[43] = (byte) ((audiolength >> 24) & 0xff);

 

         stream.write(header, 0, header.length);

     }

 

-    /** Updates the data length and audio length of an existing RIFF/WAVE header in the file pointed by the RandomAccessFile object. */

+    /**

+     * Updates the data length and audio length of an existing RIFF/WAVE header in the file pointed by the RandomAccessFile object.

+     */

     private void updateWaveHeaderLength(RandomAccessFile stream, long audiolength) throws IOException {

         // the data header is 36 bytes large

         long datalength = 36 + audiolength;

@@ -729,16 +735,16 @@ public class AudioStreamManagerTest extends TestCase {
         // Seek from the beginning to data length

         stream.seek(4);

         // Overwrite total data length

-        stream.write((int)((datalength) & 0xff));

-        stream.write((int)((datalength >> 8) & 0xff));

-        stream.write((int)((datalength >> 16) & 0xff));

-        stream.write((int)((datalength >> 24) & 0xff));

+        stream.write((int) ((datalength) & 0xff));

+        stream.write((int) ((datalength >> 8) & 0xff));

+        stream.write((int) ((datalength >> 16) & 0xff));

+        stream.write((int) ((datalength >> 24) & 0xff));

         // Seek from the end of data length to audio length

         stream.seek(40);

         // overwrite total audio length

-        stream.write((int)((audiolength) & 0xff));

-        stream.write((int)((audiolength >> 8) & 0xff));

-        stream.write((int)((audiolength >> 16) & 0xff));

-        stream.write((int)((audiolength >> 24) & 0xff));

+        stream.write((int) ((audiolength) & 0xff));

+        stream.write((int) ((audiolength >> 8) & 0xff));

+        stream.write((int) ((audiolength >> 16) & 0xff));

+        stream.write((int) ((audiolength >> 24) & 0xff));

     }

 }

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
index a99214774..e45d455e0 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
@@ -7,11 +7,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.file.filetypes.SdlFile;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.DeleteFile;
 import com.smartdevicelink.proxy.rpc.DeleteFileResponse;
 import com.smartdevicelink.proxy.rpc.ListFiles;
@@ -51,957 +51,958 @@ import static org.mockito.Mockito.verify;
  */
 @RunWith(AndroidJUnit4.class)
 public class FileManagerTests {
-	public static final String TAG = "FileManagerTests";
-	private Context mTestContext;
-	private SdlFile validFile;
-
-	// SETUP / HELPERS
-
-	@Before
-	public void setUp() throws Exception{
-		mTestContext = getInstrumentation().getTargetContext();
-		validFile = new SdlFile();
-		validFile.setName(TestValues.GENERAL_STRING);
-		validFile.setFileData(TestValues.GENERAL_BYTE_ARRAY);
-		validFile.setPersistent(false);
-	}
-
-	private Answer<Void> onPutFileFailureOnError = new Answer<Void>() {
-		@Override
-		public Void answer(InvocationOnMock invocation) throws Throwable {
-			Object[] args = invocation.getArguments();
-			RPCRequest message = (RPCRequest) args[0];
-			if (message instanceof PutFile) {
-				int correlationId = message.getCorrelationID();
-				PutFileResponse putFileResponse = new PutFileResponse(false, Result.REJECTED);
-				putFileResponse.setInfo("Binary data empty");
-				message.getOnRPCResponseListener().onResponse(correlationId, putFileResponse);
-			}
-			return null;
-		}
-	};
-
-	private Answer<Void> onSendRequestsFailOnError = new Answer<Void>() {
-		@Override
-		public Void answer(InvocationOnMock invocation) throws Throwable {
-			Object[] args = invocation.getArguments();
-			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
-			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
-			if (rpcs.get(0) instanceof PutFile) {
-				for (RPCRequest message : rpcs) {
-					int correlationId = message.getCorrelationID();
-					listener.addCorrelationId(correlationId);
-					PutFileResponse putFileResponse = new PutFileResponse(false, Result.REJECTED);
-					putFileResponse.setInfo("Binary data empty");
-					listener.onResponse(correlationId, putFileResponse);
-				}
-				listener.onFinished();
-			}
-			return null;
-		}
-	};
-
-	private Answer<Void> onListFileUploadSuccess = new Answer<Void>() {
-		@Override
-		public Void answer(InvocationOnMock invocation) throws Throwable {
-			Object[] args = invocation.getArguments();
-			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
-			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
-			if (rpcs.get(0) instanceof PutFile) {
-				for (RPCRequest message : rpcs) {
-					int correlationId = message.getCorrelationID();
-					listener.addCorrelationId(correlationId);
-					PutFileResponse putFileResponse = new PutFileResponse();
-					putFileResponse.setSuccess(true);
-					listener.onResponse(correlationId, putFileResponse);
-				}
-				listener.onFinished();
-			}
-			return null;
-		}
-	};
-
-	private Answer<Void> onListFilesSuccess = new Answer<Void>() {
-		@Override
-		public Void answer(InvocationOnMock invocation) {
-			Object[] args = invocation.getArguments();
-			RPCRequest message = (RPCRequest) args[0];
-			if(message instanceof ListFiles){
-				int correlationId = message.getCorrelationID();
-				ListFilesResponse listFilesResponse = new ListFilesResponse();
-				listFilesResponse.setFilenames(TestValues.GENERAL_STRING_LIST);
-				listFilesResponse.setSpaceAvailable(TestValues.GENERAL_INT);
-				listFilesResponse.setSuccess(true);
-				message.getOnRPCResponseListener().onResponse(correlationId, listFilesResponse);
-			}
-			return null;
-		}
-	};
-
-	private Answer<Void> onPutFileSuccess = new Answer<Void>() {
-		@Override
-		public Void answer(InvocationOnMock invocation) {
-			Object[] args = invocation.getArguments();
-			RPCRequest message = (RPCRequest) args[0];
-			if(message instanceof PutFile){
-				int correlationId = message.getCorrelationID();
-				PutFileResponse putFileResponse = new PutFileResponse();
-				putFileResponse.setSuccess(true);
-				putFileResponse.setSpaceAvailable(TestValues.GENERAL_INT);
-				message.getOnRPCResponseListener().onResponse(correlationId, putFileResponse);
-			}
-			return null;
-		}
-	};
-
-	private Answer<Void> onPutFileFailure = new Answer<Void>() {
-		@Override
-		public Void answer(InvocationOnMock invocation) {
-			Object[] args = invocation.getArguments();
-			RPCRequest message = (RPCRequest) args[0];
-			if(message instanceof PutFile){
-				int correlationId = message.getCorrelationID();
-				PutFileResponse putFileResponse = new PutFileResponse();
-				putFileResponse.setSuccess(false);
-				message.getOnRPCResponseListener().onResponse(correlationId, putFileResponse);
-			}
-			return null;
-		}
-	};
-
-	private Answer<Void> onListDeleteRequestSuccess = new Answer<Void>() {
-		@Override
-		public Void answer(InvocationOnMock invocation) {
-			Object[] args = invocation.getArguments();
-			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
-			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
-			if (rpcs.get(0) instanceof DeleteFile) {
-				for (RPCRequest message : rpcs) {
-					int correlationId = message.getCorrelationID();
-					listener.addCorrelationId(correlationId);
-					DeleteFileResponse deleteFileResponse = new DeleteFileResponse();
-					deleteFileResponse.setSuccess(true);
-					listener.onResponse(correlationId, deleteFileResponse);
-				}
-				listener.onFinished();
-			}
-			return null;
-		}
-	};
-
-	private Answer<Void> onListDeleteRequestFail = new Answer<Void>() {
-		@Override
-		public Void answer(InvocationOnMock invocation) {
-			Object[] args = invocation.getArguments();
-			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
-			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
-			if (rpcs.get(0) instanceof DeleteFile) {
-				for (RPCRequest message : rpcs) {
-					int correlationId = message.getCorrelationID();
-					listener.addCorrelationId(correlationId);
-					DeleteFileResponse deleteFileResponse = new DeleteFileResponse(false, Result.REJECTED);
-					deleteFileResponse.setInfo("Binary data empty");
-					listener.onResponse(correlationId, deleteFileResponse);
-				}
-				listener.onFinished();
-			}
-			return null;
-		}
-	};
-
-	private Answer<Void> onSendRequestsFailPartialOnError = new Answer<Void>() {
-		@Override
-		public Void answer(InvocationOnMock invocation) throws Throwable {
-			Object[] args = invocation.getArguments();
-			List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
-			OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
-			if (rpcs.get(0) instanceof PutFile) {
-				boolean flip = false;
-				for (RPCRequest message : rpcs) {
-					int correlationId = message.getCorrelationID();
-					listener.addCorrelationId(correlationId);
-					PutFileResponse putFileResponse = new PutFileResponse();
-					if (flip) {
-						putFileResponse.setSuccess(true);
-						flip = false;
-						listener.onResponse(correlationId, putFileResponse);
-					} else {
-						flip = true;
-						putFileResponse.setSuccess(false);
-						putFileResponse.setResultCode(Result.REJECTED);
-						putFileResponse.setInfo("Binary data empty");
-						listener.onResponse(correlationId, putFileResponse);
-					}
-				}
-				listener.onFinished();
-			}
-			return null;
-		}
-	};
-
-	// TESTS
-
-	/**
-	 * Test deleting list of files, success
-	 */
-	@Test
-	public void testDeleteRemoteFilesWithNamesSuccess(){
-		final ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListDeleteRequestSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-
-		final List<String> fileNames = new ArrayList<>();
-		fileNames.add("Julian");
-		fileNames.add("Jake");
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		fileManagerConfig.setFileRetryCount(2);
-
-		final FileManager fileManager = new FileManager(internalInterface,mTestContext,fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				fileManager.deleteRemoteFilesWithNames(fileNames, new MultipleFileCompletionListener() {
-					@Override
-					public void onComplete(Map<String, String> errors) {
-						assertTrue(errors == null);
-					}
-				});
-			}
-		});
-	}
-
-	/**
-	 * Test deleting list of files, fail
-	 */
-	@Test
-	public void testDeleteRemoteFilesWithNamesFail(){
-		final ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListDeleteRequestFail).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-
-		final List<String> fileNames = new ArrayList<>();
-		fileNames.add("Julian");
-		fileNames.add("Jake");
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		fileManagerConfig.setFileRetryCount(2);
-
-		final FileManager fileManager = new FileManager(internalInterface,mTestContext,fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				fileManager.deleteRemoteFilesWithNames(fileNames, new MultipleFileCompletionListener() {
-					@Override
-					public void onComplete(Map<String, String> errors) {
-						assertTrue(errors.size() == 2);
-					}
-				});
-			}
-		});
-	}
-
-	/**
-	 * Test reUploading failed file
-	 */
-	@Test
-	public void testFileUploadRetry(){
-		final ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onPutFileFailureOnError).when(internalInterface).sendRPC(any(PutFile.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		fileManagerConfig.setFileRetryCount(2);
-
-		validFile.setType(FileType.AUDIO_MP3);
-
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext,fileManagerConfig);
-
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				fileManager.uploadFile(validFile, new CompletionListener() {
-					@Override
-					public void onComplete(boolean success) {
-						assertFalse(success);
-					}
-				});
-			}
-		});
-		verify(internalInterface, times(4)).sendRPC(any(RPCMessage.class));
-	}
-
-	/**
-	 * Test reUploading failed Artwork
-	 */
-	@Test
-	public void testArtworkUploadRetry(){
-		final ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onPutFileFailureOnError).when(internalInterface).sendRPC(any(PutFile.class));
-
-		final SdlFile validFile2 = new SdlFile();
-		validFile2.setName(TestValues.GENERAL_STRING + "2");
-		validFile2.setFileData(TestValues.GENERAL_BYTE_ARRAY);
-		validFile2.setPersistent(false);
-		validFile2.setType(FileType.GRAPHIC_PNG);
-
-		final SdlFile validFile3 = new SdlFile();
-		validFile3.setName(TestValues.GENERAL_STRING + "3");
-		validFile3.setFileData(TestValues.GENERAL_BYTE_ARRAY);
-		validFile3.setPersistent(false);
-		validFile3.setType(FileType.GRAPHIC_BMP);
-
-		validFile.setType(FileType.GRAPHIC_JPEG);
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		fileManagerConfig.setArtworkRetryCount(2);
-
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext,fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				fileManager.uploadFile(validFile, new CompletionListener() {
-					@Override
-					public void onComplete(boolean success) {
-						assertFalse(success);
-						verify(internalInterface, times(4)).sendRPC(any(RPCMessage.class));
-					}
-				});
-
-				fileManager.uploadFile(validFile2, new CompletionListener() {
-					@Override
-					public void onComplete(boolean success) {
-						assertFalse(success);
-						verify(internalInterface, times(7)).sendRPC(any(RPCMessage.class));
-					}
-				});
-
-				fileManager.uploadFile(validFile3, new CompletionListener() {
-					@Override
-					public void onComplete(boolean success) {
-						assertFalse(success);
-					}
-				});
-			}
-		});
-		verify(internalInterface, times(10)).sendRPC(any(RPCMessage.class));
-	}
-
-	/**
-	 * Test retry uploading failed list of files
-	 */
-	@Test
-	public void testListFilesUploadRetry(){
-		final ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onSendRequestsFailOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-
-		SdlFile validFile2 = new SdlFile();
-		validFile2.setName(TestValues.GENERAL_STRING + "2");
-		validFile2.setFileData(TestValues.GENERAL_BYTE_ARRAY);
-		validFile2.setPersistent(false);
-		validFile2.setType(FileType.GRAPHIC_JPEG);
-
-		validFile.setType(FileType.AUDIO_WAVE);
-
-		final List<SdlFile> list = new ArrayList<>();
-		list.add(validFile);
-		list.add(validFile2);
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		fileManagerConfig.setArtworkRetryCount(2);
-		fileManagerConfig.setFileRetryCount(4);
-
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext,fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				fileManager.uploadFiles(list, new MultipleFileCompletionListener() {
-					@Override
-					public void onComplete(Map<String, String> errors) {
-						assertTrue(errors.size() == 2); // We need to make sure it kept track of both Files
-					}
-				});
-
-			}
-		});
-		verify(internalInterface, times(5)).sendRPCs(any(List.class),any(OnMultipleRequestListener.class));
-	}
-
-	/**
-	 * Testing the initialization of FileManager
-	 */
-	@Test
-	public void testInitializationSuccess() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				assertEquals(fileManager.getState(), BaseSubManager.READY);
-				assertEquals(fileManager.getRemoteFileNames(), TestValues.GENERAL_STRING_LIST);
-				assertEquals(TestValues.GENERAL_INT, fileManager.getBytesAvailable());
-			}
-		});
-	}
-
-	/**
-	 * Test file upload, success
-	 */
-	@Test
-	public void testFileUploadSuccess() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onPutFileSuccess).when(internalInterface).sendRPC(any(PutFile.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				fileManager.uploadFile(validFile, new CompletionListener() {
-					@Override
-					public void onComplete(boolean success) {
-						assertTrue(success);
-					}
-				});
-			}
-		});
-		assertTrue(fileManager.getRemoteFileNames().contains(validFile.getName()));
-		assertTrue(fileManager.hasUploadedFile(validFile));
-		assertEquals(TestValues.GENERAL_INT, fileManager.getBytesAvailable());
-	}
-
-	/**
-	 * Testing failed file upload.
-	 */
-	@Test
-	public void testFileUploadFailure() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onPutFileFailure).when(internalInterface).sendRPC(any(PutFile.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				fileManager.uploadFile(validFile, new CompletionListener() {
-					@Override
-					public void onComplete(boolean success) {
-						assertFalse(success);
-						assertFalse(fileManager.getRemoteFileNames().contains(validFile.getName()));
-						assertFalse(fileManager.hasUploadedFile(validFile));
-					}
-				});
-			}
-		});
-	}
-
-	/**
-	 * Testing uploadFile for a staticIcon, verifying that it doesn't actually upload.
-	 */
-	@Test
-	public void testFileUploadForStaticIcon() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				SdlArtwork artwork = new SdlArtwork(StaticIconName.ALBUM);
-				fileManager.uploadFile(artwork, new CompletionListener() {
-					@Override
-					public void onComplete(boolean success) {
-						assertTrue(success);
-					}
-				});
-			}
-		});
-		verify(internalInterface, times(1)).sendRPC(any(RPCMessage.class));
-	}
-
-	/**
-	 * Testing uploadFiles for staticIcons, verifying that it doesn't actually upload.
-	 */
-	@Test
-	public void testMultipleFileUploadsForStaticIcon() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				SdlArtwork artwork = new SdlArtwork(StaticIconName.ALBUM);
-				SdlArtwork artwork2 = new SdlArtwork(StaticIconName.FILENAME);
-				List<SdlArtwork> testStaticIconUpload = new ArrayList<>();
-				testStaticIconUpload.add(artwork);
-				testStaticIconUpload.add(artwork2);
-				fileManager.uploadFiles(testStaticIconUpload, new MultipleFileCompletionListener() {
-					@Override
-					public void onComplete(Map<String, String> errors) {
-						assertTrue(errors == null);
-					}
-				});
-			}
-		});
-		verify(internalInterface, times(0)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-	}
-
-	/**
-	 * Testing uploadFiles for static icons and nonStatic icons in the same list.
-	 */
-	@Test
-	public void testMultipleFileUploadsForPartialStaticIcon() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				SdlArtwork artwork = new SdlArtwork(StaticIconName.ALBUM);
-				SdlArtwork artwork2 = new SdlArtwork(StaticIconName.FILENAME);
-				List<SdlFile> testFileuploads = new ArrayList<>();
-				testFileuploads.add(artwork);
-				testFileuploads.add(artwork2);
-				testFileuploads.add(validFile);
-				fileManager.uploadFiles(testFileuploads, new MultipleFileCompletionListener() {
-					@Override
-					public void onComplete(Map<String, String> errors) {
-						assertTrue(errors == null);
-					}
-				});
-			}
-		});
-		verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-	}
-
-	/**
-	 * Test to make sure you cannot upload an SdlFile with invalid data
-	 */
-	@Test
-	public void testInvalidSdlFileInput() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				SdlFile sdlFile = new SdlFile();
-				// Don't set name
-				sdlFile.setFileData(TestValues.GENERAL_BYTE_ARRAY);
-				checkForUploadFailure(fileManager, sdlFile);
-
-				sdlFile = new SdlFile();
-				sdlFile.setName(TestValues.GENERAL_STRING);
-				// Don't set data
-				checkForUploadFailure(fileManager, sdlFile);
-
-				sdlFile = new SdlFile();
-				sdlFile.setName(TestValues.GENERAL_STRING);
-				// Give an invalid resource ID
-				sdlFile.setResourceId(TestValues.GENERAL_INT);
-				checkForUploadFailure(fileManager, sdlFile);
-
-				sdlFile = new SdlFile();
-				sdlFile.setName(TestValues.GENERAL_STRING);
-				// Set invalid Uri
-				Uri testUri = Uri.parse("http://www.google.com");
-				sdlFile.setUri(testUri);
-				checkForUploadFailure(fileManager, sdlFile);
-			}
-		});
-	}
-
-	/**
-	 * Used to try and upload SdlFiles with invalid data, throw an assert error if file uploads
-	 *
-	 * @param fileManager - FileManager used to manage and upload files
-	 * @param sdlFile     - SdlFile with invalid data to test uploading
-	 */
-	private void checkForUploadFailure(FileManager fileManager, SdlFile sdlFile){
-		boolean error = false;
-
-		try {
-			fileManager.uploadFile(sdlFile, new CompletionListener() {
-				@Override
-				public void onComplete(boolean success) {}
-			});
-		}catch (IllegalArgumentException e){
-			error = true;
-		}
-
-		assertTrue(error);
-	}
-
-	/**
-	 * Test Invalid SdlArtWork FileTypes
-	 * SdlArtwork FileTypes can only be: GRAPHIC_BMP, GRAPHIC_PNG or GRAPHIC_JPEG
-	 */
-	@Test
-	public void testInvalidSdlArtworkInput(){
-		SdlArtwork sdlArtwork = new SdlArtwork();
-		// Set invalid type
-		for(FileType fileType : FileType.values()){
-			boolean shouldError = true, didError = false;
-			if(fileType.equals(FileType.GRAPHIC_BMP) || fileType.equals(FileType.GRAPHIC_PNG)
-				|| fileType.equals(FileType.GRAPHIC_JPEG)){
-				shouldError = false;
-			}
-			try{
-				sdlArtwork.setType(fileType);
-			}catch(IllegalArgumentException e){
-				didError = true;
-			}
-			assertEquals(shouldError, didError);
-		}
-	}
-
-	/**
-	 * Test Multiple File Uploads, success
-	 */
-	@Test
-	public void testMultipleFileUpload() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				final List<SdlFile> filesToUpload = new ArrayList<>();
-				filesToUpload.add(validFile);
-
-				SdlFile validFile2 = new SdlFile();
-				validFile2.setName(TestValues.GENERAL_STRING + "2");
-				validFile2.setFileData(TestValues.GENERAL_BYTE_ARRAY);
-				validFile2.setPersistent(false);
-				validFile2.setType(FileType.GRAPHIC_JPEG);
-				filesToUpload.add(validFile2);
-
-				fileManager.uploadFiles(filesToUpload, new MultipleFileCompletionListener() {
-					@Override
-					public void onComplete(Map<String, String> errors) {
-						assertNull(errors);
-					}
-				});
-			}
-		});
-	}
-
-	/**
-	 * Testing uploading multiple files with some failing.
-	 */
-	@Test
-	public void testMultipleFileUploadPartialFailure() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onSendRequestsFailPartialOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-
-		SdlFile validFile2 = new SdlFile();
-		validFile2.setName(TestValues.GENERAL_STRING + "2");
-		validFile2.setFileData(TestValues.GENERAL_BYTE_ARRAY);
-		validFile2.setPersistent(false);
-		validFile2.setType(FileType.GRAPHIC_JPEG);
-
-		SdlFile validFile3 = new SdlFile();
-		validFile3.setName(TestValues.GENERAL_STRING + "3");
-		validFile3.setFileData(TestValues.GENERAL_BYTE_ARRAY);
-		validFile3.setPersistent(false);
-		validFile3.setType(FileType.GRAPHIC_JPEG);
-
-		validFile.setType(FileType.AUDIO_WAVE);
-
-		final List<SdlFile> filesToUpload = new ArrayList<>();
-		filesToUpload.add(validFile);
-		filesToUpload.add(validFile2);
-		filesToUpload.add(validFile3);
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		fileManagerConfig.setArtworkRetryCount(0);
-		fileManagerConfig.setFileRetryCount(0);
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				fileManager.uploadFiles(filesToUpload,
-						new MultipleFileCompletionListener() {
-							@Override
-							public void onComplete(Map<String, String> errors) {
-								assertTrue(errors.size() == 2);
-							}
-						});
-			}
-		});
-		assertFalse(fileManager.hasUploadedFile(validFile) && fileManager.hasUploadedFile(validFile3));
-		assertTrue(fileManager.hasUploadedFile(validFile2));
-	}
-
-	/**
-	 * Testing uploading multiple SdlArtwork files.
-	 */
-	@Test
-	public void testMultipleArtworkUploadSuccess(){
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				int fileNum = 1;
-				final List<SdlArtwork> artworkToUpload = new ArrayList<>();
-				SdlArtwork sdlArtwork = new SdlArtwork();
-				sdlArtwork.setName("art" + fileNum++);
-				Uri uri = Uri.parse("android.resource://" + mTestContext.getPackageName() + "/drawable/ic_sdl");
-				sdlArtwork.setUri(uri);
-				sdlArtwork.setType(FileType.GRAPHIC_PNG);
-				artworkToUpload.add(sdlArtwork);
-
-				sdlArtwork = new SdlArtwork();
-				sdlArtwork.setName("art" + fileNum++);
-				uri = Uri.parse("android.resource://" + mTestContext.getPackageName() + "/drawable/sdl_tray_icon");
-				sdlArtwork.setUri(uri);
-				sdlArtwork.setType(FileType.GRAPHIC_PNG);
-				artworkToUpload.add(sdlArtwork);
-
-				fileManager.uploadFiles(artworkToUpload,
-						new MultipleFileCompletionListener() {
-							@Override
-							public void onComplete(Map<String, String> errors) {
-								assertNull(errors);
-								List < String > uploadedFileNames = fileManager.getRemoteFileNames();
-								for(SdlArtwork artwork : artworkToUpload){
-									assertTrue(uploadedFileNames.contains(artwork.getName()));
-								}
-							}
-						});
-			}
-		});
-	}
-
-	/**
-	 * Testing uploading persistent SdlFile
-	 */
-	@Test
-	public void testPersistentFileUploaded(){
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-
-		final SdlFile file = new SdlFile();
-		file.setName(TestValues.GENERAL_STRING_LIST.get(0));
-		file.setPersistent(true);
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(fileManager.hasUploadedFile(file));
-			}
-		});
-	}
-
-	/**
-	 * Test FileManagerConfig
-	 */
-	@Test
-	public void testFileManagerConfig() {
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		fileManagerConfig.setFileRetryCount(2);
-		fileManagerConfig.setArtworkRetryCount(2);
-		assertEquals(fileManagerConfig.getArtworkRetryCount(), 2);
-		assertEquals(fileManagerConfig.getFileRetryCount(), 2);
-	}
-
-	/**
-	 * Tests overwrite property for uploading a file.
-	 * Checks to make sure file does not overwrite itself if overwrite property is set to false
-	 */
-	@Test
-	public void testOverwriteFileProperty() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onPutFileSuccess).when(internalInterface).sendRPC(any(PutFile.class));
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				fileManager.uploadFile(validFile, new CompletionListener() {
-					@Override
-					public void onComplete(boolean success) {
-						assertTrue(success);
-						validFile.setOverwrite(false);
-						fileManager.uploadFile(validFile, new CompletionListener() {
-							@Override
-							public void onComplete(boolean success) {
-								assertTrue(success);
-							}
-						});
-
-					}
-				});
-			}
-		});
-		verify(internalInterface, times(2)).sendRPC(any(RPCMessage.class));
-	}
-
-	/**
-	 * Tests overwrite property for uploading a list of files.
-	 * Checks to make sure files do not overwrite themselves if overwrite property is set to false.
-	 */
-	@Test
-	public void testOverWriteFilePropertyListFiles() {
-		final ISdl internalInterface = mock(ISdl.class);
-
-		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-
-		final SdlFile validFile2 = new SdlFile();
-		validFile2.setName(TestValues.GENERAL_STRING + "2");
-		validFile2.setFileData(TestValues.GENERAL_BYTE_ARRAY);
-		validFile2.setPersistent(false);
-		validFile2.setType(FileType.GRAPHIC_JPEG);
-
-		final List<SdlFile> list = new ArrayList<>();
-		list.add(validFile);
-		list.add(validFile2);
-
-		FileManagerConfig fileManagerConfig = new FileManagerConfig();
-		fileManagerConfig.setArtworkRetryCount(2);
-		fileManagerConfig.setFileRetryCount(4);
-
-		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
-		fileManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				fileManager.uploadFiles(list, new MultipleFileCompletionListener() {
-					@Override
-					public void onComplete(Map<String, String> errors) {
-						validFile.setOverwrite(false);
-						validFile2.setOverwrite(false);
-						fileManager.uploadFiles(list, new MultipleFileCompletionListener() {
-							@Override
-							public void onComplete(Map<String, String> errors) {
-								assertNull(errors);
-							}
-						});
-					}
-				});
-
-			}
-		});
-		verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
-	}
-
-	/**
-	 * 	Test custom overridden SdlFile equals method
-	 */
-	@Test
-	public void testSdlFileEquals() {
-		// Case 1: object is null, assertFalse
-		SdlFile artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, true);
-		SdlFile artwork2 = null;
-		assertFalse(artwork1.equals(artwork2));
-
-		// Case 2 SoftButtonObjects are the same, assertTrue
-		assertTrue(artwork1.equals(artwork1));
-
-		// Case 3: object is not an instance of SoftButtonObject, assertFalse
-		assertFalse(artwork1.equals("Test"));
-
-		// Case 4: different StaticIcon status, assertFalse
-		artwork1.setStaticIcon(true);
-		artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, true);
-		artwork2.setStaticIcon(false);
-		assertFalse(artwork1.equals(artwork2));
-
-		// Case 5: different Persistent status, assertFalse
-		artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
-		artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, true);
-		assertFalse(artwork1.equals(artwork2));
-
-		// Case 6: different name, assertFalse
-		artwork2 = new SdlFile("image2", FileType.GRAPHIC_PNG, 1, false);
-		assertFalse(artwork1.equals(artwork2));
-
-		// Case 7: different Uri
-		Uri uri1 = Uri.parse("testUri1");
-		Uri uri2 = Uri.parse("testUri2");
-		artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, uri1, false);
-		artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, uri2, false);
-		assertFalse(artwork1.equals(artwork2));
-
-		// Case 8: different FileData
-		artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
-		artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
-		byte[] GENERAL_BYTE_ARRAY2 = new byte[2];
-		artwork1.setFileData(TestValues.GENERAL_BYTE_ARRAY);
-		artwork2.setFileData(GENERAL_BYTE_ARRAY2);
-		assertFalse(artwork1.equals(artwork2));
-
-		// Case 9 different FileType, assertFalse
-		artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
-		artwork2 = new SdlFile("image1", FileType.AUDIO_WAVE, 1, false);
-		assertFalse(artwork1.equals(artwork2));
-
-		// Case 10: they are equal, assertTrue
-		artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
-		artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
-		assertTrue(artwork1.equals(artwork2));
-	}
+    public static final String TAG = "FileManagerTests";
+    private Context mTestContext;
+    private SdlFile validFile;
+
+    // SETUP / HELPERS
+
+    @Before
+    public void setUp() throws Exception {
+        mTestContext = getInstrumentation().getTargetContext();
+        validFile = new SdlFile();
+        validFile.setName(TestValues.GENERAL_STRING);
+        validFile.setFileData(TestValues.GENERAL_BYTE_ARRAY);
+        validFile.setPersistent(false);
+    }
+
+    private Answer<Void> onPutFileFailureOnError = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) throws Throwable {
+            Object[] args = invocation.getArguments();
+            RPCRequest message = (RPCRequest) args[0];
+            if (message instanceof PutFile) {
+                int correlationId = message.getCorrelationID();
+                PutFileResponse putFileResponse = new PutFileResponse(false, Result.REJECTED);
+                putFileResponse.setInfo("Binary data empty");
+                message.getOnRPCResponseListener().onResponse(correlationId, putFileResponse);
+            }
+            return null;
+        }
+    };
+
+    private Answer<Void> onSendRequestsFailOnError = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) throws Throwable {
+            Object[] args = invocation.getArguments();
+            List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
+            OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
+            if (rpcs.get(0) instanceof PutFile) {
+                for (RPCRequest message : rpcs) {
+                    int correlationId = message.getCorrelationID();
+                    listener.addCorrelationId(correlationId);
+                    PutFileResponse putFileResponse = new PutFileResponse(false, Result.REJECTED);
+                    putFileResponse.setInfo("Binary data empty");
+                    listener.onResponse(correlationId, putFileResponse);
+                }
+                listener.onFinished();
+            }
+            return null;
+        }
+    };
+
+    private Answer<Void> onListFileUploadSuccess = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) throws Throwable {
+            Object[] args = invocation.getArguments();
+            List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
+            OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
+            if (rpcs.get(0) instanceof PutFile) {
+                for (RPCRequest message : rpcs) {
+                    int correlationId = message.getCorrelationID();
+                    listener.addCorrelationId(correlationId);
+                    PutFileResponse putFileResponse = new PutFileResponse();
+                    putFileResponse.setSuccess(true);
+                    listener.onResponse(correlationId, putFileResponse);
+                }
+                listener.onFinished();
+            }
+            return null;
+        }
+    };
+
+    private Answer<Void> onListFilesSuccess = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) {
+            Object[] args = invocation.getArguments();
+            RPCRequest message = (RPCRequest) args[0];
+            if (message instanceof ListFiles) {
+                int correlationId = message.getCorrelationID();
+                ListFilesResponse listFilesResponse = new ListFilesResponse();
+                listFilesResponse.setFilenames(TestValues.GENERAL_STRING_LIST);
+                listFilesResponse.setSpaceAvailable(TestValues.GENERAL_INT);
+                listFilesResponse.setSuccess(true);
+                message.getOnRPCResponseListener().onResponse(correlationId, listFilesResponse);
+            }
+            return null;
+        }
+    };
+
+    private Answer<Void> onPutFileSuccess = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) {
+            Object[] args = invocation.getArguments();
+            RPCRequest message = (RPCRequest) args[0];
+            if (message instanceof PutFile) {
+                int correlationId = message.getCorrelationID();
+                PutFileResponse putFileResponse = new PutFileResponse();
+                putFileResponse.setSuccess(true);
+                putFileResponse.setSpaceAvailable(TestValues.GENERAL_INT);
+                message.getOnRPCResponseListener().onResponse(correlationId, putFileResponse);
+            }
+            return null;
+        }
+    };
+
+    private Answer<Void> onPutFileFailure = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) {
+            Object[] args = invocation.getArguments();
+            RPCRequest message = (RPCRequest) args[0];
+            if (message instanceof PutFile) {
+                int correlationId = message.getCorrelationID();
+                PutFileResponse putFileResponse = new PutFileResponse();
+                putFileResponse.setSuccess(false);
+                message.getOnRPCResponseListener().onResponse(correlationId, putFileResponse);
+            }
+            return null;
+        }
+    };
+
+    private Answer<Void> onListDeleteRequestSuccess = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) {
+            Object[] args = invocation.getArguments();
+            List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
+            OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
+            if (rpcs.get(0) instanceof DeleteFile) {
+                for (RPCRequest message : rpcs) {
+                    int correlationId = message.getCorrelationID();
+                    listener.addCorrelationId(correlationId);
+                    DeleteFileResponse deleteFileResponse = new DeleteFileResponse();
+                    deleteFileResponse.setSuccess(true);
+                    listener.onResponse(correlationId, deleteFileResponse);
+                }
+                listener.onFinished();
+            }
+            return null;
+        }
+    };
+
+    private Answer<Void> onListDeleteRequestFail = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) {
+            Object[] args = invocation.getArguments();
+            List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
+            OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
+            if (rpcs.get(0) instanceof DeleteFile) {
+                for (RPCRequest message : rpcs) {
+                    int correlationId = message.getCorrelationID();
+                    listener.addCorrelationId(correlationId);
+                    DeleteFileResponse deleteFileResponse = new DeleteFileResponse(false, Result.REJECTED);
+                    deleteFileResponse.setInfo("Binary data empty");
+                    listener.onResponse(correlationId, deleteFileResponse);
+                }
+                listener.onFinished();
+            }
+            return null;
+        }
+    };
+
+    private Answer<Void> onSendRequestsFailPartialOnError = new Answer<Void>() {
+        @Override
+        public Void answer(InvocationOnMock invocation) throws Throwable {
+            Object[] args = invocation.getArguments();
+            List<RPCRequest> rpcs = (List<RPCRequest>) args[0];
+            OnMultipleRequestListener listener = (OnMultipleRequestListener) args[1];
+            if (rpcs.get(0) instanceof PutFile) {
+                boolean flip = false;
+                for (RPCRequest message : rpcs) {
+                    int correlationId = message.getCorrelationID();
+                    listener.addCorrelationId(correlationId);
+                    PutFileResponse putFileResponse = new PutFileResponse();
+                    if (flip) {
+                        putFileResponse.setSuccess(true);
+                        flip = false;
+                        listener.onResponse(correlationId, putFileResponse);
+                    } else {
+                        flip = true;
+                        putFileResponse.setSuccess(false);
+                        putFileResponse.setResultCode(Result.REJECTED);
+                        putFileResponse.setInfo("Binary data empty");
+                        listener.onResponse(correlationId, putFileResponse);
+                    }
+                }
+                listener.onFinished();
+            }
+            return null;
+        }
+    };
+
+    // TESTS
+
+    /**
+     * Test deleting list of files, success
+     */
+    @Test
+    public void testDeleteRemoteFilesWithNamesSuccess() {
+        final ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onListDeleteRequestSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+
+        final List<String> fileNames = new ArrayList<>();
+        fileNames.add("Julian");
+        fileNames.add("Jake");
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        fileManagerConfig.setFileRetryCount(2);
+
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                fileManager.deleteRemoteFilesWithNames(fileNames, new MultipleFileCompletionListener() {
+                    @Override
+                    public void onComplete(Map<String, String> errors) {
+                        assertTrue(errors == null);
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * Test deleting list of files, fail
+     */
+    @Test
+    public void testDeleteRemoteFilesWithNamesFail() {
+        final ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onListDeleteRequestFail).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+
+        final List<String> fileNames = new ArrayList<>();
+        fileNames.add("Julian");
+        fileNames.add("Jake");
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        fileManagerConfig.setFileRetryCount(2);
+
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                fileManager.deleteRemoteFilesWithNames(fileNames, new MultipleFileCompletionListener() {
+                    @Override
+                    public void onComplete(Map<String, String> errors) {
+                        assertTrue(errors.size() == 2);
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * Test reUploading failed file
+     */
+    @Test
+    public void testFileUploadRetry() {
+        final ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onPutFileFailureOnError).when(internalInterface).sendRPC(any(PutFile.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        fileManagerConfig.setFileRetryCount(2);
+
+        validFile.setType(FileType.AUDIO_MP3);
+
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                fileManager.uploadFile(validFile, new CompletionListener() {
+                    @Override
+                    public void onComplete(boolean success) {
+                        assertFalse(success);
+                    }
+                });
+            }
+        });
+        verify(internalInterface, times(4)).sendRPC(any(RPCMessage.class));
+    }
+
+    /**
+     * Test reUploading failed Artwork
+     */
+    @Test
+    public void testArtworkUploadRetry() {
+        final ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onPutFileFailureOnError).when(internalInterface).sendRPC(any(PutFile.class));
+
+        final SdlFile validFile2 = new SdlFile();
+        validFile2.setName(TestValues.GENERAL_STRING + "2");
+        validFile2.setFileData(TestValues.GENERAL_BYTE_ARRAY);
+        validFile2.setPersistent(false);
+        validFile2.setType(FileType.GRAPHIC_PNG);
+
+        final SdlFile validFile3 = new SdlFile();
+        validFile3.setName(TestValues.GENERAL_STRING + "3");
+        validFile3.setFileData(TestValues.GENERAL_BYTE_ARRAY);
+        validFile3.setPersistent(false);
+        validFile3.setType(FileType.GRAPHIC_BMP);
+
+        validFile.setType(FileType.GRAPHIC_JPEG);
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        fileManagerConfig.setArtworkRetryCount(2);
+
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                fileManager.uploadFile(validFile, new CompletionListener() {
+                    @Override
+                    public void onComplete(boolean success) {
+                        assertFalse(success);
+                        verify(internalInterface, times(4)).sendRPC(any(RPCMessage.class));
+                    }
+                });
+
+                fileManager.uploadFile(validFile2, new CompletionListener() {
+                    @Override
+                    public void onComplete(boolean success) {
+                        assertFalse(success);
+                        verify(internalInterface, times(7)).sendRPC(any(RPCMessage.class));
+                    }
+                });
+
+                fileManager.uploadFile(validFile3, new CompletionListener() {
+                    @Override
+                    public void onComplete(boolean success) {
+                        assertFalse(success);
+                    }
+                });
+            }
+        });
+        verify(internalInterface, times(10)).sendRPC(any(RPCMessage.class));
+    }
+
+    /**
+     * Test retry uploading failed list of files
+     */
+    @Test
+    public void testListFilesUploadRetry() {
+        final ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onSendRequestsFailOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+
+        SdlFile validFile2 = new SdlFile();
+        validFile2.setName(TestValues.GENERAL_STRING + "2");
+        validFile2.setFileData(TestValues.GENERAL_BYTE_ARRAY);
+        validFile2.setPersistent(false);
+        validFile2.setType(FileType.GRAPHIC_JPEG);
+
+        validFile.setType(FileType.AUDIO_WAVE);
+
+        final List<SdlFile> list = new ArrayList<>();
+        list.add(validFile);
+        list.add(validFile2);
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        fileManagerConfig.setArtworkRetryCount(2);
+        fileManagerConfig.setFileRetryCount(4);
+
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                fileManager.uploadFiles(list, new MultipleFileCompletionListener() {
+                    @Override
+                    public void onComplete(Map<String, String> errors) {
+                        assertTrue(errors.size() == 2); // We need to make sure it kept track of both Files
+                    }
+                });
+
+            }
+        });
+        verify(internalInterface, times(5)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+    }
+
+    /**
+     * Testing the initialization of FileManager
+     */
+    @Test
+    public void testInitializationSuccess() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                assertEquals(fileManager.getState(), BaseSubManager.READY);
+                assertEquals(fileManager.getRemoteFileNames(), TestValues.GENERAL_STRING_LIST);
+                assertEquals(TestValues.GENERAL_INT, fileManager.getBytesAvailable());
+            }
+        });
+    }
+
+    /**
+     * Test file upload, success
+     */
+    @Test
+    public void testFileUploadSuccess() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onPutFileSuccess).when(internalInterface).sendRPC(any(PutFile.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                fileManager.uploadFile(validFile, new CompletionListener() {
+                    @Override
+                    public void onComplete(boolean success) {
+                        assertTrue(success);
+                    }
+                });
+            }
+        });
+        assertTrue(fileManager.getRemoteFileNames().contains(validFile.getName()));
+        assertTrue(fileManager.hasUploadedFile(validFile));
+        assertEquals(TestValues.GENERAL_INT, fileManager.getBytesAvailable());
+    }
+
+    /**
+     * Testing failed file upload.
+     */
+    @Test
+    public void testFileUploadFailure() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onPutFileFailure).when(internalInterface).sendRPC(any(PutFile.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                fileManager.uploadFile(validFile, new CompletionListener() {
+                    @Override
+                    public void onComplete(boolean success) {
+                        assertFalse(success);
+                        assertFalse(fileManager.getRemoteFileNames().contains(validFile.getName()));
+                        assertFalse(fileManager.hasUploadedFile(validFile));
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * Testing uploadFile for a staticIcon, verifying that it doesn't actually upload.
+     */
+    @Test
+    public void testFileUploadForStaticIcon() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                SdlArtwork artwork = new SdlArtwork(StaticIconName.ALBUM);
+                fileManager.uploadFile(artwork, new CompletionListener() {
+                    @Override
+                    public void onComplete(boolean success) {
+                        assertTrue(success);
+                    }
+                });
+            }
+        });
+        verify(internalInterface, times(1)).sendRPC(any(RPCMessage.class));
+    }
+
+    /**
+     * Testing uploadFiles for staticIcons, verifying that it doesn't actually upload.
+     */
+    @Test
+    public void testMultipleFileUploadsForStaticIcon() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                SdlArtwork artwork = new SdlArtwork(StaticIconName.ALBUM);
+                SdlArtwork artwork2 = new SdlArtwork(StaticIconName.FILENAME);
+                List<SdlArtwork> testStaticIconUpload = new ArrayList<>();
+                testStaticIconUpload.add(artwork);
+                testStaticIconUpload.add(artwork2);
+                fileManager.uploadFiles(testStaticIconUpload, new MultipleFileCompletionListener() {
+                    @Override
+                    public void onComplete(Map<String, String> errors) {
+                        assertTrue(errors == null);
+                    }
+                });
+            }
+        });
+        verify(internalInterface, times(0)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+    }
+
+    /**
+     * Testing uploadFiles for static icons and nonStatic icons in the same list.
+     */
+    @Test
+    public void testMultipleFileUploadsForPartialStaticIcon() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                SdlArtwork artwork = new SdlArtwork(StaticIconName.ALBUM);
+                SdlArtwork artwork2 = new SdlArtwork(StaticIconName.FILENAME);
+                List<SdlFile> testFileuploads = new ArrayList<>();
+                testFileuploads.add(artwork);
+                testFileuploads.add(artwork2);
+                testFileuploads.add(validFile);
+                fileManager.uploadFiles(testFileuploads, new MultipleFileCompletionListener() {
+                    @Override
+                    public void onComplete(Map<String, String> errors) {
+                        assertTrue(errors == null);
+                    }
+                });
+            }
+        });
+        verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+    }
+
+    /**
+     * Test to make sure you cannot upload an SdlFile with invalid data
+     */
+    @Test
+    public void testInvalidSdlFileInput() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                SdlFile sdlFile = new SdlFile();
+                // Don't set name
+                sdlFile.setFileData(TestValues.GENERAL_BYTE_ARRAY);
+                checkForUploadFailure(fileManager, sdlFile);
+
+                sdlFile = new SdlFile();
+                sdlFile.setName(TestValues.GENERAL_STRING);
+                // Don't set data
+                checkForUploadFailure(fileManager, sdlFile);
+
+                sdlFile = new SdlFile();
+                sdlFile.setName(TestValues.GENERAL_STRING);
+                // Give an invalid resource ID
+                sdlFile.setResourceId(TestValues.GENERAL_INT);
+                checkForUploadFailure(fileManager, sdlFile);
+
+                sdlFile = new SdlFile();
+                sdlFile.setName(TestValues.GENERAL_STRING);
+                // Set invalid Uri
+                Uri testUri = Uri.parse("http://www.google.com");
+                sdlFile.setUri(testUri);
+                checkForUploadFailure(fileManager, sdlFile);
+            }
+        });
+    }
+
+    /**
+     * Used to try and upload SdlFiles with invalid data, throw an assert error if file uploads
+     *
+     * @param fileManager - FileManager used to manage and upload files
+     * @param sdlFile     - SdlFile with invalid data to test uploading
+     */
+    private void checkForUploadFailure(FileManager fileManager, SdlFile sdlFile) {
+        boolean error = false;
+
+        try {
+            fileManager.uploadFile(sdlFile, new CompletionListener() {
+                @Override
+                public void onComplete(boolean success) {
+                }
+            });
+        } catch (IllegalArgumentException e) {
+            error = true;
+        }
+
+        assertTrue(error);
+    }
+
+    /**
+     * Test Invalid SdlArtWork FileTypes
+     * SdlArtwork FileTypes can only be: GRAPHIC_BMP, GRAPHIC_PNG or GRAPHIC_JPEG
+     */
+    @Test
+    public void testInvalidSdlArtworkInput() {
+        SdlArtwork sdlArtwork = new SdlArtwork();
+        // Set invalid type
+        for (FileType fileType : FileType.values()) {
+            boolean shouldError = true, didError = false;
+            if (fileType.equals(FileType.GRAPHIC_BMP) || fileType.equals(FileType.GRAPHIC_PNG)
+                    || fileType.equals(FileType.GRAPHIC_JPEG)) {
+                shouldError = false;
+            }
+            try {
+                sdlArtwork.setType(fileType);
+            } catch (IllegalArgumentException e) {
+                didError = true;
+            }
+            assertEquals(shouldError, didError);
+        }
+    }
+
+    /**
+     * Test Multiple File Uploads, success
+     */
+    @Test
+    public void testMultipleFileUpload() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                final List<SdlFile> filesToUpload = new ArrayList<>();
+                filesToUpload.add(validFile);
+
+                SdlFile validFile2 = new SdlFile();
+                validFile2.setName(TestValues.GENERAL_STRING + "2");
+                validFile2.setFileData(TestValues.GENERAL_BYTE_ARRAY);
+                validFile2.setPersistent(false);
+                validFile2.setType(FileType.GRAPHIC_JPEG);
+                filesToUpload.add(validFile2);
+
+                fileManager.uploadFiles(filesToUpload, new MultipleFileCompletionListener() {
+                    @Override
+                    public void onComplete(Map<String, String> errors) {
+                        assertNull(errors);
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * Testing uploading multiple files with some failing.
+     */
+    @Test
+    public void testMultipleFileUploadPartialFailure() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onSendRequestsFailPartialOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+
+        SdlFile validFile2 = new SdlFile();
+        validFile2.setName(TestValues.GENERAL_STRING + "2");
+        validFile2.setFileData(TestValues.GENERAL_BYTE_ARRAY);
+        validFile2.setPersistent(false);
+        validFile2.setType(FileType.GRAPHIC_JPEG);
+
+        SdlFile validFile3 = new SdlFile();
+        validFile3.setName(TestValues.GENERAL_STRING + "3");
+        validFile3.setFileData(TestValues.GENERAL_BYTE_ARRAY);
+        validFile3.setPersistent(false);
+        validFile3.setType(FileType.GRAPHIC_JPEG);
+
+        validFile.setType(FileType.AUDIO_WAVE);
+
+        final List<SdlFile> filesToUpload = new ArrayList<>();
+        filesToUpload.add(validFile);
+        filesToUpload.add(validFile2);
+        filesToUpload.add(validFile3);
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        fileManagerConfig.setArtworkRetryCount(0);
+        fileManagerConfig.setFileRetryCount(0);
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                fileManager.uploadFiles(filesToUpload,
+                        new MultipleFileCompletionListener() {
+                            @Override
+                            public void onComplete(Map<String, String> errors) {
+                                assertTrue(errors.size() == 2);
+                            }
+                        });
+            }
+        });
+        assertFalse(fileManager.hasUploadedFile(validFile) && fileManager.hasUploadedFile(validFile3));
+        assertTrue(fileManager.hasUploadedFile(validFile2));
+    }
+
+    /**
+     * Testing uploading multiple SdlArtwork files.
+     */
+    @Test
+    public void testMultipleArtworkUploadSuccess() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                int fileNum = 1;
+                final List<SdlArtwork> artworkToUpload = new ArrayList<>();
+                SdlArtwork sdlArtwork = new SdlArtwork();
+                sdlArtwork.setName("art" + fileNum++);
+                Uri uri = Uri.parse("android.resource://" + mTestContext.getPackageName() + "/drawable/ic_sdl");
+                sdlArtwork.setUri(uri);
+                sdlArtwork.setType(FileType.GRAPHIC_PNG);
+                artworkToUpload.add(sdlArtwork);
+
+                sdlArtwork = new SdlArtwork();
+                sdlArtwork.setName("art" + fileNum++);
+                uri = Uri.parse("android.resource://" + mTestContext.getPackageName() + "/drawable/sdl_tray_icon");
+                sdlArtwork.setUri(uri);
+                sdlArtwork.setType(FileType.GRAPHIC_PNG);
+                artworkToUpload.add(sdlArtwork);
+
+                fileManager.uploadFiles(artworkToUpload,
+                        new MultipleFileCompletionListener() {
+                            @Override
+                            public void onComplete(Map<String, String> errors) {
+                                assertNull(errors);
+                                List<String> uploadedFileNames = fileManager.getRemoteFileNames();
+                                for (SdlArtwork artwork : artworkToUpload) {
+                                    assertTrue(uploadedFileNames.contains(artwork.getName()));
+                                }
+                            }
+                        });
+            }
+        });
+    }
+
+    /**
+     * Testing uploading persistent SdlFile
+     */
+    @Test
+    public void testPersistentFileUploaded() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+
+        final SdlFile file = new SdlFile();
+        file.setName(TestValues.GENERAL_STRING_LIST.get(0));
+        file.setPersistent(true);
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(fileManager.hasUploadedFile(file));
+            }
+        });
+    }
+
+    /**
+     * Test FileManagerConfig
+     */
+    @Test
+    public void testFileManagerConfig() {
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        fileManagerConfig.setFileRetryCount(2);
+        fileManagerConfig.setArtworkRetryCount(2);
+        assertEquals(fileManagerConfig.getArtworkRetryCount(), 2);
+        assertEquals(fileManagerConfig.getFileRetryCount(), 2);
+    }
+
+    /**
+     * Tests overwrite property for uploading a file.
+     * Checks to make sure file does not overwrite itself if overwrite property is set to false
+     */
+    @Test
+    public void testOverwriteFileProperty() {
+        ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onPutFileSuccess).when(internalInterface).sendRPC(any(PutFile.class));
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                fileManager.uploadFile(validFile, new CompletionListener() {
+                    @Override
+                    public void onComplete(boolean success) {
+                        assertTrue(success);
+                        validFile.setOverwrite(false);
+                        fileManager.uploadFile(validFile, new CompletionListener() {
+                            @Override
+                            public void onComplete(boolean success) {
+                                assertTrue(success);
+                            }
+                        });
+
+                    }
+                });
+            }
+        });
+        verify(internalInterface, times(2)).sendRPC(any(RPCMessage.class));
+    }
+
+    /**
+     * Tests overwrite property for uploading a list of files.
+     * Checks to make sure files do not overwrite themselves if overwrite property is set to false.
+     */
+    @Test
+    public void testOverWriteFilePropertyListFiles() {
+        final ISdl internalInterface = mock(ISdl.class);
+
+        doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
+        doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+
+        final SdlFile validFile2 = new SdlFile();
+        validFile2.setName(TestValues.GENERAL_STRING + "2");
+        validFile2.setFileData(TestValues.GENERAL_BYTE_ARRAY);
+        validFile2.setPersistent(false);
+        validFile2.setType(FileType.GRAPHIC_JPEG);
+
+        final List<SdlFile> list = new ArrayList<>();
+        list.add(validFile);
+        list.add(validFile2);
+
+        FileManagerConfig fileManagerConfig = new FileManagerConfig();
+        fileManagerConfig.setArtworkRetryCount(2);
+        fileManagerConfig.setFileRetryCount(4);
+
+        final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
+        fileManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                fileManager.uploadFiles(list, new MultipleFileCompletionListener() {
+                    @Override
+                    public void onComplete(Map<String, String> errors) {
+                        validFile.setOverwrite(false);
+                        validFile2.setOverwrite(false);
+                        fileManager.uploadFiles(list, new MultipleFileCompletionListener() {
+                            @Override
+                            public void onComplete(Map<String, String> errors) {
+                                assertNull(errors);
+                            }
+                        });
+                    }
+                });
+
+            }
+        });
+        verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
+    }
+
+    /**
+     * Test custom overridden SdlFile equals method
+     */
+    @Test
+    public void testSdlFileEquals() {
+        // Case 1: object is null, assertFalse
+        SdlFile artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, true);
+        SdlFile artwork2 = null;
+        assertFalse(artwork1.equals(artwork2));
+
+        // Case 2 SoftButtonObjects are the same, assertTrue
+        assertTrue(artwork1.equals(artwork1));
+
+        // Case 3: object is not an instance of SoftButtonObject, assertFalse
+        assertFalse(artwork1.equals("Test"));
+
+        // Case 4: different StaticIcon status, assertFalse
+        artwork1.setStaticIcon(true);
+        artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, true);
+        artwork2.setStaticIcon(false);
+        assertFalse(artwork1.equals(artwork2));
+
+        // Case 5: different Persistent status, assertFalse
+        artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
+        artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, true);
+        assertFalse(artwork1.equals(artwork2));
+
+        // Case 6: different name, assertFalse
+        artwork2 = new SdlFile("image2", FileType.GRAPHIC_PNG, 1, false);
+        assertFalse(artwork1.equals(artwork2));
+
+        // Case 7: different Uri
+        Uri uri1 = Uri.parse("testUri1");
+        Uri uri2 = Uri.parse("testUri2");
+        artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, uri1, false);
+        artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, uri2, false);
+        assertFalse(artwork1.equals(artwork2));
+
+        // Case 8: different FileData
+        artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
+        artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
+        byte[] GENERAL_BYTE_ARRAY2 = new byte[2];
+        artwork1.setFileData(TestValues.GENERAL_BYTE_ARRAY);
+        artwork2.setFileData(GENERAL_BYTE_ARRAY2);
+        assertFalse(artwork1.equals(artwork2));
+
+        // Case 9 different FileType, assertFalse
+        artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
+        artwork2 = new SdlFile("image1", FileType.AUDIO_WAVE, 1, false);
+        assertFalse(artwork1.equals(artwork2));
+
+        // Case 10: they are equal, assertTrue
+        artwork1 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
+        artwork2 = new SdlFile("image1", FileType.GRAPHIC_PNG, 1, false);
+        assertTrue(artwork1.equals(artwork2));
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlArtworkTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlArtworkTests.java
index 3f6f6cff5..f4fb5e3d2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlArtworkTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/filetypes/SdlArtworkTests.java
@@ -17,7 +17,7 @@ import static junit.framework.TestCase.assertTrue;
 public class SdlArtworkTests {
 
     @Test
-    public void testClone(){
+    public void testClone() {
         SdlArtwork original = TestValues.GENERAL_ARTWORK;
         SdlArtwork clone = original.clone();
 
@@ -36,11 +36,11 @@ public class SdlArtworkTests {
 
     }
 
-    public static boolean equalTest(SdlArtwork original, SdlArtwork clone){
+    public static boolean equalTest(SdlArtwork original, SdlArtwork clone) {
 
         assertNotNull(original);
         assertNotNull(clone);
-        assertNotSame(original,clone);
+        assertNotSame(original, clone);
 
 
         assertEquals(original.getResourceId(), clone.getResourceId());
@@ -50,7 +50,7 @@ public class SdlArtworkTests {
         assertNotNull(original.getImageRPC());
         assertNotNull(clone.getImageRPC());
 
-        assertNotSame(original.getImageRPC(),clone.getImageRPC());
+        assertNotSame(original.getImageRPC(), clone.getImageRPC());
         assertEquals(original.getImageRPC().getIsTemplate(), clone.getImageRPC().getIsTemplate());
         assertEquals(original.getImageRPC().getValue(), clone.getImageRPC().getValue());
         assertEquals(original.getImageRPC().getImageType(), clone.getImageRPC().getImageType());
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/LifecycleConfigurationUpdateTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/LifecycleConfigurationUpdateTest.java
index 02509a96a..97ce59a51 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/LifecycleConfigurationUpdateTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/LifecycleConfigurationUpdateTest.java
@@ -47,32 +47,32 @@ import static junit.framework.TestCase.assertEquals;
 @RunWith(AndroidJUnit4.class)
 public class LifecycleConfigurationUpdateTest {
 
-	@Test
-	public void testIndividualSettersAndGetters(){
+    @Test
+    public void testIndividualSettersAndGetters() {
 
-		LifecycleConfigurationUpdate lifecycleConfigurationUpdate = new LifecycleConfigurationUpdate();
+        LifecycleConfigurationUpdate lifecycleConfigurationUpdate = new LifecycleConfigurationUpdate();
 
-		lifecycleConfigurationUpdate.setAppName(TestValues.GENERAL_STRING);
-		lifecycleConfigurationUpdate.setShortAppName(TestValues.GENERAL_STRING);
-		lifecycleConfigurationUpdate.setTtsName(TestValues.GENERAL_VECTOR_TTS_CHUNKS);
-		lifecycleConfigurationUpdate.setVoiceRecognitionCommandNames(TestValues.GENERAL_VECTOR_STRING);
+        lifecycleConfigurationUpdate.setAppName(TestValues.GENERAL_STRING);
+        lifecycleConfigurationUpdate.setShortAppName(TestValues.GENERAL_STRING);
+        lifecycleConfigurationUpdate.setTtsName(TestValues.GENERAL_VECTOR_TTS_CHUNKS);
+        lifecycleConfigurationUpdate.setVoiceRecognitionCommandNames(TestValues.GENERAL_VECTOR_STRING);
 
-		assertEquals(TestValues.GENERAL_STRING, lifecycleConfigurationUpdate.getAppName());
-		assertEquals(TestValues.GENERAL_STRING, lifecycleConfigurationUpdate.getShortAppName());
-		assertEquals(TestValues.GENERAL_VECTOR_TTS_CHUNKS, lifecycleConfigurationUpdate.getTtsName());
-		assertEquals(TestValues.GENERAL_VECTOR_STRING, lifecycleConfigurationUpdate.getVoiceRecognitionCommandNames());
-	}
+        assertEquals(TestValues.GENERAL_STRING, lifecycleConfigurationUpdate.getAppName());
+        assertEquals(TestValues.GENERAL_STRING, lifecycleConfigurationUpdate.getShortAppName());
+        assertEquals(TestValues.GENERAL_VECTOR_TTS_CHUNKS, lifecycleConfigurationUpdate.getTtsName());
+        assertEquals(TestValues.GENERAL_VECTOR_STRING, lifecycleConfigurationUpdate.getVoiceRecognitionCommandNames());
+    }
 
-	@Test
-	public void testHelperConstructor(){
+    @Test
+    public void testHelperConstructor() {
 
-		LifecycleConfigurationUpdate lifecycleConfigurationUpdate = new LifecycleConfigurationUpdate(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_VECTOR_TTS_CHUNKS, TestValues.GENERAL_VECTOR_STRING);
+        LifecycleConfigurationUpdate lifecycleConfigurationUpdate = new LifecycleConfigurationUpdate(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_VECTOR_TTS_CHUNKS, TestValues.GENERAL_VECTOR_STRING);
 
-		assertEquals(TestValues.GENERAL_STRING, lifecycleConfigurationUpdate.getAppName());
-		assertEquals(TestValues.GENERAL_STRING, lifecycleConfigurationUpdate.getShortAppName());
-		assertEquals(TestValues.GENERAL_VECTOR_TTS_CHUNKS, lifecycleConfigurationUpdate.getTtsName());
-		assertEquals(TestValues.GENERAL_VECTOR_STRING, lifecycleConfigurationUpdate.getVoiceRecognitionCommandNames());
-	}
+        assertEquals(TestValues.GENERAL_STRING, lifecycleConfigurationUpdate.getAppName());
+        assertEquals(TestValues.GENERAL_STRING, lifecycleConfigurationUpdate.getShortAppName());
+        assertEquals(TestValues.GENERAL_VECTOR_TTS_CHUNKS, lifecycleConfigurationUpdate.getTtsName());
+        assertEquals(TestValues.GENERAL_VECTOR_STRING, lifecycleConfigurationUpdate.getVoiceRecognitionCommandNames());
+    }
 
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/RpcConverterTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/RpcConverterTest.java
index d8bf8422a..e2d17fd54 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/RpcConverterTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/RpcConverterTest.java
@@ -21,19 +21,19 @@ import static junit.framework.TestCase.assertNotNull;
 @RunWith(AndroidJUnit4.class)
 public class RpcConverterTest {
 
-    private static final String RPC_PACKAGE             = "com.smartdevicelink.proxy.rpc.";
-    private static final String RESPONSE_KEY            = "Response";
-    private static final Version MAX_RPC_VERSION        = new Version(5,1,0);
+    private static final String RPC_PACKAGE = "com.smartdevicelink.proxy.rpc.";
+    private static final String RESPONSE_KEY = "Response";
+    private static final Version MAX_RPC_VERSION = new Version(5, 1, 0);
 
     /**
      * The RPC converter relies on the function id json name to match the class name exactly.
      * Therefore we will test to ensure that they match up first.
      */
     @Test
-    public void testFunctionIdsAgainstFileNames(){
+    public void testFunctionIdsAgainstFileNames() {
         FunctionID[] functionIDs = FunctionID.values();
-        for(FunctionID functionID : functionIDs) {
-            switch (functionID){
+        for (FunctionID functionID : functionIDs) {
+            switch (functionID) {
                 case RESERVED:
                 case SYNC_P_DATA:
                 case ON_SYNC_P_DATA:
@@ -89,12 +89,12 @@ public class RpcConverterTest {
     }
 
     @Test
-    public void testRpcCreation(){
+    public void testRpcCreation() {
 
         FunctionID[] functionIDs = FunctionID.values();
 
-        for(FunctionID functionID : functionIDs){
-            switch (functionID){
+        for (FunctionID functionID : functionIDs) {
+            switch (functionID) {
                 case RESERVED:
                 case SYNC_P_DATA:
                 case ON_SYNC_P_DATA:
@@ -116,22 +116,22 @@ public class RpcConverterTest {
         }
     }
 
-    private void assertRpc(Class rpcClass){
+    private void assertRpc(Class rpcClass) {
         RPCMessage message = generateRpcMessage(rpcClass);
         assertNotNull(message);
         ProtocolMessage protocolMessage = generateProtocolMessageForRpc(message);
         assertNotNull(protocolMessage);
-        RPCMessage newMessage = RpcConverter.extractRpc(protocolMessage,MAX_RPC_VERSION);
+        RPCMessage newMessage = RpcConverter.extractRpc(protocolMessage, MAX_RPC_VERSION);
         assertNotNull(newMessage);
 
         assertEquals(message.getMessageType(), newMessage.getMessageType());
         assertEquals(message.getFunctionID(), newMessage.getFunctionID());
     }
 
-    private RPCMessage generateRpcMessage(Class rpcClass){
+    private RPCMessage generateRpcMessage(Class rpcClass) {
         try {
-            java.lang.reflect.Constructor rpcConstructor =  rpcClass.getConstructor();
-            return (RPCMessage)rpcConstructor.newInstance();
+            java.lang.reflect.Constructor rpcConstructor = rpcClass.getConstructor();
+            return (RPCMessage) rpcConstructor.newInstance();
         } catch (NoSuchMethodException e) {
             e.printStackTrace();
         } catch (IllegalAccessException e) {
@@ -144,15 +144,15 @@ public class RpcConverterTest {
         return null;
     }
 
-    private ProtocolMessage generateProtocolMessageForRpc(RPCMessage message){
+    private ProtocolMessage generateProtocolMessageForRpc(RPCMessage message) {
         try {
 
-            message.format(MAX_RPC_VERSION,true);
-            byte[] msgBytes = JsonRPCMarshaller.marshall(message, (byte)5);
+            message.format(MAX_RPC_VERSION, true);
+            byte[] msgBytes = JsonRPCMarshaller.marshall(message, (byte) 5);
 
             ProtocolMessage pm = new ProtocolMessage();
             pm.setData(msgBytes);
-            pm.setSessionID((byte)0);
+            pm.setSessionID((byte) 0);
 
             pm.setMessageType(MessageType.RPC);
             pm.setSessionType(SessionType.RPC);
@@ -160,16 +160,16 @@ public class RpcConverterTest {
             pm.setPayloadProtected(message.isPayloadProtected());
 
             if (message.getMessageType().equals(RPCMessage.KEY_REQUEST)) {
-                pm.setRPCType((byte)0x00);
-            }else if (message.getMessageType().equals(RPCMessage.KEY_RESPONSE)){
-                pm.setRPCType((byte)0x01);
-            }else if (message.getMessageType().equals(RPCMessage.KEY_NOTIFICATION)){
-                pm.setRPCType((byte)0x02);
-            }else{
+                pm.setRPCType((byte) 0x00);
+            } else if (message.getMessageType().equals(RPCMessage.KEY_RESPONSE)) {
+                pm.setRPCType((byte) 0x01);
+            } else if (message.getMessageType().equals(RPCMessage.KEY_NOTIFICATION)) {
+                pm.setRPCType((byte) 0x02);
+            } else {
                 return null;
             }
 
-            if (message.getBulkData() != null){
+            if (message.getBulkData() != null) {
                 pm.setBulkData(message.getBulkData());
             }
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
index 47b6a5cec..58d972b38 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
@@ -5,13 +5,13 @@ import android.util.SparseArray;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.livio.taskmaster.Taskmaster;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.managers.ManagerUtility;
+import com.smartdevicelink.protocol.ISdlServiceListener;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
-import com.smartdevicelink.managers.ISdl;
-import com.smartdevicelink.protocol.ISdlServiceListener;
 import com.smartdevicelink.proxy.rpc.AppServiceCapability;
 import com.smartdevicelink.proxy.rpc.AppServicesCapabilities;
 import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities;
@@ -85,965 +85,979 @@ import static org.mockito.Mockito.when;
 
 @RunWith(AndroidJUnit4.class)
 public class SystemCapabilityManagerTests {
-	public static final String TAG = "SystemCapabilityManagerTests";
-	public static SystemCapabilityManager systemCapabilityManager;
-	private SystemCapability systemCapability;
-	private VideoStreamingCapability videoStreamingCapability;
-
-	@Before
-	public void setUp() throws Exception{
-
-		systemCapability = new SystemCapability(SystemCapabilityType.VIDEO_STREAMING);
-		videoStreamingCapability = new VideoStreamingCapability();
-		videoStreamingCapability.setMaxBitrate(TestValues.GENERAL_INT);
-		videoStreamingCapability.setPreferredResolution(TestValues.GENERAL_IMAGERESOLUTION);
-		videoStreamingCapability.setSupportedFormats(TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST);
-		systemCapability.setCapabilityForType(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
-	}
-
-	public SystemCapabilityManager createSampleManager(){
-		return createSampleManager(new InternalSDLInterface());
-	}
-
-	public SystemCapabilityManager createSampleManager(InternalSDLInterface iSdl){
-		SystemCapabilityManager systemCapabilityManager = new SystemCapabilityManager(iSdl);
-
-		RegisterAppInterfaceResponse raiResponse = new RegisterAppInterfaceResponse();
-
-		raiResponse.setHmiCapabilities(TestValues.GENERAL_HMICAPABILITIES);
-		raiResponse.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES);
-		raiResponse.setAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST);
-		raiResponse.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST);
-		raiResponse.setHmiZoneCapabilities(TestValues.GENERAL_HMIZONECAPABILITIES_LIST);
-		raiResponse.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES);
-		raiResponse.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
-		raiResponse.setSpeechCapabilities(TestValues.GENERAL_SPEECHCAPABILITIES_LIST);
-		raiResponse.setPrerecordedSpeech(TestValues.GENERAL_PRERECORDEDSPEECH_LIST);
-		raiResponse.setSuccess(true);
-
-		systemCapabilityManager.parseRAIResponse(raiResponse);
-		return systemCapabilityManager;
-	}
-
-	private List<DisplayCapability> createDisplayCapabilityList(DisplayCapabilities display, List<ButtonCapabilities> button, List<SoftButtonCapabilities> softButton) {
-		WindowTypeCapabilities windowTypeCapabilities = new WindowTypeCapabilities(WindowType.MAIN, 1);
-
-		DisplayCapability displayCapability = new DisplayCapability();
-		displayCapability.setDisplayName(display != null ? display.getDisplayName() : null);
-		displayCapability.setWindowTypeSupported(Collections.singletonList(windowTypeCapabilities));
-
-		WindowCapability defaultWindowCapability = new WindowCapability();
-		defaultWindowCapability.setWindowID(PredefinedWindows.DEFAULT_WINDOW.getValue());
-		defaultWindowCapability.setButtonCapabilities(button);
-		defaultWindowCapability.setSoftButtonCapabilities(softButton);
-
-		if (display == null) {
-			defaultWindowCapability.setTextFields(ManagerUtility.WindowCapabilityUtility.getAllTextFields());
-			defaultWindowCapability.setImageFields(ManagerUtility.WindowCapabilityUtility.getAllImageFields());
-			displayCapability.setWindowCapabilities(Collections.singletonList(defaultWindowCapability));
-			return Collections.singletonList(displayCapability);
-		}
-
-		defaultWindowCapability.setTemplatesAvailable(display.getTemplatesAvailable());
-		defaultWindowCapability.setNumCustomPresetsAvailable(display.getNumCustomPresetsAvailable());
-		defaultWindowCapability.setTextFields(display.getTextFields());
-		defaultWindowCapability.setImageFields(display.getImageFields());
-		ArrayList<ImageType> imageTypeSupported = new ArrayList<>();
-		imageTypeSupported.add(ImageType.STATIC);
-		if (display.getGraphicSupported()) {
-			imageTypeSupported.add(ImageType.DYNAMIC);
-		}
-		defaultWindowCapability.setImageTypeSupported(imageTypeSupported);
-
-		displayCapability.setWindowCapabilities(Collections.singletonList(defaultWindowCapability));
-		return Collections.singletonList(displayCapability);
-	}
-
-	private DisplayCapabilities createDisplayCapabilities(String displayName, WindowCapability defaultMainWindow) {
-		DisplayCapabilities convertedCapabilities = new DisplayCapabilities();
-		convertedCapabilities.setDisplayType(DisplayType.SDL_GENERIC); //deprecated but it is mandatory...
-		convertedCapabilities.setDisplayName(displayName);
-		convertedCapabilities.setTextFields(defaultMainWindow.getTextFields());
-		convertedCapabilities.setImageFields(defaultMainWindow.getImageFields());
-		convertedCapabilities.setTemplatesAvailable(defaultMainWindow.getTemplatesAvailable());
-		convertedCapabilities.setNumCustomPresetsAvailable(defaultMainWindow.getNumCustomPresetsAvailable());
-		convertedCapabilities.setMediaClockFormats(new ArrayList<MediaClockFormat>()); // mandatory field but can be empty
-		convertedCapabilities.setGraphicSupported(defaultMainWindow.getImageTypeSupported().contains(ImageType.DYNAMIC));
-
-		return convertedCapabilities;
-	}
-
-	@Test
-	public void testParseRAI() {
-		systemCapabilityManager = createSampleManager();
-
-		List<DisplayCapability> displayCapabilityList = createDisplayCapabilityList(TestValues.GENERAL_DISPLAYCAPABILITIES, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
-		assertTrue(TestValues.TRUE,
-				Validator.validateDisplayCapabilityList(displayCapabilityList, (List<DisplayCapability>) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false)));
-		assertTrue(TestValues.TRUE,
-				Validator.validateHMICapabilities(TestValues.GENERAL_HMICAPABILITIES, (HMICapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.HMI, null, false)));
-		assertTrue(TestValues.TRUE,
-				Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, (DisplayCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false)));
-		assertTrue(TestValues.TRUE,
-				Validator.validateAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST, (List<AudioPassThruCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.AUDIO_PASSTHROUGH, null, false)));
-		assertTrue(TestValues.TRUE,
-				Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, (List<ButtonCapabilities> )systemCapabilityManager.getCapability(SystemCapabilityType.BUTTON, null, false)));
-		assertTrue(TestValues.TRUE,
-				Validator.validateHMIZoneCapabilities(TestValues.GENERAL_HMIZONECAPABILITIES_LIST, (List<HmiZoneCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.HMI_ZONE, null, false)));
-		assertTrue(TestValues.TRUE,
-				Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, (PresetBankCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.PRESET_BANK, null, false)));
-		assertTrue(TestValues.TRUE,
-				Validator.validateSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST, (List<SoftButtonCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.SOFTBUTTON, null, false)));
-		assertTrue(TestValues.TRUE,
-				Validator.validateSpeechCapabilities(TestValues.GENERAL_SPEECHCAPABILITIES_LIST, (List<SpeechCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.SPEECH, null, false)));
-		assertTrue(TestValues.TRUE,
-				Validator.validatePreRecordedSpeechCapabilities(TestValues.GENERAL_PRERECORDEDSPEECH_LIST, (List<PrerecordedSpeech>) systemCapabilityManager.getCapability(SystemCapabilityType.PRERECORDED_SPEECH, null, false)));
-
-	}
-
-	@Test
-	public void testNullDisplayCapabilitiesEnablesAllTextAndImageFields() {
-		List<DisplayCapability> displayCapabilityList = createDisplayCapabilityList(null, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
-		assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getTextFields().size(), 32);
-		assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getImageFields().size(), 16);
-	}
-
-	@Test
-	public void testGetVSCapability(){
-		VideoStreamingCapability vsCapability = new VideoStreamingCapability();
-		vsCapability.setMaxBitrate(TestValues.GENERAL_INT);
-		vsCapability.setPreferredResolution(TestValues.GENERAL_IMAGERESOLUTION);
-		vsCapability.setSupportedFormats(TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST);
-
-		SystemCapability cap = new SystemCapability();
-		cap.setSystemCapabilityType(SystemCapabilityType.VIDEO_STREAMING);
-		cap.setCapabilityForType(SystemCapabilityType.VIDEO_STREAMING, vsCapability);
-
-		final SystemCapability referenceCapability = cap;
-
-		systemCapabilityManager = new SystemCapabilityManager(new InternalSDLInterface() {
-			@Override
-			public void sendRPC(RPCMessage message) {
-				GetSystemCapabilityResponse response = new GetSystemCapabilityResponse();
-				response.setSystemCapability(referenceCapability);
-				response.setSuccess(true);
-				if (message instanceof RPCRequest) {
-					RPCRequest request = (RPCRequest) message;
-					request.getOnRPCResponseListener().onResponse(CorrelationIdGenerator.generateId(), response);
-				}
-			}
-
-			@Override
-			public void addOnRPCListener(FunctionID messageId, OnRPCListener listener) {
-				listener.onReceived(new OnHMIStatus(HMILevel.HMI_FULL, AudioStreamingState.NOT_AUDIBLE, SystemContext.SYSCTXT_MAIN));
-			}
-		});
-
-		systemCapabilityManager.getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
-			@Override
-			public void onCapabilityRetrieved(Object capability) {
-				assertTrue(TestValues.TRUE,
-						Validator.validateVideoStreamingCapability(
-								(VideoStreamingCapability) referenceCapability.getCapabilityForType(SystemCapabilityType.VIDEO_STREAMING),
-								(VideoStreamingCapability) capability));
-			}
-
-			@Override
-			public void onError(String info) {
-				assertTrue(false);
-			}
-		}, false);
-	}
-
-	private Answer<Void> createOnHMIStatusAnswer(final HMILevel hmiLevel){
-		Answer<Void> onHMIStatusAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				OnRPCListener onHMIStatusListener = (OnRPCListener) args[1];
-				OnHMIStatus onHMIStatusFakeNotification = new OnHMIStatus();
-				onHMIStatusFakeNotification.setHmiLevel(hmiLevel);
-				onHMIStatusListener.onReceived(onHMIStatusFakeNotification);
-				return null;
-			}
-		};
-		return onHMIStatusAnswer;
-	}
-
-	private Answer<Void> createOnSendGetSystemCapabilityAnswer (final boolean success, final Boolean subscribe) {
-		Answer<Void> onSendGetSystemCapabilityAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				GetSystemCapability getSystemCapability = (GetSystemCapability) args[0];
-				if (subscribe != null) {
-					assertEquals(subscribe, getSystemCapability.getSubscribe());
-				}
-				GetSystemCapabilityResponse response;
-				if (success) {
-					response = new GetSystemCapabilityResponse(Result.SUCCESS, true);
-				} else {
-					response = new GetSystemCapabilityResponse(Result.REJECTED, false);
-				}
-				response.setSystemCapability(systemCapability);
-				getSystemCapability.getOnRPCResponseListener().onResponse(CorrelationIdGenerator.generateId(), response);
-				return null;
-			}
-		};
-		return onSendGetSystemCapabilityAnswer;
-	}
-
-	@Test
-	public void testGetCapability() {
-		ISdl internalInterface;
-		SystemCapabilityManager scm;
-		OnSystemCapabilityListener onSystemCapabilityListener;
-		VideoStreamingCapability retrievedCapability;
-
-
-		// Test case 1 (capability not cached, listener not null, forceUpdate false)
-		internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		scm = new SystemCapabilityManager(internalInterface);
-		onSystemCapabilityListener = mock(OnSystemCapabilityListener.class);
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, null);
-		retrievedCapability = (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, false);
-		assertNull(retrievedCapability);
-		verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener, times(1)).onCapabilityRetrieved(any(Object.class));
-
-
-		// Test case 2 (capability cached, listener not null, forceUpdate true)
-		internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		scm = new SystemCapabilityManager(internalInterface);
-		onSystemCapabilityListener = mock(OnSystemCapabilityListener.class);
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
-		retrievedCapability =  (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, true);
-		assertTrue(TestValues.TRUE, Validator.validateVideoStreamingCapability((VideoStreamingCapability) systemCapability.getCapabilityForType(SystemCapabilityType.VIDEO_STREAMING), retrievedCapability));
-		verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener, times(1)).onCapabilityRetrieved(any(Object.class));
-
-
-		// Test case 3 (capability cached, listener null, forceUpdate true)
-		internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		scm = new SystemCapabilityManager(internalInterface);
-		onSystemCapabilityListener = null;
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
-		retrievedCapability =  (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, true);
-		assertTrue(TestValues.TRUE, Validator.validateVideoStreamingCapability((VideoStreamingCapability) systemCapability.getCapabilityForType(SystemCapabilityType.VIDEO_STREAMING), retrievedCapability));
-		verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
-
-
-		// Test case 4 (capability cached, listener null, forceUpdate false)
-		internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		scm = new SystemCapabilityManager(internalInterface);
-		onSystemCapabilityListener = null;
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
-		retrievedCapability =  (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, false);
-		assertTrue(TestValues.TRUE, Validator.validateVideoStreamingCapability((VideoStreamingCapability) systemCapability.getCapabilityForType(SystemCapabilityType.VIDEO_STREAMING), retrievedCapability));
-		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
-	}
-
-	@Test
-	public void testGetCapabilityHmiNone() {
-		ISdl internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_NONE)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
-		OnSystemCapabilityListener onSystemCapabilityListener = mock(OnSystemCapabilityListener.class);
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, null);
-		VideoStreamingCapability retrievedCapability = (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, false);
-		assertNull(retrievedCapability);
-		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener, times(0)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener, times(1)).onError(any(String.class));
-	}
-
-	@Test
-	public void testAddOnSystemCapabilityListenerWithSubscriptionsSupportedAndCapabilityCached() {
-		SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(6, 0); // This version supports capability subscriptions
-		sdlMsgVersion.setPatchVersion(0);
-		ISdl internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		when(internalInterface.getSdlMsgVersion()).thenReturn(sdlMsgVersion);
-		SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
-		scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
-
-
-		// Add listener1
-		// When the first listener is added, GetSystemCapability request should go out with subscribe=true
-		OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, true)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
-		verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
-
-
-		// Add listener2
-		OnSystemCapabilityListener onSystemCapabilityListener2 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
-		verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
-
-
-		// Add listener3
-		OnSystemCapabilityListener onSystemCapabilityListener3 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-		verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
-
-
-		// Remove listener1
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
-
-
-		// Remove listener2
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
-
-
-		// Remove listener3
-		// When the last listener is removed, GetSystemCapability request should go out with subscribe=false
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-		verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
-	}
-
-	@Test
-	public void testAddOnSystemCapabilityListenerWithSubscriptionsSupportedAndCapabilityNotCached() {
-		SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(6, 0); // This version supports capability subscriptions
-		sdlMsgVersion.setPatchVersion(0);
-		ISdl internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		when(internalInterface.getSdlMsgVersion()).thenReturn(sdlMsgVersion);
-		SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
-		scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, null);
-
-
-		// Add listener1
-		// When the first listener is added, GetSystemCapability request should go out with subscribe=true
-		OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, true)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
-		verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
-
-
-		// Add listener2
-		OnSystemCapabilityListener onSystemCapabilityListener2 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
-		verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
+    public static final String TAG = "SystemCapabilityManagerTests";
+    public static SystemCapabilityManager systemCapabilityManager;
+    private SystemCapability systemCapability;
+    private VideoStreamingCapability videoStreamingCapability;
+
+    @Before
+    public void setUp() throws Exception {
+
+        systemCapability = new SystemCapability(SystemCapabilityType.VIDEO_STREAMING);
+        videoStreamingCapability = new VideoStreamingCapability();
+        videoStreamingCapability.setMaxBitrate(TestValues.GENERAL_INT);
+        videoStreamingCapability.setPreferredResolution(TestValues.GENERAL_IMAGERESOLUTION);
+        videoStreamingCapability.setSupportedFormats(TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST);
+        systemCapability.setCapabilityForType(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
+    }
+
+    public SystemCapabilityManager createSampleManager() {
+        return createSampleManager(new InternalSDLInterface());
+    }
+
+    public SystemCapabilityManager createSampleManager(InternalSDLInterface iSdl) {
+        SystemCapabilityManager systemCapabilityManager = new SystemCapabilityManager(iSdl);
+
+        RegisterAppInterfaceResponse raiResponse = new RegisterAppInterfaceResponse();
+
+        raiResponse.setHmiCapabilities(TestValues.GENERAL_HMICAPABILITIES);
+        raiResponse.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES);
+        raiResponse.setAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST);
+        raiResponse.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST);
+        raiResponse.setHmiZoneCapabilities(TestValues.GENERAL_HMIZONECAPABILITIES_LIST);
+        raiResponse.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES);
+        raiResponse.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
+        raiResponse.setSpeechCapabilities(TestValues.GENERAL_SPEECHCAPABILITIES_LIST);
+        raiResponse.setPrerecordedSpeech(TestValues.GENERAL_PRERECORDEDSPEECH_LIST);
+        raiResponse.setSuccess(true);
+
+        systemCapabilityManager.parseRAIResponse(raiResponse);
+        return systemCapabilityManager;
+    }
+
+    private List<DisplayCapability> createDisplayCapabilityList(DisplayCapabilities display, List<ButtonCapabilities> button, List<SoftButtonCapabilities> softButton) {
+        WindowTypeCapabilities windowTypeCapabilities = new WindowTypeCapabilities(WindowType.MAIN, 1);
+
+        DisplayCapability displayCapability = new DisplayCapability();
+        displayCapability.setDisplayName(display != null ? display.getDisplayName() : null);
+        displayCapability.setWindowTypeSupported(Collections.singletonList(windowTypeCapabilities));
+
+        WindowCapability defaultWindowCapability = new WindowCapability();
+        defaultWindowCapability.setWindowID(PredefinedWindows.DEFAULT_WINDOW.getValue());
+        defaultWindowCapability.setButtonCapabilities(button);
+        defaultWindowCapability.setSoftButtonCapabilities(softButton);
+
+        if (display == null) {
+            defaultWindowCapability.setTextFields(ManagerUtility.WindowCapabilityUtility.getAllTextFields());
+            defaultWindowCapability.setImageFields(ManagerUtility.WindowCapabilityUtility.getAllImageFields());
+            displayCapability.setWindowCapabilities(Collections.singletonList(defaultWindowCapability));
+            return Collections.singletonList(displayCapability);
+        }
+
+        defaultWindowCapability.setTemplatesAvailable(display.getTemplatesAvailable());
+        defaultWindowCapability.setNumCustomPresetsAvailable(display.getNumCustomPresetsAvailable());
+        defaultWindowCapability.setTextFields(display.getTextFields());
+        defaultWindowCapability.setImageFields(display.getImageFields());
+        ArrayList<ImageType> imageTypeSupported = new ArrayList<>();
+        imageTypeSupported.add(ImageType.STATIC);
+        if (display.getGraphicSupported()) {
+            imageTypeSupported.add(ImageType.DYNAMIC);
+        }
+        defaultWindowCapability.setImageTypeSupported(imageTypeSupported);
+
+        displayCapability.setWindowCapabilities(Collections.singletonList(defaultWindowCapability));
+        return Collections.singletonList(displayCapability);
+    }
+
+    private DisplayCapabilities createDisplayCapabilities(String displayName, WindowCapability defaultMainWindow) {
+        DisplayCapabilities convertedCapabilities = new DisplayCapabilities();
+        convertedCapabilities.setDisplayType(DisplayType.SDL_GENERIC); //deprecated but it is mandatory...
+        convertedCapabilities.setDisplayName(displayName);
+        convertedCapabilities.setTextFields(defaultMainWindow.getTextFields());
+        convertedCapabilities.setImageFields(defaultMainWindow.getImageFields());
+        convertedCapabilities.setTemplatesAvailable(defaultMainWindow.getTemplatesAvailable());
+        convertedCapabilities.setNumCustomPresetsAvailable(defaultMainWindow.getNumCustomPresetsAvailable());
+        convertedCapabilities.setMediaClockFormats(new ArrayList<MediaClockFormat>()); // mandatory field but can be empty
+        convertedCapabilities.setGraphicSupported(defaultMainWindow.getImageTypeSupported().contains(ImageType.DYNAMIC));
+
+        return convertedCapabilities;
+    }
+
+    @Test
+    public void testParseRAI() {
+        systemCapabilityManager = createSampleManager();
+
+        List<DisplayCapability> displayCapabilityList = createDisplayCapabilityList(TestValues.GENERAL_DISPLAYCAPABILITIES, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
+        assertTrue(TestValues.TRUE,
+                Validator.validateDisplayCapabilityList(displayCapabilityList, (List<DisplayCapability>) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false)));
+        assertTrue(TestValues.TRUE,
+                Validator.validateHMICapabilities(TestValues.GENERAL_HMICAPABILITIES, (HMICapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.HMI, null, false)));
+        assertTrue(TestValues.TRUE,
+                Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, (DisplayCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false)));
+        assertTrue(TestValues.TRUE,
+                Validator.validateAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST, (List<AudioPassThruCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.AUDIO_PASSTHROUGH, null, false)));
+        assertTrue(TestValues.TRUE,
+                Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, (List<ButtonCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.BUTTON, null, false)));
+        assertTrue(TestValues.TRUE,
+                Validator.validateHMIZoneCapabilities(TestValues.GENERAL_HMIZONECAPABILITIES_LIST, (List<HmiZoneCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.HMI_ZONE, null, false)));
+        assertTrue(TestValues.TRUE,
+                Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, (PresetBankCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.PRESET_BANK, null, false)));
+        assertTrue(TestValues.TRUE,
+                Validator.validateSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST, (List<SoftButtonCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.SOFTBUTTON, null, false)));
+        assertTrue(TestValues.TRUE,
+                Validator.validateSpeechCapabilities(TestValues.GENERAL_SPEECHCAPABILITIES_LIST, (List<SpeechCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.SPEECH, null, false)));
+        assertTrue(TestValues.TRUE,
+                Validator.validatePreRecordedSpeechCapabilities(TestValues.GENERAL_PRERECORDEDSPEECH_LIST, (List<PrerecordedSpeech>) systemCapabilityManager.getCapability(SystemCapabilityType.PRERECORDED_SPEECH, null, false)));
+
+    }
+
+    @Test
+    public void testNullDisplayCapabilitiesEnablesAllTextAndImageFields() {
+        List<DisplayCapability> displayCapabilityList = createDisplayCapabilityList(null, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
+        assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getTextFields().size(), 32);
+        assertEquals(displayCapabilityList.get(0).getWindowCapabilities().get(0).getImageFields().size(), 16);
+    }
+
+    @Test
+    public void testGetVSCapability() {
+        VideoStreamingCapability vsCapability = new VideoStreamingCapability();
+        vsCapability.setMaxBitrate(TestValues.GENERAL_INT);
+        vsCapability.setPreferredResolution(TestValues.GENERAL_IMAGERESOLUTION);
+        vsCapability.setSupportedFormats(TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST);
+
+        SystemCapability cap = new SystemCapability();
+        cap.setSystemCapabilityType(SystemCapabilityType.VIDEO_STREAMING);
+        cap.setCapabilityForType(SystemCapabilityType.VIDEO_STREAMING, vsCapability);
+
+        final SystemCapability referenceCapability = cap;
+
+        systemCapabilityManager = new SystemCapabilityManager(new InternalSDLInterface() {
+            @Override
+            public void sendRPC(RPCMessage message) {
+                GetSystemCapabilityResponse response = new GetSystemCapabilityResponse();
+                response.setSystemCapability(referenceCapability);
+                response.setSuccess(true);
+                if (message instanceof RPCRequest) {
+                    RPCRequest request = (RPCRequest) message;
+                    request.getOnRPCResponseListener().onResponse(CorrelationIdGenerator.generateId(), response);
+                }
+            }
+
+            @Override
+            public void addOnRPCListener(FunctionID messageId, OnRPCListener listener) {
+                listener.onReceived(new OnHMIStatus(HMILevel.HMI_FULL, AudioStreamingState.NOT_AUDIBLE, SystemContext.SYSCTXT_MAIN));
+            }
+        });
+
+        systemCapabilityManager.getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
+            @Override
+            public void onCapabilityRetrieved(Object capability) {
+                assertTrue(TestValues.TRUE,
+                        Validator.validateVideoStreamingCapability(
+                                (VideoStreamingCapability) referenceCapability.getCapabilityForType(SystemCapabilityType.VIDEO_STREAMING),
+                                (VideoStreamingCapability) capability));
+            }
+
+            @Override
+            public void onError(String info) {
+                assertTrue(false);
+            }
+        }, false);
+    }
+
+    private Answer<Void> createOnHMIStatusAnswer(final HMILevel hmiLevel) {
+        Answer<Void> onHMIStatusAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                OnRPCListener onHMIStatusListener = (OnRPCListener) args[1];
+                OnHMIStatus onHMIStatusFakeNotification = new OnHMIStatus();
+                onHMIStatusFakeNotification.setHmiLevel(hmiLevel);
+                onHMIStatusListener.onReceived(onHMIStatusFakeNotification);
+                return null;
+            }
+        };
+        return onHMIStatusAnswer;
+    }
+
+    private Answer<Void> createOnSendGetSystemCapabilityAnswer(final boolean success, final Boolean subscribe) {
+        Answer<Void> onSendGetSystemCapabilityAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                GetSystemCapability getSystemCapability = (GetSystemCapability) args[0];
+                if (subscribe != null) {
+                    assertEquals(subscribe, getSystemCapability.getSubscribe());
+                }
+                GetSystemCapabilityResponse response;
+                if (success) {
+                    response = new GetSystemCapabilityResponse(Result.SUCCESS, true);
+                } else {
+                    response = new GetSystemCapabilityResponse(Result.REJECTED, false);
+                }
+                response.setSystemCapability(systemCapability);
+                getSystemCapability.getOnRPCResponseListener().onResponse(CorrelationIdGenerator.generateId(), response);
+                return null;
+            }
+        };
+        return onSendGetSystemCapabilityAnswer;
+    }
+
+    @Test
+    public void testGetCapability() {
+        ISdl internalInterface;
+        SystemCapabilityManager scm;
+        OnSystemCapabilityListener onSystemCapabilityListener;
+        VideoStreamingCapability retrievedCapability;
+
+
+        // Test case 1 (capability not cached, listener not null, forceUpdate false)
+        internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        scm = new SystemCapabilityManager(internalInterface);
+        onSystemCapabilityListener = mock(OnSystemCapabilityListener.class);
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, null);
+        retrievedCapability = (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, false);
+        assertNull(retrievedCapability);
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener, times(1)).onCapabilityRetrieved(any(Object.class));
+
+
+        // Test case 2 (capability cached, listener not null, forceUpdate true)
+        internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        scm = new SystemCapabilityManager(internalInterface);
+        onSystemCapabilityListener = mock(OnSystemCapabilityListener.class);
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
+        retrievedCapability = (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, true);
+        assertTrue(TestValues.TRUE, Validator.validateVideoStreamingCapability((VideoStreamingCapability) systemCapability.getCapabilityForType(SystemCapabilityType.VIDEO_STREAMING), retrievedCapability));
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener, times(1)).onCapabilityRetrieved(any(Object.class));
+
+
+        // Test case 3 (capability cached, listener null, forceUpdate true)
+        internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        scm = new SystemCapabilityManager(internalInterface);
+        onSystemCapabilityListener = null;
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
+        retrievedCapability = (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, true);
+        assertTrue(TestValues.TRUE, Validator.validateVideoStreamingCapability((VideoStreamingCapability) systemCapability.getCapabilityForType(SystemCapabilityType.VIDEO_STREAMING), retrievedCapability));
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+
+
+        // Test case 4 (capability cached, listener null, forceUpdate false)
+        internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        scm = new SystemCapabilityManager(internalInterface);
+        onSystemCapabilityListener = null;
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
+        retrievedCapability = (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, false);
+        assertTrue(TestValues.TRUE, Validator.validateVideoStreamingCapability((VideoStreamingCapability) systemCapability.getCapabilityForType(SystemCapabilityType.VIDEO_STREAMING), retrievedCapability));
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+    }
+
+    @Test
+    public void testGetCapabilityHmiNone() {
+        ISdl internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_NONE)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
+        OnSystemCapabilityListener onSystemCapabilityListener = mock(OnSystemCapabilityListener.class);
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, null);
+        VideoStreamingCapability retrievedCapability = (VideoStreamingCapability) scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener, false);
+        assertNull(retrievedCapability);
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener, times(0)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener, times(1)).onError(any(String.class));
+    }
+
+    @Test
+    public void testAddOnSystemCapabilityListenerWithSubscriptionsSupportedAndCapabilityCached() {
+        SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(6, 0); // This version supports capability subscriptions
+        sdlMsgVersion.setPatchVersion(0);
+        ISdl internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        when(internalInterface.getSdlMsgVersion()).thenReturn(sdlMsgVersion);
+        SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
+        scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
+
+
+        // Add listener1
+        // When the first listener is added, GetSystemCapability request should go out with subscribe=true
+        OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, true)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
+
+
+        // Add listener2
+        OnSystemCapabilityListener onSystemCapabilityListener2 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
+        verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
+
+
+        // Add listener3
+        OnSystemCapabilityListener onSystemCapabilityListener3 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
+        verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
+
+
+        // Remove listener1
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
+
+
+        // Remove listener2
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
+
+
+        // Remove listener3
+        // When the last listener is removed, GetSystemCapability request should go out with subscribe=false
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
+        verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
+    }
+
+    @Test
+    public void testAddOnSystemCapabilityListenerWithSubscriptionsSupportedAndCapabilityNotCached() {
+        SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(6, 0); // This version supports capability subscriptions
+        sdlMsgVersion.setPatchVersion(0);
+        ISdl internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        when(internalInterface.getSdlMsgVersion()).thenReturn(sdlMsgVersion);
+        SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
+        scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, null);
+
+
+        // Add listener1
+        // When the first listener is added, GetSystemCapability request should go out with subscribe=true
+        OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, true)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
+
+
+        // Add listener2
+        OnSystemCapabilityListener onSystemCapabilityListener2 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
+        verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
+
 
+        // Add listener3
+        OnSystemCapabilityListener onSystemCapabilityListener3 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
+        verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
-		// Add listener3
-		OnSystemCapabilityListener onSystemCapabilityListener3 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-		verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
+        // Remove listener1
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
 
-		// Remove listener1
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
 
+        // Remove listener2
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
 
-		// Remove listener2
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
 
+        // Remove listener3
+        // When the last listener is removed, GetSystemCapability request should go out with subscribe=false
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
+        verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
+    }
 
-		// Remove listener3
-		// When the last listener is removed, GetSystemCapability request should go out with subscribe=false
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-		verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
-	}
+    @Test
+    public void testAddOnSystemCapabilityListenerWithSubscriptionsNotSupportedAndCapabilityCached() {
+        SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(5, 0); // This version doesn't support capability subscriptions
+        sdlMsgVersion.setPatchVersion(0);
+        ISdl internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        when(internalInterface.getSdlMsgVersion()).thenReturn(sdlMsgVersion);
+        SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
+        scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
 
-	@Test
-	public void testAddOnSystemCapabilityListenerWithSubscriptionsNotSupportedAndCapabilityCached() {
-		SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(5, 0); // This version doesn't support capability subscriptions
-		sdlMsgVersion.setPatchVersion(0);
-		ISdl internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		when(internalInterface.getSdlMsgVersion()).thenReturn(sdlMsgVersion);
-		SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
-		scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
 
+        // Add listener1
+        // When the first listener is added, GetSystemCapability request should not go out because subscription is not supported and the capability is cached
+        OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, true)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
 
-		// Add listener1
-		// When the first listener is added, GetSystemCapability request should not go out because subscription is not supported and the capability is cached
-		OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, true)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
-		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
 
+        // Add listener2
+        OnSystemCapabilityListener onSystemCapabilityListener2 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
+        verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
 
-		// Add listener2
-		OnSystemCapabilityListener onSystemCapabilityListener2 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
-		verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
 
+        // Add listener3
+        OnSystemCapabilityListener onSystemCapabilityListener3 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
+        verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
-		// Add listener3
-		OnSystemCapabilityListener onSystemCapabilityListener3 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-		verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
+        // Remove listener1
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
 
-		// Remove listener1
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
 
+        // Remove listener2
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
 
-		// Remove listener2
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
 
+        // Remove listener3
+        // When the last listener is removed, GetSystemCapability request should not go out because subscription is not supported
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+    }
 
-		// Remove listener3
-		// When the last listener is removed, GetSystemCapability request should not go out because subscription is not supported
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
-	}
+    @Test
+    public void testAddOnSystemCapabilityListenerWithSubscriptionsNotSupportedAndCapabilityNotCached() {
+        SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(5, 0); // This version doesn't support capability subscriptions
+        sdlMsgVersion.setPatchVersion(0);
+        ISdl internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        when(internalInterface.getSdlMsgVersion()).thenReturn(sdlMsgVersion);
+        SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
+        scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, null);
 
-	@Test
-	public void testAddOnSystemCapabilityListenerWithSubscriptionsNotSupportedAndCapabilityNotCached() {
-		SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(5, 0); // This version doesn't support capability subscriptions
-		sdlMsgVersion.setPatchVersion(0);
-		ISdl internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		when(internalInterface.getSdlMsgVersion()).thenReturn(sdlMsgVersion);
-		SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
-		scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, null);
 
+        // Add listener1
+        // When the first listener is added, GetSystemCapability request should out because because capability is not cached
+        OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
 
-		// Add listener1
-		// When the first listener is added, GetSystemCapability request should out because because capability is not cached
-		OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
-		verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
 
+        // Add listener2
+        OnSystemCapabilityListener onSystemCapabilityListener2 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
+        verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
 
-		// Add listener2
-		OnSystemCapabilityListener onSystemCapabilityListener2 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
-		verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
 
+        // Add listener3
+        OnSystemCapabilityListener onSystemCapabilityListener3 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
+        verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
-		// Add listener3
-		OnSystemCapabilityListener onSystemCapabilityListener3 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-		verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
+        // Remove listener1
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
 
-		// Remove listener1
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
 
+        // Remove listener2
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
 
-		// Remove listener2
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
 
+        // Remove listener3
+        // When the last listener is removed, GetSystemCapability request should not go out because subscription is not supported
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+    }
 
-		// Remove listener3
-		// When the last listener is removed, GetSystemCapability request should not go out because subscription is not supported
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-		verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
-	}
+    @Test
+    public void testAddOnSystemCapabilityListenerThenGetCapabilityWhenSubscriptionsAreNotSupported() {
+        SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(5, 0); // This version doesn't support capability subscriptions
+        sdlMsgVersion.setPatchVersion(0);
+        ISdl internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        when(internalInterface.getSdlMsgVersion()).thenReturn(sdlMsgVersion);
+        SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
+        scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
 
-	@Test
-	public void testAddOnSystemCapabilityListenerThenGetCapabilityWhenSubscriptionsAreNotSupported() {
-		SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(5, 0); // This version doesn't support capability subscriptions
-		sdlMsgVersion.setPatchVersion(0);
-		ISdl internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		when(internalInterface.getSdlMsgVersion()).thenReturn(sdlMsgVersion);
-		SystemCapabilityManager scm = new SystemCapabilityManager(internalInterface);
-		scm.setCapability(SystemCapabilityType.VIDEO_STREAMING, videoStreamingCapability);
 
+        // Add listener1
+        // When the first listener is added, GetSystemCapability request should go out with subscribe=false
+        OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
 
-		// Add listener1
-		// When the first listener is added, GetSystemCapability request should go out with subscribe=false
-		OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, false)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
-		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
 
+        // Get Capability (should notify listener1 again)
+        scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
+        verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(2)).onCapabilityRetrieved(any(Object.class));
 
-		// Get Capability (should notify listener1 again)
-		scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-		verify(internalInterface, times(1)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(2)).onCapabilityRetrieved(any(Object.class));
 
+        // Add listener2
+        OnSystemCapabilityListener onSystemCapabilityListener2 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
+        verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
 
-		// Add listener2
-		OnSystemCapabilityListener onSystemCapabilityListener2 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
-		verify(onSystemCapabilityListener2, times(1)).onCapabilityRetrieved(any(Object.class));
 
+        // Get Capability (should notify listener1 & listener2 again)
+        scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
+        verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(3)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener2, times(2)).onCapabilityRetrieved(any(Object.class));
 
-		// Get Capability (should notify listener1 & listener2 again)
-		scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-		verify(internalInterface, times(2)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(3)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener2, times(2)).onCapabilityRetrieved(any(Object.class));
 
+        // Add listener3
+        OnSystemCapabilityListener onSystemCapabilityListener3 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
+        verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
-		// Add listener3
-		OnSystemCapabilityListener onSystemCapabilityListener3 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-		verify(onSystemCapabilityListener3, times(1)).onCapabilityRetrieved(any(Object.class));
 
+        // Get Capability (should notify listener1 & listener2 & listener3 again)
+        scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
+        verify(internalInterface, times(3)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener2, times(3)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener3, times(2)).onCapabilityRetrieved(any(Object.class));
 
-		// Get Capability (should notify listener1 & listener2 & listener3 again)
-		scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-		verify(internalInterface, times(3)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener2, times(3)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener3, times(2)).onCapabilityRetrieved(any(Object.class));
 
+        // Remove listener1
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
 
-		// Remove listener1
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener1);
 
+        // Get Capability (should notify listener2 & listener3 again)
+        scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
+        verify(internalInterface, times(4)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener2, times(4)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener3, times(3)).onCapabilityRetrieved(any(Object.class));
 
-		// Get Capability (should notify listener2 & listener3 again)
-		scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-		verify(internalInterface, times(4)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener2, times(4)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener3, times(3)).onCapabilityRetrieved(any(Object.class));
 
+        // Remove listener2
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
 
-		// Remove listener2
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener2);
 
+        // Get Capability (should notify listener3 again)
+        scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
+        verify(internalInterface, times(5)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener2, times(4)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener3, times(4)).onCapabilityRetrieved(any(Object.class));
 
-		// Get Capability (should notify listener3 again)
-		scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-		verify(internalInterface, times(5)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener2, times(4)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener3, times(4)).onCapabilityRetrieved(any(Object.class));
 
+        // Remove listener3
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
+        verify(internalInterface, times(5)).sendRPC(any(GetSystemCapability.class));
 
-		// Remove listener3
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, onSystemCapabilityListener3);
-		verify(internalInterface, times(5)).sendRPC(any(GetSystemCapability.class));
 
+        // Get Capability (should not notify any listener again because they are all removed)
+        scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
+        verify(internalInterface, times(6)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener2, times(4)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener3, times(4)).onCapabilityRetrieved(any(Object.class));
+    }
 
-		// Get Capability (should not notify any listener again because they are all removed)
-		scm.getCapability(SystemCapabilityType.VIDEO_STREAMING, null, true);
-		verify(internalInterface, times(6)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(4)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener2, times(4)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener3, times(4)).onCapabilityRetrieved(any(Object.class));
-	}
+    @Test
+    public void testGetAndAddListenerForDisplaysCapability() {
+        ISdl internalInterface;
+        SystemCapabilityManager scm;
+        OnSystemCapabilityListener onSystemCapabilityListener;
+        DisplayCapabilities retrievedCapability;
+
+
+        // Test case 1 (capability cached, listener not null, forceUpdate true)
+        internalInterface = mock(ISdl.class);
+        doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
+        scm = new SystemCapabilityManager(internalInterface);
+        onSystemCapabilityListener = mock(OnSystemCapabilityListener.class);
+        doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
+        scm.setCapability(SystemCapabilityType.DISPLAYS, new DisplayCapabilities());
+        retrievedCapability = (DisplayCapabilities) scm.getCapability(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener, true);
+        assertNotNull(retrievedCapability);
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener, times(1)).onCapabilityRetrieved(any(Object.class));
+        verify(onSystemCapabilityListener, times(0)).onError(any(String.class));
 
-	@Test
-	public void testGetAndAddListenerForDisplaysCapability() {
-		ISdl internalInterface;
-		SystemCapabilityManager scm;
-		OnSystemCapabilityListener onSystemCapabilityListener;
-		DisplayCapabilities retrievedCapability;
-
-
-		// Test case 1 (capability cached, listener not null, forceUpdate true)
-		internalInterface = mock(ISdl.class);
-		doAnswer(createOnHMIStatusAnswer(HMILevel.HMI_FULL)).when(internalInterface).addOnRPCListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCListener.class));
-		scm = new SystemCapabilityManager(internalInterface);
-		onSystemCapabilityListener = mock(OnSystemCapabilityListener.class);
-		doAnswer(createOnSendGetSystemCapabilityAnswer(true, null)).when(internalInterface).sendRPC(any(GetSystemCapability.class));
-		scm.setCapability(SystemCapabilityType.DISPLAYS, new DisplayCapabilities());
-		retrievedCapability = (DisplayCapabilities) scm.getCapability(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener, true);
-		assertNotNull(retrievedCapability);
-		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener, times(1)).onCapabilityRetrieved(any(Object.class));
-		verify(onSystemCapabilityListener, times(0)).onError(any(String.class));
+
+        // Test case 2 (Add listener)
+        // When the first DISPLAYS listener is added, GetSystemCapability request should not go out
+        OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
+        scm.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener1);
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+        verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
 
 
-		// Test case 2 (Add listener)
-		// When the first DISPLAYS listener is added, GetSystemCapability request should not go out
-		OnSystemCapabilityListener onSystemCapabilityListener1 = mock(OnSystemCapabilityListener.class);
-		scm.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener1);
-		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
-		verify(onSystemCapabilityListener1, times(1)).onCapabilityRetrieved(any(Object.class));
-
+        // Test case 3 (Remove listener)
+        // When the last DISPLAYS listener is removed, GetSystemCapability request should not go out
+        scm.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener1);
+        verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
+    }
+
+    @Test
+    public void testListConversion() {
+        SystemCapabilityManager systemCapabilityManager = createSampleManager();
+        Object capability = systemCapabilityManager.getCapability(SystemCapabilityType.SOFTBUTTON, null, false);
+        assertNotNull(capability);
+        List<SoftButtonCapabilities> list = SystemCapabilityManager.convertToList(capability, SoftButtonCapabilities.class);
+        assertNotNull(list);
+    }
+
+    @Test
+    public void testFalsePositive() {
+        SystemCapabilityManager systemCapabilityManager = createSampleManager();
+        systemCapabilityManager.setCapability(SystemCapabilityType.AUDIO_PASSTHROUGH, null);
+        assertFalse(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.AUDIO_PASSTHROUGH));
+    }
+
+    @Test
+    public void testOnSystemCapabilityUpdateWithNoExistingCap() {
+        InternalSDLInterface iSDL = new InternalSDLInterface();
+        SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
+        OnRPCListener scmRpcListener = iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()).get(0);
+        assertNotNull(scmRpcListener);
+
+        assertNull(systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false));
 
-		// Test case 3 (Remove listener)
-		// When the last DISPLAYS listener is removed, GetSystemCapability request should not go out
-		scm.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener1);
-		verify(internalInterface, times(0)).sendRPC(any(GetSystemCapability.class));
-	}
-
-	@Test
-	public void testListConversion(){
-		SystemCapabilityManager systemCapabilityManager = createSampleManager();
-		Object capability = systemCapabilityManager.getCapability(SystemCapabilityType.SOFTBUTTON, null, false);
-		assertNotNull(capability);
-		List<SoftButtonCapabilities> list = SystemCapabilityManager.convertToList(capability, SoftButtonCapabilities.class);
-		assertNotNull(list);
-	}
-
-	@Test
-	public void testFalsePositive(){
-		SystemCapabilityManager systemCapabilityManager = createSampleManager();
-		systemCapabilityManager.setCapability(SystemCapabilityType.AUDIO_PASSTHROUGH, null);
-		assertFalse(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.AUDIO_PASSTHROUGH));
-	}
-
-	@Test
-	public void testOnSystemCapabilityUpdateWithNoExistingCap(){
-		InternalSDLInterface iSDL = new InternalSDLInterface();
-		SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
-		OnRPCListener scmRpcListener = iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()).get(0);
-		assertNotNull(scmRpcListener);
-
-		assertNull(systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false));
+        /* PERFORM A NOTIFICATION SEND THROUGH THE SCM */
+        AppServiceCapability addServiceID = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "test", "3453", true, null);
+        AppServicesCapabilities serviceIdASC = new AppServicesCapabilities();
+        serviceIdASC.setAppServices(Collections.singletonList(addServiceID));
 
-		/* PERFORM A NOTIFICATION SEND THROUGH THE SCM */
-		AppServiceCapability addServiceID = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "test", "3453", true, null);
-		AppServicesCapabilities serviceIdASC = new AppServicesCapabilities();
-		serviceIdASC.setAppServices(Collections.singletonList(addServiceID));
+        SystemCapability systemCapability = new SystemCapability();
+        systemCapability.setSystemCapabilityType(SystemCapabilityType.APP_SERVICES);
+        systemCapability.setCapabilityForType(SystemCapabilityType.APP_SERVICES, serviceIdASC);
+
+        OnSystemCapabilityUpdated onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
+        onSystemCapabilityUpdated.setSystemCapability(systemCapability);
 
-		SystemCapability systemCapability = new SystemCapability();
-		systemCapability.setSystemCapabilityType(SystemCapabilityType.APP_SERVICES);
-		systemCapability.setCapabilityForType(SystemCapabilityType.APP_SERVICES, serviceIdASC);
-
-		OnSystemCapabilityUpdated onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
-		onSystemCapabilityUpdated.setSystemCapability(systemCapability);
+        scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		scmRpcListener.onReceived(onSystemCapabilityUpdated);
+        assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false));
+    }
+
+    @Test
+    public void testOnSystemCapabilityUpdatedForDISPLAYS() {
+        InternalSDLInterface iSDL = new InternalSDLInterface();
+        SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
+        OnRPCListener scmRpcListener = iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()).get(0);
+        assertNotNull(scmRpcListener);
 
-		assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false));
-	}
-
-	@Test
-	public void testOnSystemCapabilityUpdatedForDISPLAYS() {
-		InternalSDLInterface iSDL = new InternalSDLInterface();
-		SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
-		OnRPCListener scmRpcListener = iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()).get(0);
-		assertNotNull(scmRpcListener);
+        assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false));
+        assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false));
+
+        List<DisplayCapability> newCaps = createDisplayCapabilityList(TestValues.GENERAL_DISPLAYCAPABILITIES, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
+
+        SystemCapability systemCapability = new SystemCapability();
+        systemCapability.setSystemCapabilityType(SystemCapabilityType.DISPLAYS);
+        systemCapability.setCapabilityForType(SystemCapabilityType.DISPLAYS, newCaps);
+
+        OnSystemCapabilityUpdated onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
+        onSystemCapabilityUpdated.setSystemCapability(systemCapability);
+
+        scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false));
-		assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false));
-
-		List<DisplayCapability> newCaps = createDisplayCapabilityList(TestValues.GENERAL_DISPLAYCAPABILITIES, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);;
-
-		SystemCapability systemCapability = new SystemCapability();
-		systemCapability.setSystemCapabilityType(SystemCapabilityType.DISPLAYS);
-		systemCapability.setCapabilityForType(SystemCapabilityType.DISPLAYS, newCaps);
-
-		OnSystemCapabilityUpdated onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
-		onSystemCapabilityUpdated.setSystemCapability(systemCapability);
-
-		scmRpcListener.onReceived(onSystemCapabilityUpdated);
+        List<DisplayCapability> appliedCaps = (List<DisplayCapability>) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false);
+        assertNotNull(appliedCaps);
+        assertTrue(Validator.validateDisplayCapabilityList(newCaps, appliedCaps));
+
+        DisplayCapabilities appliedConvertedCaps = (DisplayCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false);
+        assertNotNull(appliedConvertedCaps);
+        DisplayCapabilities testConvertedCaps = createDisplayCapabilities(newCaps.get(0).getDisplayName(), newCaps.get(0).getWindowCapabilities().get(0));
+        assertTrue(Validator.validateDisplayCapabilities(appliedConvertedCaps, testConvertedCaps));
+    }
+
+    @Test
+    public void testOnSystemCapabilityUpdated() {
+        InternalSDLInterface iSDL = new InternalSDLInterface();
+        String baseName = "NavTest", baseID = "37F98053AE";
+        AppServiceCapability capability1 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, null, true, null);
 
-		List<DisplayCapability> appliedCaps = (List<DisplayCapability>)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false);
-		assertNotNull(appliedCaps);
-		assertTrue(Validator.validateDisplayCapabilityList(newCaps, appliedCaps));
-
-		DisplayCapabilities appliedConvertedCaps = (DisplayCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false);
-		assertNotNull(appliedConvertedCaps);
-		DisplayCapabilities testConvertedCaps = createDisplayCapabilities(newCaps.get(0).getDisplayName(), newCaps.get(0).getWindowCapabilities().get(0));
-		assertTrue(Validator.validateDisplayCapabilities(appliedConvertedCaps, testConvertedCaps));
-	}
-
-	@Test
-	public void testOnSystemCapabilityUpdated(){
-		InternalSDLInterface iSDL = new InternalSDLInterface();
-		String baseName = "NavTest", baseID = "37F98053AE";
-		AppServiceCapability capability1 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, null, true, null);
+        AppServicesCapabilities appServicesCapabilities = new AppServicesCapabilities();
+        appServicesCapabilities.setAppServices(Collections.singletonList(capability1));
 
-		AppServicesCapabilities appServicesCapabilities = new AppServicesCapabilities();
-		appServicesCapabilities.setAppServices(Collections.singletonList(capability1));
+        SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
+        assertNotNull(iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()));
+        OnRPCListener scmRpcListener = iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()).get(0);
+        assertNotNull(scmRpcListener);
 
-		SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
-		assertNotNull(iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()));
-		OnRPCListener scmRpcListener = iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()).get(0);
-		assertNotNull(scmRpcListener);
+        /* CONFIRM THE CAP DOESN'T EXIST IN SCM */
+        AppServicesCapabilities cachedCap = (AppServicesCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
+        assertNull(cachedCap);
 
-		/* CONFIRM THE CAP DOESN'T EXIST IN SCM */
-		AppServicesCapabilities cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
-		assertNull(cachedCap);
+        /* ADD THE CAP IN SCM */
+        systemCapabilityManager.setCapability(SystemCapabilityType.APP_SERVICES, appServicesCapabilities);
+        /* CONFIRM THE CAP DOES EXIST IN SCM */
+        cachedCap = (AppServicesCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
+        assertNotNull(cachedCap);
+        /* CONFIRM THE CAP IN SCM EQUALS ORIGINAL*/
+        assertEquals(cachedCap, appServicesCapabilities);
+        assertNull(cachedCap.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID());
 
-		/* ADD THE CAP IN SCM */
-		systemCapabilityManager.setCapability(SystemCapabilityType.APP_SERVICES, appServicesCapabilities);
-		/* CONFIRM THE CAP DOES EXIST IN SCM */
-		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
-		assertNotNull(cachedCap);
-		/* CONFIRM THE CAP IN SCM EQUALS ORIGINAL*/
-		assertEquals(cachedCap, appServicesCapabilities);
-		assertNull(cachedCap.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID());
+        /* PERFORM A NOTIFICATION SEND THROUGH THE SCM */
+        AppServiceCapability addServiceID = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null);
+        AppServicesCapabilities serviceIdASC = new AppServicesCapabilities();
+        serviceIdASC.setAppServices(Collections.singletonList(addServiceID));
 
-		/* PERFORM A NOTIFICATION SEND THROUGH THE SCM */
-		AppServiceCapability addServiceID = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null);
-		AppServicesCapabilities serviceIdASC = new AppServicesCapabilities();
-		serviceIdASC.setAppServices(Collections.singletonList(addServiceID));
+        SystemCapability systemCapability = new SystemCapability();
+        systemCapability.setSystemCapabilityType(SystemCapabilityType.APP_SERVICES);
+        systemCapability.setCapabilityForType(SystemCapabilityType.APP_SERVICES, serviceIdASC);
 
-		SystemCapability systemCapability = new SystemCapability();
-		systemCapability.setSystemCapabilityType(SystemCapabilityType.APP_SERVICES);
-		systemCapability.setCapabilityForType(SystemCapabilityType.APP_SERVICES, serviceIdASC);
+        OnSystemCapabilityUpdated onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
+        onSystemCapabilityUpdated.setSystemCapability(systemCapability);
 
-		OnSystemCapabilityUpdated onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
-		onSystemCapabilityUpdated.setSystemCapability(systemCapability);
+        scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		scmRpcListener.onReceived(onSystemCapabilityUpdated);
+        cachedCap = (AppServicesCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
+        assertNotNull(cachedCap);
 
-		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
-		assertNotNull(cachedCap);
+        assertTrue(cachedCap.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID().equals(baseID));
 
-		assertTrue(cachedCap.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID().equals(baseID));
+        appServicesCapabilities.updateAppServices(Collections.singletonList(addServiceID));
+        assertTrue(serviceIdASC.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID().equalsIgnoreCase(appServicesCapabilities.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID()));
 
-		appServicesCapabilities.updateAppServices(Collections.singletonList(addServiceID));
-		assertTrue(serviceIdASC.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID().equalsIgnoreCase(appServicesCapabilities.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID()));
+        assertEquals(cachedCap, appServicesCapabilities);
 
-		assertEquals(cachedCap, appServicesCapabilities);
 
+        /* PERFORM A NOTIFICATION SEND THROUGH AN UPDATED SERVICE NAME */
+        AppServiceCapability newServiceName = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "TestNav", baseID, true, null);
+        AppServicesCapabilities newServiceNameASC = new AppServicesCapabilities();
+        newServiceNameASC.setAppServices(Collections.singletonList(newServiceName));
 
-		/* PERFORM A NOTIFICATION SEND THROUGH AN UPDATED SERVICE NAME */
-		AppServiceCapability newServiceName = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "TestNav", baseID, true, null);
-		AppServicesCapabilities newServiceNameASC = new AppServicesCapabilities();
-		newServiceNameASC.setAppServices(Collections.singletonList(newServiceName));
+        systemCapability = new SystemCapability();
+        systemCapability.setSystemCapabilityType(SystemCapabilityType.APP_SERVICES);
+        systemCapability.setCapabilityForType(SystemCapabilityType.APP_SERVICES, newServiceNameASC);
 
-		systemCapability = new SystemCapability();
-		systemCapability.setSystemCapabilityType(SystemCapabilityType.APP_SERVICES);
-		systemCapability.setCapabilityForType(SystemCapabilityType.APP_SERVICES, newServiceNameASC);
+        onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
+        onSystemCapabilityUpdated.setSystemCapability(systemCapability);
 
-		onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
-		onSystemCapabilityUpdated.setSystemCapability(systemCapability);
+        scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		scmRpcListener.onReceived(onSystemCapabilityUpdated);
+        cachedCap = (AppServicesCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
+        assertNotNull(cachedCap);
+        assertEquals(cachedCap.getAppServices().size(), 1);
 
-		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
-		assertNotNull(cachedCap);
-		assertEquals(cachedCap.getAppServices().size(), 1);
 
+        /* PERFORM A NOTIFICATION SEND THROUGH THE SCM WITH DIFFERENT SERVICE */
+        AppServiceCapability newService = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "eeeeeeeee", false, null);
+        AppServicesCapabilities newServiceASC = new AppServicesCapabilities();
+        newServiceASC.setAppServices(Collections.singletonList(newService));
 
-		/* PERFORM A NOTIFICATION SEND THROUGH THE SCM WITH DIFFERENT SERVICE */
-		AppServiceCapability newService = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "eeeeeeeee", false, null);
-		AppServicesCapabilities newServiceASC = new AppServicesCapabilities();
-		newServiceASC.setAppServices(Collections.singletonList(newService));
+        systemCapability = new SystemCapability();
+        systemCapability.setSystemCapabilityType(SystemCapabilityType.APP_SERVICES);
+        systemCapability.setCapabilityForType(SystemCapabilityType.APP_SERVICES, newServiceASC);
 
-		systemCapability = new SystemCapability();
-		systemCapability.setSystemCapabilityType(SystemCapabilityType.APP_SERVICES);
-		systemCapability.setCapabilityForType(SystemCapabilityType.APP_SERVICES, newServiceASC);
+        onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
+        onSystemCapabilityUpdated.setSystemCapability(systemCapability);
 
-		onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
-		onSystemCapabilityUpdated.setSystemCapability(systemCapability);
+        scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		scmRpcListener.onReceived(onSystemCapabilityUpdated);
+        cachedCap = (AppServicesCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
+        assertNotNull(cachedCap);
+        assertEquals(cachedCap.getAppServices().size(), 2);
 
-		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
-		assertNotNull(cachedCap);
-		assertEquals(cachedCap.getAppServices().size(), 2);
+        /* PERFORM A NOTIFICATION SEND THROUGH THE SCM WITH A REMOVED SERVICE */
+        AppServiceCapability removedService = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "eeeeeeeee", false, null);
+        removedService.setUpdateReason(ServiceUpdateReason.REMOVED);
+        AppServicesCapabilities removedServiceASC = new AppServicesCapabilities();
+        removedServiceASC.setAppServices(Collections.singletonList(removedService));
+
+        systemCapability = new SystemCapability();
+        systemCapability.setSystemCapabilityType(SystemCapabilityType.APP_SERVICES);
+        systemCapability.setCapabilityForType(SystemCapabilityType.APP_SERVICES, removedServiceASC);
 
-		/* PERFORM A NOTIFICATION SEND THROUGH THE SCM WITH A REMOVED SERVICE */
-		AppServiceCapability removedService = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "eeeeeeeee", false, null);
-		removedService.setUpdateReason(ServiceUpdateReason.REMOVED);
-		AppServicesCapabilities removedServiceASC = new AppServicesCapabilities();
-		removedServiceASC.setAppServices(Collections.singletonList(removedService));
+        onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
+        onSystemCapabilityUpdated.setSystemCapability(systemCapability);
 
-		systemCapability = new SystemCapability();
-		systemCapability.setSystemCapabilityType(SystemCapabilityType.APP_SERVICES);
-		systemCapability.setCapabilityForType(SystemCapabilityType.APP_SERVICES, removedServiceASC);
+        scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
-		onSystemCapabilityUpdated.setSystemCapability(systemCapability);
+        cachedCap = (AppServicesCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
+        assertNotNull(cachedCap);
+        assertEquals(cachedCap.getAppServices().size(), 1);
 
-		scmRpcListener.onReceived(onSystemCapabilityUpdated);
+    }
 
-		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
-		assertNotNull(cachedCap);
-		assertEquals(cachedCap.getAppServices().size(), 1);
 
-	}
+    @Test
+    public void testOnSystemCapabilityUpdatedOverwrite() {
+        InternalSDLInterface iSDL = new InternalSDLInterface();
+        SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
+        OnRPCListener scmRpcListener = iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()).get(0);
+        assertNotNull(scmRpcListener);
+        systemCapabilityManager.setCapability(SystemCapabilityType.PHONE_CALL, TestValues.GENERAL_PHONECAPABILITY);
 
+        PhoneCapability phoneCapability = (PhoneCapability) systemCapabilityManager.getCapability(SystemCapabilityType.PHONE_CALL, null, false);
+        assertNotNull(phoneCapability);
+        assertEquals(phoneCapability, TestValues.GENERAL_PHONECAPABILITY);
 
-	@Test
-	public void testOnSystemCapabilityUpdatedOverwrite(){
-		InternalSDLInterface iSDL = new InternalSDLInterface();
-		SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
-		OnRPCListener scmRpcListener = iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()).get(0);
-		assertNotNull(scmRpcListener);
-		systemCapabilityManager.setCapability(SystemCapabilityType.PHONE_CALL, TestValues.GENERAL_PHONECAPABILITY);
+        phoneCapability.setDialNumberEnabled(!TestValues.GENERAL_PHONECAPABILITY.getDialNumberEnabled()); //Flip it
+        SystemCapability systemCapability = new SystemCapability();
+        systemCapability.setSystemCapabilityType(SystemCapabilityType.PHONE_CALL);
+        systemCapability.setCapabilityForType(SystemCapabilityType.PHONE_CALL, phoneCapability);
+        OnSystemCapabilityUpdated onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
+        onSystemCapabilityUpdated.setSystemCapability(systemCapability);
 
-		PhoneCapability phoneCapability = (PhoneCapability)systemCapabilityManager.getCapability(SystemCapabilityType.PHONE_CALL, null, false);
-		assertNotNull(phoneCapability);
-		assertEquals(phoneCapability, TestValues.GENERAL_PHONECAPABILITY);
+        scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		phoneCapability.setDialNumberEnabled(!TestValues.GENERAL_PHONECAPABILITY.getDialNumberEnabled()); //Flip it
-		SystemCapability systemCapability = new SystemCapability();
-		systemCapability.setSystemCapabilityType(SystemCapabilityType.PHONE_CALL);
-		systemCapability.setCapabilityForType(SystemCapabilityType.PHONE_CALL, phoneCapability);
-		OnSystemCapabilityUpdated onSystemCapabilityUpdated = new OnSystemCapabilityUpdated();
-		onSystemCapabilityUpdated.setSystemCapability(systemCapability);
+        PhoneCapability phoneCapabilityUpdated = (PhoneCapability) systemCapabilityManager.getCapability(SystemCapabilityType.PHONE_CALL, null, false);
+        assertNotNull(phoneCapabilityUpdated);
+        assertFalse(phoneCapabilityUpdated.getDialNumberEnabled());
+        assertEquals(phoneCapability, phoneCapabilityUpdated);
+    }
 
-		scmRpcListener.onReceived(onSystemCapabilityUpdated);
+    @Test
+    public void testOnSetDisplayLayout() {
+        InternalSDLInterface iSDL = new InternalSDLInterface();
+        SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
+        OnRPCListener dlRpcListener = iSDL.rpcListeners.get(FunctionID.SET_DISPLAY_LAYOUT.getId()).get(0);
+        assertNotNull(dlRpcListener);
 
-		PhoneCapability phoneCapabilityUpdated = (PhoneCapability)systemCapabilityManager.getCapability(SystemCapabilityType.PHONE_CALL, null, false);
-		assertNotNull(phoneCapabilityUpdated);
-		assertFalse(phoneCapabilityUpdated.getDialNumberEnabled());
-		assertEquals(phoneCapability, phoneCapabilityUpdated);
-	}
+        SetDisplayLayoutResponse newLayout = new SetDisplayLayoutResponse();
+        newLayout.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES);
+        newLayout.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST);
+        newLayout.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
+        newLayout.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES);
+        newLayout.setSuccess(true);
+        newLayout.setResultCode(Result.SUCCESS);
+
+        dlRpcListener.onReceived(newLayout);
 
-	@Test
-	public void testOnSetDisplayLayout() {
-		InternalSDLInterface iSDL = new InternalSDLInterface();
-		SystemCapabilityManager systemCapabilityManager = createSampleManager(iSDL);
-		OnRPCListener dlRpcListener = iSDL.rpcListeners.get(FunctionID.SET_DISPLAY_LAYOUT.getId()).get(0);
-		assertNotNull(dlRpcListener);
 
-		SetDisplayLayoutResponse newLayout = new SetDisplayLayoutResponse();
-		newLayout.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES);
-		newLayout.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST);
-		newLayout.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
-		newLayout.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES);
-		newLayout.setSuccess(true);
-		newLayout.setResultCode(Result.SUCCESS);
-
-		dlRpcListener.onReceived(newLayout);
-
-
-		DisplayCapabilities appliedCaps = (DisplayCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false);
-		assertNotNull(appliedCaps);
-		assertTrue(Validator.validateDisplayCapabilities(newLayout.getDisplayCapabilities(), appliedCaps));
-
-		List<DisplayCapability> convertedCaps = (List<DisplayCapability>)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false);
-		assertNotNull(convertedCaps);
-		List<DisplayCapability> testCaps = createDisplayCapabilityList(newLayout.getDisplayCapabilities(), newLayout.getButtonCapabilities(), newLayout.getSoftButtonCapabilities());
-		assertTrue(Validator.validateDisplayCapabilityList(convertedCaps, testCaps));
-
-		WindowCapability matchWindowCapability = testCaps.get(0).getWindowCapabilities().get(0);
-		WindowCapability testWindowCapability = systemCapabilityManager.getDefaultMainWindowCapability();
-		assertTrue(Validator.validateWindowCapability(matchWindowCapability, testWindowCapability));
-		assertNull(systemCapabilityManager.getWindowCapability(42));
-	}
-
-	@Test
-	public void testManagerBeforeDisplayUpdate() {
-		InternalSDLInterface iSDL = new InternalSDLInterface();
-		SystemCapabilityManager systemCapabilityManager = new SystemCapabilityManager(iSDL);
-		assertNull(systemCapabilityManager.getDefaultMainWindowCapability());
-		assertNull(systemCapabilityManager.getWindowCapability(PredefinedWindows.DEFAULT_WINDOW.getValue()));
-		assertNull(systemCapabilityManager.getWindowCapability(PredefinedWindows.PRIMARY_WIDGET.getValue()));
-	}
-
-	private class InternalSDLInterface implements ISdl{
-		private final Object RPC_LISTENER_LOCK = new Object();
-		SparseArray<CopyOnWriteArrayList<OnRPCListener>> rpcListeners = new SparseArray<>();
-
-		@Override
-		public void start(){}
-
-		@Override
-		public void stop() {}
-
-		@Override
-		public boolean isConnected() {return false;	}
-
-		@Override
-		public void addServiceListener(SessionType serviceType, ISdlServiceListener sdlServiceListener) {}
-
-		@Override
-		public void removeServiceListener(SessionType serviceType, ISdlServiceListener sdlServiceListener) {}
-
-		@Override
-		public void startVideoService(VideoStreamingParameters parameters, boolean encrypted) {	}
-
-		@Override
-		public void sendRPC(RPCMessage message) {}
-
-		@Override
-		public void sendRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) {
-
-		}
-
-		@Override
-		public void sendSequentialRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) {
-
-		}
-
-		@Override
-		public void addOnRPCNotificationListener(FunctionID notificationId, OnRPCNotificationListener listener) {
-
-		}
-
-		@Override
-		public boolean removeOnRPCNotificationListener(FunctionID notificationId, OnRPCNotificationListener listener) {return false;}
-
-		@Override
-		public void addOnRPCRequestListener(FunctionID functionID, OnRPCRequestListener listener) {
-
-		}
-
-		@Override
-		public boolean removeOnRPCRequestListener(FunctionID functionID, OnRPCRequestListener listener) {
-			return false;
-		}
-		@Override
-		public void addOnRPCListener(FunctionID messageId, OnRPCListener listener){
-			synchronized(RPC_LISTENER_LOCK){
-				if(messageId != null && listener != null){
-					if(rpcListeners.indexOfKey(messageId.getId()) < 0 ){
-						rpcListeners.put(messageId.getId(),new CopyOnWriteArrayList<OnRPCListener>());
-					}
-					rpcListeners.get(messageId.getId()).add(listener);
-				}
-			}
-		}
-		@Override
-		public boolean removeOnRPCListener(FunctionID messageId, OnRPCListener listener){
-			synchronized(RPC_LISTENER_LOCK){
-				if(rpcListeners!= null
-						&& messageId != null
-						&& listener != null
-						&& rpcListeners.indexOfKey(messageId.getId()) >= 0){
-					return rpcListeners.get(messageId.getId()).remove(listener);
-				}
-			}
-			return false;
-		}
-
-
-		@Override
-		public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() {
-			return null;
-		}
-
-		@Override
-		public SdlMsgVersion getSdlMsgVersion() {
-			return null;
-		}
-
-		@Override
-		public Version getProtocolVersion() {
-			return new Version(1,0,0);
-		}
-
-		@Override
-		public boolean isTransportForServiceAvailable(SessionType serviceType) {
-			return false;
-		}
-
-		@Override
-		public void startAudioService(boolean encrypted){}
-
-		@Override
-		public void startRPCEncryption() {}
-
-		@Override
-		public Taskmaster getTaskmaster() {
-			return null;
-		}
-
-		@Override
-		public SystemCapabilityManager getSystemCapabilityManager() {
-			return null;
-		}
-	}
+        DisplayCapabilities appliedCaps = (DisplayCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false);
+        assertNotNull(appliedCaps);
+        assertTrue(Validator.validateDisplayCapabilities(newLayout.getDisplayCapabilities(), appliedCaps));
+
+        List<DisplayCapability> convertedCaps = (List<DisplayCapability>) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false);
+        assertNotNull(convertedCaps);
+        List<DisplayCapability> testCaps = createDisplayCapabilityList(newLayout.getDisplayCapabilities(), newLayout.getButtonCapabilities(), newLayout.getSoftButtonCapabilities());
+        assertTrue(Validator.validateDisplayCapabilityList(convertedCaps, testCaps));
+
+        WindowCapability matchWindowCapability = testCaps.get(0).getWindowCapabilities().get(0);
+        WindowCapability testWindowCapability = systemCapabilityManager.getDefaultMainWindowCapability();
+        assertTrue(Validator.validateWindowCapability(matchWindowCapability, testWindowCapability));
+        assertNull(systemCapabilityManager.getWindowCapability(42));
+    }
+
+    @Test
+    public void testManagerBeforeDisplayUpdate() {
+        InternalSDLInterface iSDL = new InternalSDLInterface();
+        SystemCapabilityManager systemCapabilityManager = new SystemCapabilityManager(iSDL);
+        assertNull(systemCapabilityManager.getDefaultMainWindowCapability());
+        assertNull(systemCapabilityManager.getWindowCapability(PredefinedWindows.DEFAULT_WINDOW.getValue()));
+        assertNull(systemCapabilityManager.getWindowCapability(PredefinedWindows.PRIMARY_WIDGET.getValue()));
+    }
+
+    private class InternalSDLInterface implements ISdl {
+        private final Object RPC_LISTENER_LOCK = new Object();
+        SparseArray<CopyOnWriteArrayList<OnRPCListener>> rpcListeners = new SparseArray<>();
+
+        @Override
+        public void start() {
+        }
+
+        @Override
+        public void stop() {
+        }
+
+        @Override
+        public boolean isConnected() {
+            return false;
+        }
+
+        @Override
+        public void addServiceListener(SessionType serviceType, ISdlServiceListener sdlServiceListener) {
+        }
+
+        @Override
+        public void removeServiceListener(SessionType serviceType, ISdlServiceListener sdlServiceListener) {
+        }
+
+        @Override
+        public void startVideoService(VideoStreamingParameters parameters, boolean encrypted) {
+        }
+
+        @Override
+        public void sendRPC(RPCMessage message) {
+        }
+
+        @Override
+        public void sendRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) {
+
+        }
+
+        @Override
+        public void sendSequentialRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) {
+
+        }
+
+        @Override
+        public void addOnRPCNotificationListener(FunctionID notificationId, OnRPCNotificationListener listener) {
+
+        }
+
+        @Override
+        public boolean removeOnRPCNotificationListener(FunctionID notificationId, OnRPCNotificationListener listener) {
+            return false;
+        }
+
+        @Override
+        public void addOnRPCRequestListener(FunctionID functionID, OnRPCRequestListener listener) {
+
+        }
+
+        @Override
+        public boolean removeOnRPCRequestListener(FunctionID functionID, OnRPCRequestListener listener) {
+            return false;
+        }
+
+        @Override
+        public void addOnRPCListener(FunctionID messageId, OnRPCListener listener) {
+            synchronized (RPC_LISTENER_LOCK) {
+                if (messageId != null && listener != null) {
+                    if (rpcListeners.indexOfKey(messageId.getId()) < 0) {
+                        rpcListeners.put(messageId.getId(), new CopyOnWriteArrayList<OnRPCListener>());
+                    }
+                    rpcListeners.get(messageId.getId()).add(listener);
+                }
+            }
+        }
+
+        @Override
+        public boolean removeOnRPCListener(FunctionID messageId, OnRPCListener listener) {
+            synchronized (RPC_LISTENER_LOCK) {
+                if (rpcListeners != null
+                        && messageId != null
+                        && listener != null
+                        && rpcListeners.indexOfKey(messageId.getId()) >= 0) {
+                    return rpcListeners.get(messageId.getId()).remove(listener);
+                }
+            }
+            return false;
+        }
+
+
+        @Override
+        public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() {
+            return null;
+        }
+
+        @Override
+        public SdlMsgVersion getSdlMsgVersion() {
+            return null;
+        }
+
+        @Override
+        public Version getProtocolVersion() {
+            return new Version(1, 0, 0);
+        }
+
+        @Override
+        public boolean isTransportForServiceAvailable(SessionType serviceType) {
+            return false;
+        }
+
+        @Override
+        public void startAudioService(boolean encrypted) {
+        }
+
+        @Override
+        public void startRPCEncryption() {
+        }
+
+        @Override
+        public Taskmaster getTaskmaster() {
+            return null;
+        }
+
+        @Override
+        public SystemCapabilityManager getSystemCapabilityManager() {
+            return null;
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
index 500680e02..bafecb62c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
@@ -14,34 +14,34 @@ import static junit.framework.TestCase.assertTrue;
 /**
  * This is a unit test class for the SmartDeviceLink library manager class :
  * {@link com.smartdevicelink.managers.lockscreen.LockScreenConfig}
- *
+ * <p>
  * We currently do not need to test null values, as each currently is a primitive
  */
 @RunWith(AndroidJUnit4.class)
 public class LockScreenConfigTests {
 
-	private LockScreenConfig lockScreenConfig;
-
-	@Before
-	public void setUp() throws Exception {
-		// set info for all the setters
-		lockScreenConfig = new LockScreenConfig();
-		lockScreenConfig.setCustomView(TestValues.GENERAL_INT);
-		lockScreenConfig.setAppIcon(TestValues.GENERAL_INT);
-		lockScreenConfig.setBackgroundColor(TestValues.GENERAL_INT);
-		lockScreenConfig.showDeviceLogo(true);
-		lockScreenConfig.setDisplayMode(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED);
-	}
-
-	@Test
-	public void testLockScreenConfig() {
-
-		// get the info and make sure its correct
-		assertEquals(TestValues.GENERAL_INT, lockScreenConfig.getCustomView());
-		assertEquals(TestValues.GENERAL_INT, lockScreenConfig.getAppIcon());
-		assertEquals(TestValues.GENERAL_INT, lockScreenConfig.getBackgroundColor());
-		assertTrue(lockScreenConfig.isDeviceLogoEnabled());
-		assertEquals(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED, lockScreenConfig.getDisplayMode());
-	}
+    private LockScreenConfig lockScreenConfig;
+
+    @Before
+    public void setUp() throws Exception {
+        // set info for all the setters
+        lockScreenConfig = new LockScreenConfig();
+        lockScreenConfig.setCustomView(TestValues.GENERAL_INT);
+        lockScreenConfig.setAppIcon(TestValues.GENERAL_INT);
+        lockScreenConfig.setBackgroundColor(TestValues.GENERAL_INT);
+        lockScreenConfig.showDeviceLogo(true);
+        lockScreenConfig.setDisplayMode(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED);
+    }
+
+    @Test
+    public void testLockScreenConfig() {
+
+        // get the info and make sure its correct
+        assertEquals(TestValues.GENERAL_INT, lockScreenConfig.getCustomView());
+        assertEquals(TestValues.GENERAL_INT, lockScreenConfig.getAppIcon());
+        assertEquals(TestValues.GENERAL_INT, lockScreenConfig.getBackgroundColor());
+        assertTrue(lockScreenConfig.isDeviceLogoEnabled());
+        assertEquals(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED, lockScreenConfig.getDisplayMode());
+    }
 
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManagerTests.java
index 727c043cc..86d755161 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManagerTests.java
@@ -85,7 +85,7 @@ public class LockScreenDeviceIconManagerTests {
         lockScreenDeviceIconManager.retrieveIcon(ICON_URL, listener);
         verify(listener, times(1)).onImageRetrieved((Bitmap) any());
     }
-    
+
     private String daysToMillisecondsAsString(int days) {
         long milliSeconds = (long) days * 24 * 60 * 60 * 1000;
         long previousDay = System.currentTimeMillis() - milliSeconds;
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
index dd606a2c0..d18908dbe 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
@@ -4,8 +4,8 @@ import android.content.Context;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.managers.ISdl;
+import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.rpc.OnDriverDistraction;
 import com.smartdevicelink.proxy.rpc.enums.DriverDistractionState;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
@@ -36,138 +36,138 @@ import static org.mockito.Mockito.mock;
 @RunWith(AndroidJUnit4.class)
 public class LockScreenManagerTests {
 
-	private LockScreenManager lockScreenManager;
-	private OnRPCNotificationListener onDDListener;
-
-	@Before
-	public void setUp() throws Exception{
-
-		ISdl internalInterface = mock(ISdl.class);
-
-		Answer<Void> onDDStatusAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				onDDListener = (OnRPCNotificationListener) args[1];
-				return null;
-			}
-		};
-		doAnswer(onDDStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_DRIVER_DISTRACTION), any(OnRPCNotificationListener.class));
-
-		Context context =  getInstrumentation().getContext();
-		// create config
-		LockScreenConfig lockScreenConfig = new LockScreenConfig();
-		lockScreenConfig.setCustomView(TestValues.GENERAL_INT);
-		lockScreenConfig.setAppIcon(TestValues.GENERAL_INT);
-		lockScreenConfig.setBackgroundColor(TestValues.GENERAL_INT);
-		lockScreenConfig.showDeviceLogo(true);
-		lockScreenConfig.setDisplayMode(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED);
-
-		lockScreenManager = new LockScreenManager(lockScreenConfig, context, internalInterface);
-	}
-
-	@Test
-	public void testVariables() {
-		assertEquals(TestValues.GENERAL_INT, lockScreenManager.customView);
-		assertEquals(TestValues.GENERAL_INT, lockScreenManager.lockScreenIcon);
-		assertEquals(TestValues.GENERAL_INT, lockScreenManager.lockScreenColor);
-		assertTrue(lockScreenManager.deviceLogoEnabled);
-		assertTrue(lockScreenManager.lockScreenEnabled);
-		assertNull(lockScreenManager.deviceLogo);
-		assertEquals(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED, lockScreenManager.displayMode);
-	}
-
-	@Test
-	public void testGetLockScreenStatusHmiNoneDDOff(){
-		lockScreenManager.driverDistStatus = false;
-		lockScreenManager.hmiLevel = HMILevel.HMI_NONE;
-		assertEquals(LockScreenStatus.OFF, lockScreenManager.getLockScreenStatus());
-	}
-
-	@Test
-	public void testGetLockScreenStatusHmiBackgroundDDOff(){
-		lockScreenManager.driverDistStatus = false;
-		lockScreenManager.hmiLevel = HMILevel.HMI_BACKGROUND;
-		assertEquals(LockScreenStatus.OFF, lockScreenManager.getLockScreenStatus());
-	}
-
-	@Test
-	public void testGetLockScreenStatusHmiNoneDDOn(){
-		lockScreenManager.driverDistStatus = true;
-		lockScreenManager.hmiLevel = HMILevel.HMI_BACKGROUND;
-		assertEquals(LockScreenStatus.REQUIRED, lockScreenManager.getLockScreenStatus());
-	}
-
-	@Test
-	public void testGetLockScreenStatusHmiFullDDOff(){
-		lockScreenManager.driverDistStatus = false;
-		lockScreenManager.hmiLevel = HMILevel.HMI_FULL;
-		assertEquals(LockScreenStatus.OPTIONAL, lockScreenManager.getLockScreenStatus());
-	}
-
-	@Test
-	public void testGetLockScreenStatusHmiFullDDOn(){
-		lockScreenManager.driverDistStatus = true;
-		lockScreenManager.hmiLevel = HMILevel.HMI_FULL;
-		assertEquals(LockScreenStatus.REQUIRED, lockScreenManager.getLockScreenStatus());
-	}
-
-	@Test
-	public void testGetLockScreenStatusHmiLimitedDDOff(){
-		lockScreenManager.driverDistStatus = false;
-		lockScreenManager.hmiLevel = HMILevel.HMI_LIMITED;
-		assertEquals(LockScreenStatus.OPTIONAL, lockScreenManager.getLockScreenStatus());
-	}
-
-	@Test
-	public void testGetLockScreenStatusHmiLimitedDDOn(){
-		lockScreenManager.driverDistStatus = true;
-		lockScreenManager.hmiLevel = HMILevel.HMI_LIMITED;
-		assertEquals(LockScreenStatus.REQUIRED, lockScreenManager.getLockScreenStatus());
-	}
-
-	@Test
-	public void testLockScreenDismissibleWithEnableTrueAndDismissibilityTrue(){
-		lockScreenManager.enableDismissGesture = true;
-		OnDriverDistraction onDriverDistraction = new OnDriverDistraction();
-		onDriverDistraction.setLockscreenDismissibility(true);
-		onDriverDistraction.setState(DriverDistractionState.DD_ON);
-		onDDListener.onNotified(onDriverDistraction);
-		assertTrue(lockScreenManager.enableDismissGesture);
-		assertTrue(lockScreenManager.mIsLockscreenDismissible);
-	}
-
-	@Test
-	public void testLockScreenDismissibleWithEnableFalseAndDismissibilityFalse(){
-		lockScreenManager.enableDismissGesture = false;
-		OnDriverDistraction onDriverDistraction = new OnDriverDistraction();
-		onDriverDistraction.setLockscreenDismissibility(true);
-		onDriverDistraction.setState(DriverDistractionState.DD_ON);
-		onDDListener.onNotified(onDriverDistraction);
-		assertFalse(lockScreenManager.enableDismissGesture);
-		assertFalse(lockScreenManager.mIsLockscreenDismissible);
-	}
-
-	@Test
-	public void testLockScreenDismissibleWithEnableTrueAndDismissibilityFalse(){
-		lockScreenManager.enableDismissGesture = true;
-		OnDriverDistraction onDriverDistraction = new OnDriverDistraction();
-		onDriverDistraction.setLockscreenDismissibility(false);
-		onDriverDistraction.setState(DriverDistractionState.DD_ON);
-		onDDListener.onNotified(onDriverDistraction);
-		assertTrue(lockScreenManager.enableDismissGesture);
-		assertFalse(lockScreenManager.mIsLockscreenDismissible);
-	}
-
-	@Test
-	public void testLockScreenDismissibleWithEnableFalseAndDismissibilityTrue(){
-		lockScreenManager.enableDismissGesture = false;
-		OnDriverDistraction onDriverDistraction = new OnDriverDistraction();
-		onDriverDistraction.setLockscreenDismissibility(true);
-		onDriverDistraction.setState(DriverDistractionState.DD_ON);
-		onDDListener.onNotified(onDriverDistraction);
-		assertFalse(lockScreenManager.enableDismissGesture);
-		assertFalse(lockScreenManager.mIsLockscreenDismissible);
-	}
+    private LockScreenManager lockScreenManager;
+    private OnRPCNotificationListener onDDListener;
+
+    @Before
+    public void setUp() throws Exception {
+
+        ISdl internalInterface = mock(ISdl.class);
+
+        Answer<Void> onDDStatusAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                onDDListener = (OnRPCNotificationListener) args[1];
+                return null;
+            }
+        };
+        doAnswer(onDDStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_DRIVER_DISTRACTION), any(OnRPCNotificationListener.class));
+
+        Context context = getInstrumentation().getContext();
+        // create config
+        LockScreenConfig lockScreenConfig = new LockScreenConfig();
+        lockScreenConfig.setCustomView(TestValues.GENERAL_INT);
+        lockScreenConfig.setAppIcon(TestValues.GENERAL_INT);
+        lockScreenConfig.setBackgroundColor(TestValues.GENERAL_INT);
+        lockScreenConfig.showDeviceLogo(true);
+        lockScreenConfig.setDisplayMode(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED);
+
+        lockScreenManager = new LockScreenManager(lockScreenConfig, context, internalInterface);
+    }
+
+    @Test
+    public void testVariables() {
+        assertEquals(TestValues.GENERAL_INT, lockScreenManager.customView);
+        assertEquals(TestValues.GENERAL_INT, lockScreenManager.lockScreenIcon);
+        assertEquals(TestValues.GENERAL_INT, lockScreenManager.lockScreenColor);
+        assertTrue(lockScreenManager.deviceLogoEnabled);
+        assertTrue(lockScreenManager.lockScreenEnabled);
+        assertNull(lockScreenManager.deviceLogo);
+        assertEquals(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED, lockScreenManager.displayMode);
+    }
+
+    @Test
+    public void testGetLockScreenStatusHmiNoneDDOff() {
+        lockScreenManager.driverDistStatus = false;
+        lockScreenManager.hmiLevel = HMILevel.HMI_NONE;
+        assertEquals(LockScreenStatus.OFF, lockScreenManager.getLockScreenStatus());
+    }
+
+    @Test
+    public void testGetLockScreenStatusHmiBackgroundDDOff() {
+        lockScreenManager.driverDistStatus = false;
+        lockScreenManager.hmiLevel = HMILevel.HMI_BACKGROUND;
+        assertEquals(LockScreenStatus.OFF, lockScreenManager.getLockScreenStatus());
+    }
+
+    @Test
+    public void testGetLockScreenStatusHmiNoneDDOn() {
+        lockScreenManager.driverDistStatus = true;
+        lockScreenManager.hmiLevel = HMILevel.HMI_BACKGROUND;
+        assertEquals(LockScreenStatus.REQUIRED, lockScreenManager.getLockScreenStatus());
+    }
+
+    @Test
+    public void testGetLockScreenStatusHmiFullDDOff() {
+        lockScreenManager.driverDistStatus = false;
+        lockScreenManager.hmiLevel = HMILevel.HMI_FULL;
+        assertEquals(LockScreenStatus.OPTIONAL, lockScreenManager.getLockScreenStatus());
+    }
+
+    @Test
+    public void testGetLockScreenStatusHmiFullDDOn() {
+        lockScreenManager.driverDistStatus = true;
+        lockScreenManager.hmiLevel = HMILevel.HMI_FULL;
+        assertEquals(LockScreenStatus.REQUIRED, lockScreenManager.getLockScreenStatus());
+    }
+
+    @Test
+    public void testGetLockScreenStatusHmiLimitedDDOff() {
+        lockScreenManager.driverDistStatus = false;
+        lockScreenManager.hmiLevel = HMILevel.HMI_LIMITED;
+        assertEquals(LockScreenStatus.OPTIONAL, lockScreenManager.getLockScreenStatus());
+    }
+
+    @Test
+    public void testGetLockScreenStatusHmiLimitedDDOn() {
+        lockScreenManager.driverDistStatus = true;
+        lockScreenManager.hmiLevel = HMILevel.HMI_LIMITED;
+        assertEquals(LockScreenStatus.REQUIRED, lockScreenManager.getLockScreenStatus());
+    }
+
+    @Test
+    public void testLockScreenDismissibleWithEnableTrueAndDismissibilityTrue() {
+        lockScreenManager.enableDismissGesture = true;
+        OnDriverDistraction onDriverDistraction = new OnDriverDistraction();
+        onDriverDistraction.setLockscreenDismissibility(true);
+        onDriverDistraction.setState(DriverDistractionState.DD_ON);
+        onDDListener.onNotified(onDriverDistraction);
+        assertTrue(lockScreenManager.enableDismissGesture);
+        assertTrue(lockScreenManager.mIsLockscreenDismissible);
+    }
+
+    @Test
+    public void testLockScreenDismissibleWithEnableFalseAndDismissibilityFalse() {
+        lockScreenManager.enableDismissGesture = false;
+        OnDriverDistraction onDriverDistraction = new OnDriverDistraction();
+        onDriverDistraction.setLockscreenDismissibility(true);
+        onDriverDistraction.setState(DriverDistractionState.DD_ON);
+        onDDListener.onNotified(onDriverDistraction);
+        assertFalse(lockScreenManager.enableDismissGesture);
+        assertFalse(lockScreenManager.mIsLockscreenDismissible);
+    }
+
+    @Test
+    public void testLockScreenDismissibleWithEnableTrueAndDismissibilityFalse() {
+        lockScreenManager.enableDismissGesture = true;
+        OnDriverDistraction onDriverDistraction = new OnDriverDistraction();
+        onDriverDistraction.setLockscreenDismissibility(false);
+        onDriverDistraction.setState(DriverDistractionState.DD_ON);
+        onDDListener.onNotified(onDriverDistraction);
+        assertTrue(lockScreenManager.enableDismissGesture);
+        assertFalse(lockScreenManager.mIsLockscreenDismissible);
+    }
+
+    @Test
+    public void testLockScreenDismissibleWithEnableFalseAndDismissibilityTrue() {
+        lockScreenManager.enableDismissGesture = false;
+        OnDriverDistraction onDriverDistraction = new OnDriverDistraction();
+        onDriverDistraction.setLockscreenDismissibility(true);
+        onDriverDistraction.setState(DriverDistractionState.DD_ON);
+        onDDListener.onNotified(onDriverDistraction);
+        assertFalse(lockScreenManager.enableDismissGesture);
+        assertFalse(lockScreenManager.mIsLockscreenDismissible);
+    }
 
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java
index 973625106..6649d2b7f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/permission/PermissionManagerTests.java
@@ -3,8 +3,8 @@ package com.smartdevicelink.managers.permission;
 import androidx.annotation.NonNull;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.managers.ISdl;
+import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.rpc.HMIPermissions;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.OnPermissionsChange;
@@ -114,13 +114,13 @@ public class PermissionManagerTests {
         permissionManager.addListener(permissionElements, PermissionManager.PERMISSION_GROUP_TYPE_ALL_ALLOWED, new OnPermissionChangeListener() {
             @Override
             public void onPermissionsChange(@NonNull Map<FunctionID, PermissionStatus> allowedPermissions, @NonNull int permissionGroupStatus) {
-            // Make sure is the actual result matches the expected one
-            assertEquals(PERMISSION_GROUP_STATUS_ALLOWED, permissionGroupStatus);
-            assertTrue(allowedPermissions.get(FunctionID.SHOW).getIsRPCAllowed());
-            assertTrue(allowedPermissions.get(FunctionID.GET_VEHICLE_DATA).getIsRPCAllowed());
-            assertTrue(allowedPermissions.get(FunctionID.GET_VEHICLE_DATA).getAllowedParameters().get("rpm"));
-            assertTrue(allowedPermissions.get(FunctionID.GET_VEHICLE_DATA).getAllowedParameters().get("airbagStatus"));
-            listenerCalledCounter++;
+                // Make sure is the actual result matches the expected one
+                assertEquals(PERMISSION_GROUP_STATUS_ALLOWED, permissionGroupStatus);
+                assertTrue(allowedPermissions.get(FunctionID.SHOW).getIsRPCAllowed());
+                assertTrue(allowedPermissions.get(FunctionID.GET_VEHICLE_DATA).getIsRPCAllowed());
+                assertTrue(allowedPermissions.get(FunctionID.GET_VEHICLE_DATA).getAllowedParameters().get("rpm"));
+                assertTrue(allowedPermissions.get(FunctionID.GET_VEHICLE_DATA).getAllowedParameters().get("airbagStatus"));
+                listenerCalledCounter++;
             }
         });
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
index 5e9203e99..627a900f6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/ScreenManagerTests.java
@@ -4,10 +4,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.livio.taskmaster.Taskmaster;
 import com.smartdevicelink.managers.BaseSubManager;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.screen.menu.DynamicMenuUpdatesMode;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.MetadataType;
 import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
@@ -32,144 +32,146 @@ import static org.mockito.Mockito.when;
  */
 @RunWith(AndroidJUnit4.class)
 public class ScreenManagerTests {
-	private ScreenManager screenManager;
-	private SdlArtwork testArtwork;
-
-	@Before
-	public void setUp() throws Exception {
-
-
-		ISdl internalInterface = mock(ISdl.class);
-		when(internalInterface.getTaskmaster()).thenReturn(new Taskmaster.Builder().build());
-		FileManager fileManager = mock(FileManager.class);
-		screenManager = new ScreenManager(internalInterface, fileManager);
-		screenManager.start(null);
-		testArtwork = new SdlArtwork("testFile", FileType.GRAPHIC_PNG, 1, false);
-	}
-
-	@Test
-	public void testInstantiation(){
-		assertNull(screenManager.getTextField1());
-		assertNull(screenManager.getTextField2());
-		assertNull(screenManager.getTextField3());
-		assertNull(screenManager.getTextField4());
-		assertNull(screenManager.getTitle());
-		assertNull(screenManager.getMediaTrackTextField());
-		assertNull(screenManager.getPrimaryGraphic());
-		assertNull(screenManager.getSecondaryGraphic());
-		assertEquals(screenManager.getTextAlignment(), TextAlignment.CENTERED);
-		assertNull(screenManager.getTextField1Type());
-		assertNull(screenManager.getTextField2Type());
-		assertNull(screenManager.getTextField3Type());
-		assertNull(screenManager.getTextField4Type());
-		assertNull(screenManager.getMenu());
-		assertNull(screenManager.getVoiceCommands());
-		assertTrue(screenManager.getSoftButtonObjects().isEmpty());
-		assertNull(screenManager.getSoftButtonObjectByName("test"));
-		assertNull(screenManager.getSoftButtonObjectById(1));
-		assertEquals(screenManager.getDynamicMenuUpdatesMode(), DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE);
-		assertEquals(screenManager.getState(), BaseSubManager.READY);
-		assertNull(screenManager.getMenuConfiguration());
-	}
-
-	@Test
-	public void testSetTextField() {
-		screenManager.setTextField1("It is");
-		screenManager.setTextField2("Wednesday");
-		screenManager.setTextField3("My");
-		screenManager.setTextField4("Dudes");
-		screenManager.setTitle("title");
-		assertEquals(screenManager.getTextField1(), "It is");
-		assertEquals(screenManager.getTextField2(), "Wednesday");
-		assertEquals(screenManager.getTextField3(), "My");
-		assertEquals(screenManager.getTextField4(), "Dudes");
-		assertEquals(screenManager.getTitle(), "title");
-	}
-
-	@Test
-	public void testMediaTrackTextFields() {
-		String songTitle = "Wild For The Night";
-		screenManager.setMediaTrackTextField(songTitle);
-		assertEquals(screenManager.getMediaTrackTextField(), songTitle);
-	}
-
-	@Test
-	public void testSetPrimaryGraphic() {
-		screenManager.setPrimaryGraphic(testArtwork);
-		assertEquals(screenManager.getPrimaryGraphic(), testArtwork);
-	}
-	@Test
-	public void testSetPrimaryGraphicWithBlankImage() {
-		screenManager.setPrimaryGraphic(null);
-		assertNull(screenManager.getPrimaryGraphic());
-	}
-	@Test
-	public void testSetSecondaryGraphic() {
-		screenManager.setSecondaryGraphic(testArtwork);
-		assertEquals(screenManager.getSecondaryGraphic(), testArtwork);
-	}
-
-	@Test
-	public void testSetSecondaryGraphicWithBlankImage() {
-		screenManager.setSecondaryGraphic(null);
-		assertNull(screenManager.getSecondaryGraphic());
-	}
-
-	@Test
-	public void testAlignment() {
-		screenManager.setTextAlignment(TextAlignment.LEFT_ALIGNED);
-		assertEquals(screenManager.getTextAlignment(), TextAlignment.LEFT_ALIGNED);
-	}
-
-	@Test
-	public void testSetTextFieldTypes() {
-		screenManager.setTextField1Type(MetadataType.MEDIA_TITLE);
-		screenManager.setTextField2Type(MetadataType.MEDIA_ALBUM);
-		screenManager.setTextField3Type(MetadataType.MEDIA_ARTIST);
-		screenManager.setTextField4Type(MetadataType.MEDIA_GENRE);
-		assertEquals(screenManager.getTextField1Type(), MetadataType.MEDIA_TITLE);
-		assertEquals(screenManager.getTextField2Type(), MetadataType.MEDIA_ALBUM);
-		assertEquals(screenManager.getTextField3Type(), MetadataType.MEDIA_ARTIST);
-		assertEquals(screenManager.getTextField4Type(), MetadataType.MEDIA_GENRE);
-	}
-
-	@Test
-	public void testSetMenuManagerFields(){
-		screenManager.setDynamicMenuUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
-		screenManager.setMenu(TestValues.GENERAL_MENUCELL_LIST);
-		screenManager.setMenuConfiguration(TestValues.GENERAL_MENU_CONFIGURATION);
-
-		assertEquals(screenManager.getMenu(), TestValues.GENERAL_MENUCELL_LIST);
-		assertEquals(screenManager.getDynamicMenuUpdatesMode(), DynamicMenuUpdatesMode.FORCE_ON);
-		// Should not set because of improper RAI response and improper HMI states
-		assertNull(screenManager.getMenuConfiguration());
-	}
-
-	@Test
-	public void testSetVoiceCommands(){
-		screenManager.setVoiceCommands(TestValues.GENERAL_VOICE_COMMAND_LIST);
-		assertEquals(screenManager.getVoiceCommands(), TestValues.GENERAL_VOICE_COMMAND_LIST);
-	}
-
-	@Test
-	public void testSetSoftButtonObjects(){
-		// Create softButtonObject1
-		SoftButtonState softButtonState1 = new SoftButtonState("object1-state1", "it is", testArtwork);
-		SoftButtonState softButtonState2 = new SoftButtonState("object1-state2", "Wed", testArtwork);
-		SoftButtonObject softButtonObject1 = new SoftButtonObject("object1", Arrays.asList(softButtonState1, softButtonState2), softButtonState1.getName(),null);
-		softButtonObject1.setButtonId(100);
-
-		// Create softButtonObject2
-		SoftButtonState softButtonState3 = new SoftButtonState("object2-state1", "my", testArtwork);
-		SoftButtonState softButtonState4 = new SoftButtonState("object2-state2", "dudes!", null);
-		SoftButtonObject softButtonObject2 = new SoftButtonObject("object2", Arrays.asList(softButtonState3, softButtonState4), softButtonState3.getName(), null);
-		softButtonObject2.setButtonId(200);
-
-		List<SoftButtonObject> softButtonObjects = Arrays.asList(softButtonObject1, softButtonObject2);
-		screenManager.setSoftButtonObjects(Arrays.asList(softButtonObject1, softButtonObject2));
-		assertEquals(screenManager.getSoftButtonObjects(), softButtonObjects);
-		assertEquals(screenManager.getSoftButtonObjectByName("object2"), softButtonObject2);
-		assertEquals(screenManager.getSoftButtonObjectById(200), softButtonObject2);
-	}
+    private ScreenManager screenManager;
+    private SdlArtwork testArtwork;
+
+    @Before
+    public void setUp() throws Exception {
+
+
+        ISdl internalInterface = mock(ISdl.class);
+        when(internalInterface.getTaskmaster()).thenReturn(new Taskmaster.Builder().build());
+        FileManager fileManager = mock(FileManager.class);
+        screenManager = new ScreenManager(internalInterface, fileManager);
+        screenManager.start(null);
+        testArtwork = new SdlArtwork("testFile", FileType.GRAPHIC_PNG, 1, false);
+    }
+
+    @Test
+    public void testInstantiation() {
+        assertNull(screenManager.getTextField1());
+        assertNull(screenManager.getTextField2());
+        assertNull(screenManager.getTextField3());
+        assertNull(screenManager.getTextField4());
+        assertNull(screenManager.getTitle());
+        assertNull(screenManager.getMediaTrackTextField());
+        assertNull(screenManager.getPrimaryGraphic());
+        assertNull(screenManager.getSecondaryGraphic());
+        assertEquals(screenManager.getTextAlignment(), TextAlignment.CENTERED);
+        assertNull(screenManager.getTextField1Type());
+        assertNull(screenManager.getTextField2Type());
+        assertNull(screenManager.getTextField3Type());
+        assertNull(screenManager.getTextField4Type());
+        assertNull(screenManager.getMenu());
+        assertNull(screenManager.getVoiceCommands());
+        assertTrue(screenManager.getSoftButtonObjects().isEmpty());
+        assertNull(screenManager.getSoftButtonObjectByName("test"));
+        assertNull(screenManager.getSoftButtonObjectById(1));
+        assertEquals(screenManager.getDynamicMenuUpdatesMode(), DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE);
+        assertEquals(screenManager.getState(), BaseSubManager.READY);
+        assertNull(screenManager.getMenuConfiguration());
+    }
+
+    @Test
+    public void testSetTextField() {
+        screenManager.setTextField1("It is");
+        screenManager.setTextField2("Wednesday");
+        screenManager.setTextField3("My");
+        screenManager.setTextField4("Dudes");
+        screenManager.setTitle("title");
+        assertEquals(screenManager.getTextField1(), "It is");
+        assertEquals(screenManager.getTextField2(), "Wednesday");
+        assertEquals(screenManager.getTextField3(), "My");
+        assertEquals(screenManager.getTextField4(), "Dudes");
+        assertEquals(screenManager.getTitle(), "title");
+    }
+
+    @Test
+    public void testMediaTrackTextFields() {
+        String songTitle = "Wild For The Night";
+        screenManager.setMediaTrackTextField(songTitle);
+        assertEquals(screenManager.getMediaTrackTextField(), songTitle);
+    }
+
+    @Test
+    public void testSetPrimaryGraphic() {
+        screenManager.setPrimaryGraphic(testArtwork);
+        assertEquals(screenManager.getPrimaryGraphic(), testArtwork);
+    }
+
+    @Test
+    public void testSetPrimaryGraphicWithBlankImage() {
+        screenManager.setPrimaryGraphic(null);
+        assertNull(screenManager.getPrimaryGraphic());
+    }
+
+    @Test
+    public void testSetSecondaryGraphic() {
+        screenManager.setSecondaryGraphic(testArtwork);
+        assertEquals(screenManager.getSecondaryGraphic(), testArtwork);
+    }
+
+    @Test
+    public void testSetSecondaryGraphicWithBlankImage() {
+        screenManager.setSecondaryGraphic(null);
+        assertNull(screenManager.getSecondaryGraphic());
+    }
+
+    @Test
+    public void testAlignment() {
+        screenManager.setTextAlignment(TextAlignment.LEFT_ALIGNED);
+        assertEquals(screenManager.getTextAlignment(), TextAlignment.LEFT_ALIGNED);
+    }
+
+    @Test
+    public void testSetTextFieldTypes() {
+        screenManager.setTextField1Type(MetadataType.MEDIA_TITLE);
+        screenManager.setTextField2Type(MetadataType.MEDIA_ALBUM);
+        screenManager.setTextField3Type(MetadataType.MEDIA_ARTIST);
+        screenManager.setTextField4Type(MetadataType.MEDIA_GENRE);
+        assertEquals(screenManager.getTextField1Type(), MetadataType.MEDIA_TITLE);
+        assertEquals(screenManager.getTextField2Type(), MetadataType.MEDIA_ALBUM);
+        assertEquals(screenManager.getTextField3Type(), MetadataType.MEDIA_ARTIST);
+        assertEquals(screenManager.getTextField4Type(), MetadataType.MEDIA_GENRE);
+    }
+
+    @Test
+    public void testSetMenuManagerFields() {
+        screenManager.setDynamicMenuUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
+        screenManager.setMenu(TestValues.GENERAL_MENUCELL_LIST);
+        screenManager.setMenuConfiguration(TestValues.GENERAL_MENU_CONFIGURATION);
+
+        assertEquals(screenManager.getMenu(), TestValues.GENERAL_MENUCELL_LIST);
+        assertEquals(screenManager.getDynamicMenuUpdatesMode(), DynamicMenuUpdatesMode.FORCE_ON);
+        // Should not set because of improper RAI response and improper HMI states
+        assertNull(screenManager.getMenuConfiguration());
+    }
+
+    @Test
+    public void testSetVoiceCommands() {
+        screenManager.setVoiceCommands(TestValues.GENERAL_VOICE_COMMAND_LIST);
+        assertEquals(screenManager.getVoiceCommands(), TestValues.GENERAL_VOICE_COMMAND_LIST);
+    }
+
+    @Test
+    public void testSetSoftButtonObjects() {
+        // Create softButtonObject1
+        SoftButtonState softButtonState1 = new SoftButtonState("object1-state1", "it is", testArtwork);
+        SoftButtonState softButtonState2 = new SoftButtonState("object1-state2", "Wed", testArtwork);
+        SoftButtonObject softButtonObject1 = new SoftButtonObject("object1", Arrays.asList(softButtonState1, softButtonState2), softButtonState1.getName(), null);
+        softButtonObject1.setButtonId(100);
+
+        // Create softButtonObject2
+        SoftButtonState softButtonState3 = new SoftButtonState("object2-state1", "my", testArtwork);
+        SoftButtonState softButtonState4 = new SoftButtonState("object2-state2", "dudes!", null);
+        SoftButtonObject softButtonObject2 = new SoftButtonObject("object2", Arrays.asList(softButtonState3, softButtonState4), softButtonState3.getName(), null);
+        softButtonObject2.setButtonId(200);
+
+        List<SoftButtonObject> softButtonObjects = Arrays.asList(softButtonObject1, softButtonObject2);
+        screenManager.setSoftButtonObjects(Arrays.asList(softButtonObject1, softButtonObject2));
+        assertEquals(screenManager.getSoftButtonObjects(), softButtonObjects);
+        assertEquals(screenManager.getSoftButtonObjectByName("object2"), softButtonObject2);
+        assertEquals(screenManager.getSoftButtonObjectById(200), softButtonObject2);
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
index 713aae4fd..01635dd7d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
@@ -4,13 +4,13 @@ package com.smartdevicelink.managers.screen;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.livio.taskmaster.Taskmaster;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.MultipleFileCompletionListener;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
 import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.DisplayCapability;
 import com.smartdevicelink.proxy.rpc.Image;
 import com.smartdevicelink.proxy.rpc.OnButtonEvent;
@@ -202,7 +202,7 @@ public class SoftButtonManagerTests {
 
         // Check that everything got called as expected
         assertEquals("FileManager.uploadArtworks() did not get called correctly", 1, fileManagerUploadArtworksListenerCalledCounter);
-        assertEquals("InternalInterface.sendRPC() did not get called correctly",2, internalInterfaceSendRPCListenerCalledCounter);
+        assertEquals("InternalInterface.sendRPC() did not get called correctly", 2, internalInterfaceSendRPCListenerCalledCounter);
 
 
         // Test getSoftButtonObjects
@@ -231,7 +231,7 @@ public class SoftButtonManagerTests {
     }
 
     @Test
-    public void testSoftButtonState(){
+    public void testSoftButtonState() {
         // Test SoftButtonState.getName()
         String nameExpectedValue = "object1-state1";
         assertEquals("Returned state name doesn't match the expected value", nameExpectedValue, softButtonState1.getName());
@@ -254,7 +254,7 @@ public class SoftButtonManagerTests {
     }
 
     @Test
-    public void testSoftButtonObject(){
+    public void testSoftButtonObject() {
         // Test SoftButtonObject.getName()
         assertEquals("Returned object name doesn't match the expected value", "object1", softButtonObject1.getName());
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java
index e0fcc5d0a..dee5f50dd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SubscribeButtonManagerTest.java
@@ -3,9 +3,9 @@ package com.smartdevicelink.managers.screen;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.smartdevicelink.managers.BaseSubManager;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.OnButtonEvent;
 import com.smartdevicelink.proxy.rpc.OnButtonPress;
 import com.smartdevicelink.proxy.rpc.SubscribeButton;
@@ -40,12 +40,12 @@ public class SubscribeButtonManagerTest {
         public Void answer(InvocationOnMock invocation) {
             Object[] args = invocation.getArguments();
             RPCRequest message = (RPCRequest) args[0];
-            if(message instanceof SubscribeButton){
+            if (message instanceof SubscribeButton) {
                 SubscribeButtonResponse subscribeButtonResponse = new SubscribeButtonResponse();
                 subscribeButtonResponse.setSuccess(true);
-                message.getOnRPCResponseListener().onResponse(message.getCorrelationID(),subscribeButtonResponse);
+                message.getOnRPCResponseListener().onResponse(message.getCorrelationID(), subscribeButtonResponse);
             }
-            if(message instanceof UnsubscribeButton) {
+            if (message instanceof UnsubscribeButton) {
                 UnsubscribeButtonResponse unsubscribeButtonResponse = new UnsubscribeButtonResponse();
                 unsubscribeButtonResponse.setSuccess(true);
                 message.getOnRPCResponseListener().onResponse(message.getCorrelationID(), unsubscribeButtonResponse);
@@ -60,7 +60,7 @@ public class SubscribeButtonManagerTest {
         public Void answer(InvocationOnMock invocation) {
             Object[] args = invocation.getArguments();
             RPCRequest message = (RPCRequest) args[0];
-            if(message instanceof SubscribeButton){
+            if (message instanceof SubscribeButton) {
                 SubscribeButtonResponse subscribeButtonResponse = new SubscribeButtonResponse(false, Result.GENERIC_ERROR);
                 subscribeButtonResponse.setInfo("Fail");
                 message.getOnRPCResponseListener().onResponse(message.getCorrelationID(), subscribeButtonResponse);
@@ -109,7 +109,7 @@ public class SubscribeButtonManagerTest {
     }
 
     @Test
-    public void testInstantiation(){
+    public void testInstantiation() {
         assertNotNull(subscribeButtonManager.onButtonListeners);
         assertEquals(subscribeButtonManager.getState(), BaseSubManager.SETTING_UP);
     }
@@ -137,7 +137,7 @@ public class SubscribeButtonManagerTest {
     }
 
     @Test
-    public void testAddButtonListenerError(){
+    public void testAddButtonListenerError() {
         doAnswer(onSubscribeFail).when(internalInterface).sendRPC(any(RPCMessage.class));
         subscribeButtonManager.addButtonListener(ButtonName.VOLUME_UP, listener);
         assertFalse(subscribeButtonManager.onButtonListeners.containsKey(ButtonName.VOLUME_UP));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
index 58e5b8fda..9b948f808 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
@@ -8,13 +8,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.livio.taskmaster.Task;
 import com.livio.taskmaster.Taskmaster;
 import com.smartdevicelink.managers.BaseSubManager;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.managers.ManagerUtility;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
 import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.DisplayCapability;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.TemplateConfiguration;
@@ -59,324 +59,325 @@ import static org.mockito.Mockito.when;
 @RunWith(AndroidJUnit4.class)
 public class TextAndGraphicManagerTests {
 
-	// SETUP / HELPERS
-	private TextAndGraphicManager textAndGraphicManager;
-	private SdlArtwork testArtwork1, testArtwork2;
-	private TemplateConfiguration configuration1, configuration2;
-
-	@Before
-	public void setUp() throws Exception{
-		Context mTestContext = getInstrumentation().getContext();
-
-		// mock things
-		ISdl internalInterface = mock(ISdl.class);
-		FileManager fileManager = mock(FileManager.class);
-		SoftButtonManager softButtonManager = mock(SoftButtonManager.class);
-
-		testArtwork1 = new SdlArtwork();
-		testArtwork1.setName("testFile");
-		Uri uri = Uri.parse("android.resource://" + mTestContext.getPackageName() + "/drawable/ic_sdl");
-		testArtwork1.setUri(uri);
-		testArtwork1.setType(FileType.GRAPHIC_PNG);
-
-		testArtwork2 = new SdlArtwork();
-		testArtwork2.setName("testFile2");
-		Uri uri2 = Uri.parse("android.resource://" + mTestContext.getPackageName() + "/drawable/ic_sdl");
-		testArtwork2.setUri(uri2);
-		testArtwork2.setType(FileType.GRAPHIC_PNG);
-
-		configuration1 = new TemplateConfiguration(PredefinedLayout.GRAPHIC_WITH_TEXT.toString());
-		configuration2 = new TemplateConfiguration(PredefinedLayout.DOUBLE_GRAPHIC_WITH_SOFTBUTTONS.toString());
-
-		Taskmaster taskmaster = new Taskmaster.Builder().build();
-		taskmaster.start();
-		when(internalInterface.getTaskmaster()).thenReturn(taskmaster);
-
-		Answer<Void> onHMIStatusAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				OnRPCNotificationListener onHMIStatusListener = (OnRPCNotificationListener) args[1];
-				OnHMIStatus onHMIStatusFakeNotification = new OnHMIStatus();
-				onHMIStatusFakeNotification.setHmiLevel(HMILevel.HMI_FULL);
-				onHMIStatusListener.onNotified(onHMIStatusFakeNotification);
-				return null;
-			}
-		};
-		doAnswer(onHMIStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
-
-		Answer<Void> onSystemCapabilityAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				OnSystemCapabilityListener onSystemCapabilityListener = (OnSystemCapabilityListener) args[1];
-				WindowCapability windowCapability = getWindowCapability(4);
-				DisplayCapability displayCapability = new DisplayCapability();
-				displayCapability.setWindowCapabilities(Collections.singletonList(windowCapability));
-				List<DisplayCapability> capabilities = Collections.singletonList(displayCapability);
-				onSystemCapabilityListener.onCapabilityRetrieved(capabilities);
-				return null;
-			}
-		};
-		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
-		doAnswer(onSystemCapabilityAnswer).when(systemCapabilityManager).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
-		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
-
-		textAndGraphicManager = new TextAndGraphicManager(internalInterface, fileManager, softButtonManager);
-	}
-
-
-	private WindowCapability getWindowCapability(int numberOfMainFields){
-
-		TextField mainField1 = new TextField();
-		mainField1.setName(TextFieldName.mainField1);
-		TextField mainField2 = new TextField();
-		mainField2.setName(TextFieldName.mainField2);
-		TextField mainField3 = new TextField();
-		mainField3.setName(TextFieldName.mainField3);
-		TextField mainField4 = new TextField();
-		mainField4.setName(TextFieldName.mainField4);
-
-		List<TextField> textFieldList = new ArrayList<>();
-
-		textFieldList.add(mainField1);
-		textFieldList.add(mainField2);
-		textFieldList.add(mainField3);
-		textFieldList.add(mainField4);
-
-		List<TextField> returnList = new ArrayList<>();
-
-		if (numberOfMainFields > 0){
-			for (int i = 0; i < numberOfMainFields; i++) {
-				returnList.add(textFieldList.get(i));
-			}
-		}
-
-		WindowCapability windowCapability = new WindowCapability();
-		windowCapability.setTextFields(returnList);
-
-		return windowCapability;
-	}
-
-	/**
-	 * Used to simulate WindowCapability having no capabilities set
-	 * @return windowCapability that has no capabilities set
-	 */
-	private WindowCapability getNullVarWindowCapability() {
-
-		WindowCapability windowCapability = new WindowCapability();
-		return windowCapability;
-	}
-
-	@Test
-	public void testInstantiation(){
-		assertNull(textAndGraphicManager.getTextField1());
-		assertNull(textAndGraphicManager.getTextField2());
-		assertNull(textAndGraphicManager.getTextField3());
-		assertNull(textAndGraphicManager.getTextField4());
-		assertNull(textAndGraphicManager.getTitle());
-		assertNull(textAndGraphicManager.getMediaTrackTextField());
-		assertNull(textAndGraphicManager.getPrimaryGraphic());
-		assertNull(textAndGraphicManager.getSecondaryGraphic());
-		assertEquals(textAndGraphicManager.getTextAlignment(), TextAlignment.CENTERED);
-		assertNull(textAndGraphicManager.getTextField1Type());
-		assertNull(textAndGraphicManager.getTextField2Type());
-		assertNull(textAndGraphicManager.getTextField3Type());
-		assertNull(textAndGraphicManager.getTextField4Type());
-		assertNotNull(textAndGraphicManager.currentScreenData);
-		assertNotNull(textAndGraphicManager.defaultMainWindowCapability);
-		assertEquals(textAndGraphicManager.currentHMILevel, HMILevel.HMI_FULL);
-		assertFalse(textAndGraphicManager.isDirty);
-		assertEquals(textAndGraphicManager.getState(), BaseSubManager.SETTING_UP);
-		assertNotNull(textAndGraphicManager.getBlankArtwork());
-	}
-
-	/**
-	 * Test getting number of lines available to be set based off of windowCapability
-	 */
-	@Test
-	public void testGetMainLines(){
-
-		// We want to test that the looping works. By default, it will return 4 if display cap is null
-		textAndGraphicManager.defaultMainWindowCapability = getNullVarWindowCapability();
-
-		// Null test
-		assertEquals(0, ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(textAndGraphicManager.defaultMainWindowCapability));
-
-		// The tests.java class has an example of this, but we must build it to do what
-		// we need it to do. Build display cap w/ 3 main fields and test that it returns 3
-		textAndGraphicManager.defaultMainWindowCapability = getWindowCapability(3);
-		assertEquals(ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(textAndGraphicManager.defaultMainWindowCapability), 3);
-	}
-
-	@Test
-	public void testMediaTrackTextField() {
-
-		String songTitle = "Wild For The Night";
-		textAndGraphicManager.setMediaTrackTextField(songTitle);
-		assertEquals(textAndGraphicManager.getMediaTrackTextField(), songTitle);
-	}
-
-	@Test
-	public void testTemplateTitle() {
-
-		String title = "template title";
-		textAndGraphicManager.setTitle(title);
-		assertEquals(textAndGraphicManager.getTitle(), title);
-	}
-
-	@Test
-	public void testAlignment() {
-
-		textAndGraphicManager.setTextAlignment(TextAlignment.LEFT_ALIGNED);
-		assertEquals(textAndGraphicManager.getTextAlignment(), TextAlignment.LEFT_ALIGNED);
-	}
-
-	// TEST IMAGES
-
-	@Test
-	public void testSetPrimaryGraphic() {
-		textAndGraphicManager.setPrimaryGraphic(testArtwork1);
-		assertEquals(textAndGraphicManager.getPrimaryGraphic(), testArtwork1);
-	}
-
-	@Test
-	public void testSetSecondaryGraphic() {
-		textAndGraphicManager.setSecondaryGraphic(testArtwork1);
-		assertEquals(textAndGraphicManager.getSecondaryGraphic(), testArtwork1);
-	}
-
-	// TEST DISPOSE
-
-	@Test
-	public void testDispose() {
-		textAndGraphicManager.dispose();
-
-		assertNull(textAndGraphicManager.getTextField1());
-		assertNull(textAndGraphicManager.getTextField2());
-		assertNull(textAndGraphicManager.getTextField3());
-		assertNull(textAndGraphicManager.getTextField4());
-		assertNull(textAndGraphicManager.getMediaTrackTextField());
-		assertNull(textAndGraphicManager.getPrimaryGraphic());
-		assertNull(textAndGraphicManager.getSecondaryGraphic());
-		assertNull(textAndGraphicManager.getTextAlignment());
-		assertNull(textAndGraphicManager.getTextField1Type());
-		assertNull(textAndGraphicManager.getTextField2Type());
-		assertNull(textAndGraphicManager.getTextField3Type());
-		assertNull(textAndGraphicManager.getTextField4Type());
-		assertNull(textAndGraphicManager.getTitle());
-		assertNotNull(textAndGraphicManager.getBlankArtwork());
-		assertNull(textAndGraphicManager.currentScreenData);
-		assertNull(textAndGraphicManager.defaultMainWindowCapability);
-		assertFalse(textAndGraphicManager.isDirty);
-		assertEquals(textAndGraphicManager.getState(), BaseSubManager.SHUTDOWN);
-	}
-
-	@Test
-	public void testOperationManagement() {
-		textAndGraphicManager.isDirty = true;
-		textAndGraphicManager.updateOperation = null;
-		textAndGraphicManager.update(null);
-		assertEquals(textAndGraphicManager.transactionQueue.getTasksAsList().size(), 1);
-
-		textAndGraphicManager.transactionQueue.clear();
-		textAndGraphicManager.updateOperation = null;
-
-		assertEquals(textAndGraphicManager.transactionQueue.getTasksAsList().size(), 0);
-
-		textAndGraphicManager.isDirty = true;
-		textAndGraphicManager.update(null);
-
-		assertEquals(textAndGraphicManager.transactionQueue.getTasksAsList().size(), 1);
-
-		assertTrue(textAndGraphicManager.transactionQueue.getTasksAsList().get(0).getState() == Task.READY);
-	}
-
-	@Test
-	public void testHasData() {
-		assertFalse(textAndGraphicManager.hasData());
-
-		textAndGraphicManager.setTextField1("HI");
-		assertTrue(textAndGraphicManager.hasData());
-
-		textAndGraphicManager.setTextField1(null);
-		textAndGraphicManager.setPrimaryGraphic(testArtwork1);
-		assertTrue(textAndGraphicManager.hasData());
-	}
-
-	@Test
-	public void resetFieldsToCurrentScreenDataTest() {
-		textAndGraphicManager.setTextField1("textField1");
-		textAndGraphicManager.setTextField2("textField2");
-		textAndGraphicManager.setTextField3("textField3");
-		textAndGraphicManager.setTextField4("textField4");
-		textAndGraphicManager.setTextField1Type(MetadataType.MEDIA_TITLE);
-		textAndGraphicManager.setTextField2Type(MetadataType.MEDIA_TITLE);
-		textAndGraphicManager.setTextField3Type(MetadataType.MEDIA_TITLE);
-		textAndGraphicManager.setTextField4Type(MetadataType.MEDIA_TITLE);
-		textAndGraphicManager.setMediaTrackTextField("mediaTrackTextField");
-		textAndGraphicManager.setTitle("title");
-		textAndGraphicManager.setPrimaryGraphic(testArtwork1);
-		textAndGraphicManager.setSecondaryGraphic(testArtwork2);
-		textAndGraphicManager.changeLayout(configuration1, null);
-		textAndGraphicManager.currentScreenData = textAndGraphicManager.currentState();
-
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField1().equals(textAndGraphicManager.getTextField1()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField2().equals(textAndGraphicManager.getTextField2()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField3().equals(textAndGraphicManager.getTextField3()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField4().equals(textAndGraphicManager.getTextField4()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTitle().equals(textAndGraphicManager.getTitle()));
-		assertTrue(textAndGraphicManager.currentScreenData.getMediaTrackTextField().equals(textAndGraphicManager.getMediaTrackTextField()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField1Type().toString().equals(textAndGraphicManager.getTextField1Type().toString()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField2Type().toString().equals(textAndGraphicManager.getTextField2Type().toString()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField3Type().toString().equals(textAndGraphicManager.getTextField3Type().toString()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField4Type().toString().equals(textAndGraphicManager.getTextField4Type().toString()));
-		assertTrue(textAndGraphicManager.currentScreenData.getPrimaryGraphic().getName().equals(textAndGraphicManager.getPrimaryGraphic().getName()));
-		assertTrue(textAndGraphicManager.currentScreenData.getSecondaryGraphic().getName().equals(textAndGraphicManager.getSecondaryGraphic().getName()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTemplateConfiguration().getStore().equals(textAndGraphicManager.getTemplateConfiguration().getStore()));
-
-		textAndGraphicManager.setTextField1("BadData");
-		textAndGraphicManager.setTextField2("BadData");
-		textAndGraphicManager.setTextField3("BadData");
-		textAndGraphicManager.setTextField4("BadData");
-		textAndGraphicManager.setTextField1Type(MetadataType.HUMIDITY);
-		textAndGraphicManager.setTextField2Type(MetadataType.HUMIDITY);
-		textAndGraphicManager.setTextField3Type(MetadataType.HUMIDITY);
-		textAndGraphicManager.setTextField4Type(MetadataType.HUMIDITY);
-		textAndGraphicManager.setMediaTrackTextField("BadData");
-		textAndGraphicManager.setTitle("BadData");
-		textAndGraphicManager.setPrimaryGraphic(testArtwork2);
-		textAndGraphicManager.setSecondaryGraphic(testArtwork1);
-		textAndGraphicManager.changeLayout(configuration2, null);
-
-		assertFalse(textAndGraphicManager.currentScreenData.getTextField1().equals(textAndGraphicManager.getTextField1()));
-		assertFalse(textAndGraphicManager.currentScreenData.getTextField2().equals(textAndGraphicManager.getTextField2()));
-		assertFalse(textAndGraphicManager.currentScreenData.getTextField3().equals(textAndGraphicManager.getTextField3()));
-		assertFalse(textAndGraphicManager.currentScreenData.getTextField4().equals(textAndGraphicManager.getTextField4()));
-		assertFalse(textAndGraphicManager.currentScreenData.getTitle().equals(textAndGraphicManager.getTitle()));
-		assertFalse(textAndGraphicManager.currentScreenData.getMediaTrackTextField().equals(textAndGraphicManager.getMediaTrackTextField()));
-		assertFalse(textAndGraphicManager.currentScreenData.getTextField1Type().toString().equals(textAndGraphicManager.getTextField1Type().toString()));
-		assertFalse(textAndGraphicManager.currentScreenData.getTextField2Type().toString().equals(textAndGraphicManager.getTextField2Type().toString()));
-		assertFalse(textAndGraphicManager.currentScreenData.getTextField3Type().toString().equals(textAndGraphicManager.getTextField3Type().toString()));
-		assertFalse(textAndGraphicManager.currentScreenData.getTextField4Type().toString().equals(textAndGraphicManager.getTextField4Type().toString()));
-		assertFalse(textAndGraphicManager.currentScreenData.getPrimaryGraphic().getName().equals(textAndGraphicManager.getPrimaryGraphic().getName()));
-		assertFalse(textAndGraphicManager.currentScreenData.getSecondaryGraphic().getName().equals(textAndGraphicManager.getSecondaryGraphic().getName()));
-		assertFalse(textAndGraphicManager.currentScreenData.getTemplateConfiguration().getStore().equals(textAndGraphicManager.getTemplateConfiguration().getStore()));
-
-		textAndGraphicManager.resetFieldsToCurrentScreenData();
-
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField1().equals(textAndGraphicManager.getTextField1()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField2().equals(textAndGraphicManager.getTextField2()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField3().equals(textAndGraphicManager.getTextField3()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField4().equals(textAndGraphicManager.getTextField4()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTitle().equals(textAndGraphicManager.getTitle()));
-		assertTrue(textAndGraphicManager.currentScreenData.getMediaTrackTextField().equals(textAndGraphicManager.getMediaTrackTextField()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField1Type().toString().equals(textAndGraphicManager.getTextField1Type().toString()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField2Type().toString().equals(textAndGraphicManager.getTextField2Type().toString()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField3Type().toString().equals(textAndGraphicManager.getTextField3Type().toString()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTextField4Type().toString().equals(textAndGraphicManager.getTextField4Type().toString()));
-		assertTrue(textAndGraphicManager.currentScreenData.getPrimaryGraphic().getName().equals(textAndGraphicManager.getPrimaryGraphic().getName()));
-		assertTrue(textAndGraphicManager.currentScreenData.getSecondaryGraphic().getName().equals(textAndGraphicManager.getSecondaryGraphic().getName()));
-		assertTrue(textAndGraphicManager.currentScreenData.getTemplateConfiguration().getStore().equals(textAndGraphicManager.getTemplateConfiguration().getStore()));
-	}
+    // SETUP / HELPERS
+    private TextAndGraphicManager textAndGraphicManager;
+    private SdlArtwork testArtwork1, testArtwork2;
+    private TemplateConfiguration configuration1, configuration2;
+
+    @Before
+    public void setUp() throws Exception {
+        Context mTestContext = getInstrumentation().getContext();
+
+        // mock things
+        ISdl internalInterface = mock(ISdl.class);
+        FileManager fileManager = mock(FileManager.class);
+        SoftButtonManager softButtonManager = mock(SoftButtonManager.class);
+
+        testArtwork1 = new SdlArtwork();
+        testArtwork1.setName("testFile");
+        Uri uri = Uri.parse("android.resource://" + mTestContext.getPackageName() + "/drawable/ic_sdl");
+        testArtwork1.setUri(uri);
+        testArtwork1.setType(FileType.GRAPHIC_PNG);
+
+        testArtwork2 = new SdlArtwork();
+        testArtwork2.setName("testFile2");
+        Uri uri2 = Uri.parse("android.resource://" + mTestContext.getPackageName() + "/drawable/ic_sdl");
+        testArtwork2.setUri(uri2);
+        testArtwork2.setType(FileType.GRAPHIC_PNG);
+
+        configuration1 = new TemplateConfiguration(PredefinedLayout.GRAPHIC_WITH_TEXT.toString());
+        configuration2 = new TemplateConfiguration(PredefinedLayout.DOUBLE_GRAPHIC_WITH_SOFTBUTTONS.toString());
+
+        Taskmaster taskmaster = new Taskmaster.Builder().build();
+        taskmaster.start();
+        when(internalInterface.getTaskmaster()).thenReturn(taskmaster);
+
+        Answer<Void> onHMIStatusAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                OnRPCNotificationListener onHMIStatusListener = (OnRPCNotificationListener) args[1];
+                OnHMIStatus onHMIStatusFakeNotification = new OnHMIStatus();
+                onHMIStatusFakeNotification.setHmiLevel(HMILevel.HMI_FULL);
+                onHMIStatusListener.onNotified(onHMIStatusFakeNotification);
+                return null;
+            }
+        };
+        doAnswer(onHMIStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
+
+        Answer<Void> onSystemCapabilityAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                OnSystemCapabilityListener onSystemCapabilityListener = (OnSystemCapabilityListener) args[1];
+                WindowCapability windowCapability = getWindowCapability(4);
+                DisplayCapability displayCapability = new DisplayCapability();
+                displayCapability.setWindowCapabilities(Collections.singletonList(windowCapability));
+                List<DisplayCapability> capabilities = Collections.singletonList(displayCapability);
+                onSystemCapabilityListener.onCapabilityRetrieved(capabilities);
+                return null;
+            }
+        };
+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+        doAnswer(onSystemCapabilityAnswer).when(systemCapabilityManager).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
+
+        textAndGraphicManager = new TextAndGraphicManager(internalInterface, fileManager, softButtonManager);
+    }
+
+
+    private WindowCapability getWindowCapability(int numberOfMainFields) {
+
+        TextField mainField1 = new TextField();
+        mainField1.setName(TextFieldName.mainField1);
+        TextField mainField2 = new TextField();
+        mainField2.setName(TextFieldName.mainField2);
+        TextField mainField3 = new TextField();
+        mainField3.setName(TextFieldName.mainField3);
+        TextField mainField4 = new TextField();
+        mainField4.setName(TextFieldName.mainField4);
+
+        List<TextField> textFieldList = new ArrayList<>();
+
+        textFieldList.add(mainField1);
+        textFieldList.add(mainField2);
+        textFieldList.add(mainField3);
+        textFieldList.add(mainField4);
+
+        List<TextField> returnList = new ArrayList<>();
+
+        if (numberOfMainFields > 0) {
+            for (int i = 0; i < numberOfMainFields; i++) {
+                returnList.add(textFieldList.get(i));
+            }
+        }
+
+        WindowCapability windowCapability = new WindowCapability();
+        windowCapability.setTextFields(returnList);
+
+        return windowCapability;
+    }
+
+    /**
+     * Used to simulate WindowCapability having no capabilities set
+     *
+     * @return windowCapability that has no capabilities set
+     */
+    private WindowCapability getNullVarWindowCapability() {
+
+        WindowCapability windowCapability = new WindowCapability();
+        return windowCapability;
+    }
+
+    @Test
+    public void testInstantiation() {
+        assertNull(textAndGraphicManager.getTextField1());
+        assertNull(textAndGraphicManager.getTextField2());
+        assertNull(textAndGraphicManager.getTextField3());
+        assertNull(textAndGraphicManager.getTextField4());
+        assertNull(textAndGraphicManager.getTitle());
+        assertNull(textAndGraphicManager.getMediaTrackTextField());
+        assertNull(textAndGraphicManager.getPrimaryGraphic());
+        assertNull(textAndGraphicManager.getSecondaryGraphic());
+        assertEquals(textAndGraphicManager.getTextAlignment(), TextAlignment.CENTERED);
+        assertNull(textAndGraphicManager.getTextField1Type());
+        assertNull(textAndGraphicManager.getTextField2Type());
+        assertNull(textAndGraphicManager.getTextField3Type());
+        assertNull(textAndGraphicManager.getTextField4Type());
+        assertNotNull(textAndGraphicManager.currentScreenData);
+        assertNotNull(textAndGraphicManager.defaultMainWindowCapability);
+        assertEquals(textAndGraphicManager.currentHMILevel, HMILevel.HMI_FULL);
+        assertFalse(textAndGraphicManager.isDirty);
+        assertEquals(textAndGraphicManager.getState(), BaseSubManager.SETTING_UP);
+        assertNotNull(textAndGraphicManager.getBlankArtwork());
+    }
+
+    /**
+     * Test getting number of lines available to be set based off of windowCapability
+     */
+    @Test
+    public void testGetMainLines() {
+
+        // We want to test that the looping works. By default, it will return 4 if display cap is null
+        textAndGraphicManager.defaultMainWindowCapability = getNullVarWindowCapability();
+
+        // Null test
+        assertEquals(0, ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(textAndGraphicManager.defaultMainWindowCapability));
+
+        // The tests.java class has an example of this, but we must build it to do what
+        // we need it to do. Build display cap w/ 3 main fields and test that it returns 3
+        textAndGraphicManager.defaultMainWindowCapability = getWindowCapability(3);
+        assertEquals(ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(textAndGraphicManager.defaultMainWindowCapability), 3);
+    }
+
+    @Test
+    public void testMediaTrackTextField() {
+
+        String songTitle = "Wild For The Night";
+        textAndGraphicManager.setMediaTrackTextField(songTitle);
+        assertEquals(textAndGraphicManager.getMediaTrackTextField(), songTitle);
+    }
+
+    @Test
+    public void testTemplateTitle() {
+
+        String title = "template title";
+        textAndGraphicManager.setTitle(title);
+        assertEquals(textAndGraphicManager.getTitle(), title);
+    }
+
+    @Test
+    public void testAlignment() {
+
+        textAndGraphicManager.setTextAlignment(TextAlignment.LEFT_ALIGNED);
+        assertEquals(textAndGraphicManager.getTextAlignment(), TextAlignment.LEFT_ALIGNED);
+    }
+
+    // TEST IMAGES
+
+    @Test
+    public void testSetPrimaryGraphic() {
+        textAndGraphicManager.setPrimaryGraphic(testArtwork1);
+        assertEquals(textAndGraphicManager.getPrimaryGraphic(), testArtwork1);
+    }
+
+    @Test
+    public void testSetSecondaryGraphic() {
+        textAndGraphicManager.setSecondaryGraphic(testArtwork1);
+        assertEquals(textAndGraphicManager.getSecondaryGraphic(), testArtwork1);
+    }
+
+    // TEST DISPOSE
+
+    @Test
+    public void testDispose() {
+        textAndGraphicManager.dispose();
+
+        assertNull(textAndGraphicManager.getTextField1());
+        assertNull(textAndGraphicManager.getTextField2());
+        assertNull(textAndGraphicManager.getTextField3());
+        assertNull(textAndGraphicManager.getTextField4());
+        assertNull(textAndGraphicManager.getMediaTrackTextField());
+        assertNull(textAndGraphicManager.getPrimaryGraphic());
+        assertNull(textAndGraphicManager.getSecondaryGraphic());
+        assertNull(textAndGraphicManager.getTextAlignment());
+        assertNull(textAndGraphicManager.getTextField1Type());
+        assertNull(textAndGraphicManager.getTextField2Type());
+        assertNull(textAndGraphicManager.getTextField3Type());
+        assertNull(textAndGraphicManager.getTextField4Type());
+        assertNull(textAndGraphicManager.getTitle());
+        assertNotNull(textAndGraphicManager.getBlankArtwork());
+        assertNull(textAndGraphicManager.currentScreenData);
+        assertNull(textAndGraphicManager.defaultMainWindowCapability);
+        assertFalse(textAndGraphicManager.isDirty);
+        assertEquals(textAndGraphicManager.getState(), BaseSubManager.SHUTDOWN);
+    }
+
+    @Test
+    public void testOperationManagement() {
+        textAndGraphicManager.isDirty = true;
+        textAndGraphicManager.updateOperation = null;
+        textAndGraphicManager.update(null);
+        assertEquals(textAndGraphicManager.transactionQueue.getTasksAsList().size(), 1);
+
+        textAndGraphicManager.transactionQueue.clear();
+        textAndGraphicManager.updateOperation = null;
+
+        assertEquals(textAndGraphicManager.transactionQueue.getTasksAsList().size(), 0);
+
+        textAndGraphicManager.isDirty = true;
+        textAndGraphicManager.update(null);
+
+        assertEquals(textAndGraphicManager.transactionQueue.getTasksAsList().size(), 1);
+
+        assertTrue(textAndGraphicManager.transactionQueue.getTasksAsList().get(0).getState() == Task.READY);
+    }
+
+    @Test
+    public void testHasData() {
+        assertFalse(textAndGraphicManager.hasData());
+
+        textAndGraphicManager.setTextField1("HI");
+        assertTrue(textAndGraphicManager.hasData());
+
+        textAndGraphicManager.setTextField1(null);
+        textAndGraphicManager.setPrimaryGraphic(testArtwork1);
+        assertTrue(textAndGraphicManager.hasData());
+    }
+
+    @Test
+    public void resetFieldsToCurrentScreenDataTest() {
+        textAndGraphicManager.setTextField1("textField1");
+        textAndGraphicManager.setTextField2("textField2");
+        textAndGraphicManager.setTextField3("textField3");
+        textAndGraphicManager.setTextField4("textField4");
+        textAndGraphicManager.setTextField1Type(MetadataType.MEDIA_TITLE);
+        textAndGraphicManager.setTextField2Type(MetadataType.MEDIA_TITLE);
+        textAndGraphicManager.setTextField3Type(MetadataType.MEDIA_TITLE);
+        textAndGraphicManager.setTextField4Type(MetadataType.MEDIA_TITLE);
+        textAndGraphicManager.setMediaTrackTextField("mediaTrackTextField");
+        textAndGraphicManager.setTitle("title");
+        textAndGraphicManager.setPrimaryGraphic(testArtwork1);
+        textAndGraphicManager.setSecondaryGraphic(testArtwork2);
+        textAndGraphicManager.changeLayout(configuration1, null);
+        textAndGraphicManager.currentScreenData = textAndGraphicManager.currentState();
+
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField1().equals(textAndGraphicManager.getTextField1()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField2().equals(textAndGraphicManager.getTextField2()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField3().equals(textAndGraphicManager.getTextField3()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField4().equals(textAndGraphicManager.getTextField4()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTitle().equals(textAndGraphicManager.getTitle()));
+        assertTrue(textAndGraphicManager.currentScreenData.getMediaTrackTextField().equals(textAndGraphicManager.getMediaTrackTextField()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField1Type().toString().equals(textAndGraphicManager.getTextField1Type().toString()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField2Type().toString().equals(textAndGraphicManager.getTextField2Type().toString()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField3Type().toString().equals(textAndGraphicManager.getTextField3Type().toString()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField4Type().toString().equals(textAndGraphicManager.getTextField4Type().toString()));
+        assertTrue(textAndGraphicManager.currentScreenData.getPrimaryGraphic().getName().equals(textAndGraphicManager.getPrimaryGraphic().getName()));
+        assertTrue(textAndGraphicManager.currentScreenData.getSecondaryGraphic().getName().equals(textAndGraphicManager.getSecondaryGraphic().getName()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTemplateConfiguration().getStore().equals(textAndGraphicManager.getTemplateConfiguration().getStore()));
+
+        textAndGraphicManager.setTextField1("BadData");
+        textAndGraphicManager.setTextField2("BadData");
+        textAndGraphicManager.setTextField3("BadData");
+        textAndGraphicManager.setTextField4("BadData");
+        textAndGraphicManager.setTextField1Type(MetadataType.HUMIDITY);
+        textAndGraphicManager.setTextField2Type(MetadataType.HUMIDITY);
+        textAndGraphicManager.setTextField3Type(MetadataType.HUMIDITY);
+        textAndGraphicManager.setTextField4Type(MetadataType.HUMIDITY);
+        textAndGraphicManager.setMediaTrackTextField("BadData");
+        textAndGraphicManager.setTitle("BadData");
+        textAndGraphicManager.setPrimaryGraphic(testArtwork2);
+        textAndGraphicManager.setSecondaryGraphic(testArtwork1);
+        textAndGraphicManager.changeLayout(configuration2, null);
+
+        assertFalse(textAndGraphicManager.currentScreenData.getTextField1().equals(textAndGraphicManager.getTextField1()));
+        assertFalse(textAndGraphicManager.currentScreenData.getTextField2().equals(textAndGraphicManager.getTextField2()));
+        assertFalse(textAndGraphicManager.currentScreenData.getTextField3().equals(textAndGraphicManager.getTextField3()));
+        assertFalse(textAndGraphicManager.currentScreenData.getTextField4().equals(textAndGraphicManager.getTextField4()));
+        assertFalse(textAndGraphicManager.currentScreenData.getTitle().equals(textAndGraphicManager.getTitle()));
+        assertFalse(textAndGraphicManager.currentScreenData.getMediaTrackTextField().equals(textAndGraphicManager.getMediaTrackTextField()));
+        assertFalse(textAndGraphicManager.currentScreenData.getTextField1Type().toString().equals(textAndGraphicManager.getTextField1Type().toString()));
+        assertFalse(textAndGraphicManager.currentScreenData.getTextField2Type().toString().equals(textAndGraphicManager.getTextField2Type().toString()));
+        assertFalse(textAndGraphicManager.currentScreenData.getTextField3Type().toString().equals(textAndGraphicManager.getTextField3Type().toString()));
+        assertFalse(textAndGraphicManager.currentScreenData.getTextField4Type().toString().equals(textAndGraphicManager.getTextField4Type().toString()));
+        assertFalse(textAndGraphicManager.currentScreenData.getPrimaryGraphic().getName().equals(textAndGraphicManager.getPrimaryGraphic().getName()));
+        assertFalse(textAndGraphicManager.currentScreenData.getSecondaryGraphic().getName().equals(textAndGraphicManager.getSecondaryGraphic().getName()));
+        assertFalse(textAndGraphicManager.currentScreenData.getTemplateConfiguration().getStore().equals(textAndGraphicManager.getTemplateConfiguration().getStore()));
+
+        textAndGraphicManager.resetFieldsToCurrentScreenData();
+
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField1().equals(textAndGraphicManager.getTextField1()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField2().equals(textAndGraphicManager.getTextField2()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField3().equals(textAndGraphicManager.getTextField3()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField4().equals(textAndGraphicManager.getTextField4()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTitle().equals(textAndGraphicManager.getTitle()));
+        assertTrue(textAndGraphicManager.currentScreenData.getMediaTrackTextField().equals(textAndGraphicManager.getMediaTrackTextField()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField1Type().toString().equals(textAndGraphicManager.getTextField1Type().toString()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField2Type().toString().equals(textAndGraphicManager.getTextField2Type().toString()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField3Type().toString().equals(textAndGraphicManager.getTextField3Type().toString()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTextField4Type().toString().equals(textAndGraphicManager.getTextField4Type().toString()));
+        assertTrue(textAndGraphicManager.currentScreenData.getPrimaryGraphic().getName().equals(textAndGraphicManager.getPrimaryGraphic().getName()));
+        assertTrue(textAndGraphicManager.currentScreenData.getSecondaryGraphic().getName().equals(textAndGraphicManager.getSecondaryGraphic().getName()));
+        assertTrue(textAndGraphicManager.currentScreenData.getTemplateConfiguration().getStore().equals(textAndGraphicManager.getTemplateConfiguration().getStore()));
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java
index e00ce9b02..a893a76a7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperationTest.java
@@ -7,13 +7,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.smartdevicelink.R;
 import com.smartdevicelink.managers.CompletionListener;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.managers.ManagerUtility;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.MultipleFileCompletionListener;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.file.filetypes.SdlFile;
 import com.smartdevicelink.proxy.RPCRequest;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.ImageField;
 import com.smartdevicelink.proxy.rpc.MetadataTags;
 import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
@@ -399,7 +399,6 @@ public class TextAndGraphicUpdateOperationTest {
     }
 
 
-
     /**
      * Test getting number of lines available to be set based off of windowCapability
      */
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperationTests.java
index fb8308e5f..789d33dcf 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/CheckChoiceVROptionalOperationTests.java
@@ -54,38 +54,38 @@ import static org.mockito.Mockito.mock;
 @RunWith(AndroidJUnit4.class)
 public class CheckChoiceVROptionalOperationTests {
 
-	private CheckChoiceVROptionalOperation checkChoiceVROptionalOperation;
+    private CheckChoiceVROptionalOperation checkChoiceVROptionalOperation;
 
-	@Before
-	public void setUp() throws Exception{
+    @Before
+    public void setUp() throws Exception {
 
-		ISdl internalInterface = mock(ISdl.class);
-		CheckChoiceVROptionalInterface checkChoiceVROptionalInterface = mock(CheckChoiceVROptionalInterface.class);
-		checkChoiceVROptionalOperation = new CheckChoiceVROptionalOperation(internalInterface, checkChoiceVROptionalInterface);
-	}
+        ISdl internalInterface = mock(ISdl.class);
+        CheckChoiceVROptionalInterface checkChoiceVROptionalInterface = mock(CheckChoiceVROptionalInterface.class);
+        checkChoiceVROptionalOperation = new CheckChoiceVROptionalOperation(internalInterface, checkChoiceVROptionalInterface);
+    }
 
-	@Test
-	public void testCreateChoiceNoVR(){
-		CreateInteractionChoiceSet setNoVR = checkChoiceVROptionalOperation.testCellWithVR(false);
-		assertNotNull(setNoVR);
-		// This set only has one choice
-		Choice choice = setNoVR.getChoiceSet().get(0);
-		assertNull(choice.getVrCommands());
-	}
+    @Test
+    public void testCreateChoiceNoVR() {
+        CreateInteractionChoiceSet setNoVR = checkChoiceVROptionalOperation.testCellWithVR(false);
+        assertNotNull(setNoVR);
+        // This set only has one choice
+        Choice choice = setNoVR.getChoiceSet().get(0);
+        assertNull(choice.getVrCommands());
+    }
 
-	@Test
-	public void testCreateChoiceWithVR(){
-		CreateInteractionChoiceSet setNoVR = checkChoiceVROptionalOperation.testCellWithVR(true);
-		assertNotNull(setNoVR);
-		// This set only has one choice
-		Choice choice = setNoVR.getChoiceSet().get(0);
-		assertEquals(choice.getVrCommands().get(0), "Test VR");
-	}
+    @Test
+    public void testCreateChoiceWithVR() {
+        CreateInteractionChoiceSet setNoVR = checkChoiceVROptionalOperation.testCellWithVR(true);
+        assertNotNull(setNoVR);
+        // This set only has one choice
+        Choice choice = setNoVR.getChoiceSet().get(0);
+        assertEquals(choice.getVrCommands().get(0), "Test VR");
+    }
 
-	@Test
-	public void testDeleteInteractionChoiceSet(){
-		DeleteInteractionChoiceSet deleteSet = checkChoiceVROptionalOperation.createDeleteInteractionChoiceSet();
-		assertNotNull(deleteSet);
-	}
+    @Test
+    public void testDeleteInteractionChoiceSet() {
+        DeleteInteractionChoiceSet deleteSet = checkChoiceVROptionalOperation.createDeleteInteractionChoiceSet();
+        assertNotNull(deleteSet);
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCellTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCellTests.java
index 420ab1d72..4bdd3ff93 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCellTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceCellTests.java
@@ -52,7 +52,7 @@ public class ChoiceCellTests {
     private SdlArtwork artwork = new SdlArtwork("image", FileType.GRAPHIC_PNG, 1, true);
 
     @Test
-    public void testSettersAndGetters(){
+    public void testSettersAndGetters() {
 
         // set everything
         ChoiceCell choiceCell = new ChoiceCell(TestValues.GENERAL_STRING);
@@ -100,7 +100,7 @@ public class ChoiceCellTests {
     }
 
     @Test
-    public void testCellEquality(){
+    public void testCellEquality() {
 
         ChoiceCell choiceCell = new ChoiceCell(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING_LIST, artwork);
         choiceCell.setSecondaryText(TestValues.GENERAL_STRING);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java
index 482d29b90..c7c0df7e4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetManagerTests.java
@@ -39,8 +39,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.livio.taskmaster.Taskmaster;
 import com.smartdevicelink.managers.BaseSubManager;
-import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.ISdl;
+import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.proxy.rpc.KeyboardProperties;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
 import com.smartdevicelink.proxy.rpc.enums.KeyboardLayout;
@@ -76,243 +76,245 @@ import static org.mockito.Mockito.when;
 @RunWith(AndroidJUnit4.class)
 public class ChoiceSetManagerTests {
 
-	private ChoiceSetManager csm;
-	Taskmaster taskmaster;
-
-	@Before
-	public void setUp() throws Exception{
-
-		ISdl internalInterface = mock(ISdl.class);
-		FileManager fileManager = mock(FileManager.class);
-		taskmaster = new Taskmaster.Builder().build();
-		when(internalInterface.getTaskmaster()).thenReturn(taskmaster);
-		csm = new ChoiceSetManager(internalInterface, fileManager);
-
-		assertEquals(csm.getState(), BaseSubManager.SETTING_UP);
-		assertEquals(csm.currentSystemContext, SystemContext.SYSCTXT_MAIN);
-		assertEquals(csm.currentHMILevel, HMILevel.HMI_NONE);
-		assertEquals(csm.choiceCellIdMin, 1);
-		assertEquals(csm.nextChoiceId, 1);
-		assertFalse(csm.isVROptional);
-		assertNotNull(csm.fileManager);
-		assertNotNull(csm.preloadedChoices);
-		assertNotNull(csm.pendingPreloadChoices);
-		assertNotNull(csm.transactionQueue);
-		assertNotNull(csm.hmiListener);
-		assertNotNull(csm.onDisplayCapabilityListener);
-		assertNull(csm.pendingPresentOperation);
-	}
-
-	@After
-	public void tearDown() throws Exception {
-
-		csm.dispose();
-
-		assertNull(csm.currentHMILevel);
-		assertNull(csm.currentSystemContext);
-		assertNull(csm.defaultMainWindowCapability);
-		assertNull(csm.pendingPresentationSet);
-		assertNull(csm.pendingPresentOperation);
-
-		assertEquals(csm.transactionQueue.getTasksAsList().size(), 0);
-		assertEquals(csm.nextChoiceId, 1);
-
-		assertFalse(csm.isVROptional);
-
-		assertEquals(csm.getState(), BaseSubManager.SHUTDOWN);
-
-	}
-
-	@Test
-	public void testDefaultKeyboardConfiguration(){
-		KeyboardProperties properties = csm.defaultKeyboardConfiguration();
-		assertEquals(properties.getLanguage(), Language.EN_US);
-		assertEquals(properties.getKeyboardLayout(), KeyboardLayout.QWERTY);
-		assertEquals(properties.getKeypressMode(), KeypressMode.RESEND_CURRENT_ENTRY);
-	}
-
-	@Test
-	public void testSetupChoiceSet(){
-
-		ChoiceSetSelectionListener choiceSetSelectionListener = new ChoiceSetSelectionListener() {
-			@Override
-			public void onChoiceSelected(ChoiceCell choiceCell, TriggerSource triggerSource, int rowIndex) {}
-
-			@Override
-			public void onError(String error) {}
-		};
-
-		// Cannot send choice set with empty or null choice list
-		ChoiceSet choiceSet1 = new ChoiceSet("test", Collections.<ChoiceCell>emptyList(), choiceSetSelectionListener);
-		assertFalse(csm.setUpChoiceSet(choiceSet1));
-
-		// cells cant have duplicate text
-		ChoiceCell cell1 = new ChoiceCell("test");
-		ChoiceCell cell2 = new ChoiceCell("test");
-		ChoiceSet choiceSet2 = new ChoiceSet("test", Arrays.asList(cell1, cell2), choiceSetSelectionListener);
-		assertFalse(csm.setUpChoiceSet(choiceSet2));
-
-		// cells cannot mix and match VR / non-VR
-		ChoiceCell cell3 = new ChoiceCell("test", Collections.singletonList("Test"), null);
-		ChoiceCell cell4 = new ChoiceCell("test2");
-		ChoiceSet choiceSet3 = new ChoiceSet("test", Arrays.asList(cell3, cell4), choiceSetSelectionListener);
-		assertFalse(csm.setUpChoiceSet(choiceSet3));
-
-		// VR Commands must be unique
-		ChoiceCell cell5 = new ChoiceCell("test", Collections.singletonList("Test"), null);
-		ChoiceCell cell6 = new ChoiceCell("test2", Collections.singletonList("Test"), null);
-		ChoiceSet choiceSet4 = new ChoiceSet("test", Arrays.asList(cell5, cell6), choiceSetSelectionListener);
-		assertFalse(csm.setUpChoiceSet(choiceSet4));
-
-		// Passing Case
-		ChoiceCell cell7 = new ChoiceCell("test", Collections.singletonList("Test"), null);
-		ChoiceCell cell8 = new ChoiceCell("test2", Collections.singletonList("Test2"), null);
-		ChoiceSet choiceSet5 = new ChoiceSet("test", Arrays.asList(cell7, cell8), choiceSetSelectionListener);
-		assertTrue(csm.setUpChoiceSet(choiceSet5));
-	}
-
-	@Test
-	public void testFindIfPresent(){
-
-		ChoiceCell cell1 = new ChoiceCell("test");
-		ChoiceCell cell2 = new ChoiceCell("test2");
-		ChoiceCell cell3 = new ChoiceCell("test3");
-		HashSet<ChoiceCell> cellSet = new HashSet<>();
-		cellSet.add(cell1);
-		cellSet.add(cell2);
-
-		assertNotNull(csm.findIfPresent(cell1, cellSet));
-		assertNull(csm.findIfPresent(cell3, cellSet));
-	}
-
-	@Test
-	public void testUpdateIdsOnChoices(){
-
-		ChoiceCell cell1 = new ChoiceCell("test");
-		ChoiceCell cell2 = new ChoiceCell("test2");
-		ChoiceCell cell3 = new ChoiceCell("test3");
-		HashSet<ChoiceCell> cellSet = new HashSet<>();
-		cellSet.add(cell1);
-		cellSet.add(cell2);
-		cellSet.add(cell3);
-		// Cells are initially set to MAX_ID
-		assertEquals(cell1.getChoiceId(), 2000000000);
-		assertEquals(cell2.getChoiceId(), 2000000000);
-		assertEquals(cell3.getChoiceId(), 2000000000);
-		csm.updateIdsOnChoices(cellSet);
-		// We are looking for unique IDs
-		assertNotSame(cell1.getChoiceId(), 2000000000);
-		assertNotSame(cell2.getChoiceId(), 2000000000);
-		assertNotSame(cell3.getChoiceId(), 2000000000);
-	}
-
-	@Test
-	public void testChoicesToBeRemovedFromPendingWithArray(){
-
-		ChoiceCell cell1 = new ChoiceCell("test");
-		ChoiceCell cell2 = new ChoiceCell("test2");
-		ChoiceCell cell3 = new ChoiceCell("test3");
-
-		HashSet<ChoiceCell> pendingPreloadSet = new HashSet<>();
-		pendingPreloadSet.add(cell1);
-		pendingPreloadSet.add(cell2);
-		pendingPreloadSet.add(cell3);
-
-		csm.pendingPreloadChoices.clear();
-		csm.pendingPreloadChoices = pendingPreloadSet;
-
-		List<ChoiceCell> choices = new ArrayList<>();
-		choices.add(cell2);
-
-		HashSet<ChoiceCell> returnedChoices = csm.choicesToBeRemovedFromPendingWithArray(choices);
-
-		assertEquals(returnedChoices.size(), 1);
-		for (ChoiceCell cell : returnedChoices){
-			assertEquals(cell.getText(), "test2");
-		}
-	}
-
-	@Test
-	public void testChoicesToBeUploadedWithArray(){
-
-		ChoiceCell cell1 = new ChoiceCell("test");
-		ChoiceCell cell2 = new ChoiceCell("test2");
-		ChoiceCell cell3 = new ChoiceCell("test3");
-
-		HashSet<ChoiceCell> pendingDeleteSet = new HashSet<>();
-		pendingDeleteSet.add(cell1);
-		pendingDeleteSet.add(cell2);
-		pendingDeleteSet.add(cell3);
-
-		csm.preloadedChoices.clear();
-		csm.preloadedChoices = pendingDeleteSet;
-
-		List<ChoiceCell> choices = new ArrayList<>();
-		choices.add(cell2);
-
-		HashSet<ChoiceCell> returnedChoices = csm.choicesToBeDeletedWithArray(choices);
-
-		assertEquals(returnedChoices.size(), 1);
-		for (ChoiceCell cell : returnedChoices){
-			assertEquals(cell.getText(), "test2");
-		}
-	}
-
-	@Test
-	public void testPresentingKeyboardShouldReturnCancelIDIfKeyboardCanBeSent() {
-		ISdl internalInterface = mock(ISdl.class);
-		when(internalInterface.getTaskmaster()).thenReturn(taskmaster);
-		FileManager fileManager = mock(FileManager.class);
-
-		ChoiceSetManager newCSM = new ChoiceSetManager(internalInterface, fileManager);
-		ChoiceSetManager partialMockCSM = spy(newCSM);
-		when(partialMockCSM.getState()).thenReturn(BaseSubManager.READY);
-
-		Integer cancelId = partialMockCSM.presentKeyboard("initial text", mock(KeyboardProperties.class), mock(KeyboardListener.class));
-		assertNotNull(cancelId);
-	}
-
-	@Test
-	public void testPresentingKeyboardShouldNotReturnCancelIDIfKeyboardCannotBeSent() {
-		ISdl internalInterface = mock(ISdl.class);
-		when(internalInterface.getTaskmaster()).thenReturn(taskmaster);
-		FileManager fileManager = mock(FileManager.class);
-
-		ChoiceSetManager newCSM = new ChoiceSetManager(internalInterface, fileManager);
-		ChoiceSetManager partialMockCSM = spy(newCSM);
-		when(partialMockCSM.getState()).thenReturn(BaseSubManager.ERROR);
-
-		Integer cancelId = partialMockCSM.presentKeyboard("initial text", mock(KeyboardProperties.class), mock(KeyboardListener.class));
-		assertNull(cancelId);
-	}
-
-	@Test
-	public void testDismissingExecutingKeyboard(){
-		Integer testCancelID = 42;
-		PresentKeyboardOperation testKeyboardOp = mock(PresentKeyboardOperation.class);
-		doReturn(testCancelID).when(testKeyboardOp).getCancelID();
-		csm.currentlyPresentedKeyboardOperation = testKeyboardOp;
-		csm.dismissKeyboard(testCancelID);
-		verify(testKeyboardOp, times(1)).dismissKeyboard();
-	}
-
-	@Test
-	public void testDismissingQueuedKeyboard(){
-		Integer testCancelID = 42;
-
-		// Currently executing operation
-		PresentKeyboardOperation testKeyboardOp = mock(PresentKeyboardOperation.class);
-		doReturn(96).when(testKeyboardOp).getCancelID();
-		csm.currentlyPresentedKeyboardOperation = testKeyboardOp;
-
-		// Queued operations
-		PresentKeyboardOperation testKeyboardOp2 = mock(PresentKeyboardOperation.class);
-		doReturn(testCancelID).when(testKeyboardOp2).getCancelID();
-		csm.currentlyPresentedKeyboardOperation = testKeyboardOp2;
-
-		// Queued operation should be canceled
-		csm.dismissKeyboard(testCancelID);
-		verify(testKeyboardOp, times(0)).dismissKeyboard();
-		verify(testKeyboardOp2, times(1)).dismissKeyboard();
-	}
+    private ChoiceSetManager csm;
+    Taskmaster taskmaster;
+
+    @Before
+    public void setUp() throws Exception {
+
+        ISdl internalInterface = mock(ISdl.class);
+        FileManager fileManager = mock(FileManager.class);
+        taskmaster = new Taskmaster.Builder().build();
+        when(internalInterface.getTaskmaster()).thenReturn(taskmaster);
+        csm = new ChoiceSetManager(internalInterface, fileManager);
+
+        assertEquals(csm.getState(), BaseSubManager.SETTING_UP);
+        assertEquals(csm.currentSystemContext, SystemContext.SYSCTXT_MAIN);
+        assertEquals(csm.currentHMILevel, HMILevel.HMI_NONE);
+        assertEquals(csm.choiceCellIdMin, 1);
+        assertEquals(csm.nextChoiceId, 1);
+        assertFalse(csm.isVROptional);
+        assertNotNull(csm.fileManager);
+        assertNotNull(csm.preloadedChoices);
+        assertNotNull(csm.pendingPreloadChoices);
+        assertNotNull(csm.transactionQueue);
+        assertNotNull(csm.hmiListener);
+        assertNotNull(csm.onDisplayCapabilityListener);
+        assertNull(csm.pendingPresentOperation);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+
+        csm.dispose();
+
+        assertNull(csm.currentHMILevel);
+        assertNull(csm.currentSystemContext);
+        assertNull(csm.defaultMainWindowCapability);
+        assertNull(csm.pendingPresentationSet);
+        assertNull(csm.pendingPresentOperation);
+
+        assertEquals(csm.transactionQueue.getTasksAsList().size(), 0);
+        assertEquals(csm.nextChoiceId, 1);
+
+        assertFalse(csm.isVROptional);
+
+        assertEquals(csm.getState(), BaseSubManager.SHUTDOWN);
+
+    }
+
+    @Test
+    public void testDefaultKeyboardConfiguration() {
+        KeyboardProperties properties = csm.defaultKeyboardConfiguration();
+        assertEquals(properties.getLanguage(), Language.EN_US);
+        assertEquals(properties.getKeyboardLayout(), KeyboardLayout.QWERTY);
+        assertEquals(properties.getKeypressMode(), KeypressMode.RESEND_CURRENT_ENTRY);
+    }
+
+    @Test
+    public void testSetupChoiceSet() {
+
+        ChoiceSetSelectionListener choiceSetSelectionListener = new ChoiceSetSelectionListener() {
+            @Override
+            public void onChoiceSelected(ChoiceCell choiceCell, TriggerSource triggerSource, int rowIndex) {
+            }
+
+            @Override
+            public void onError(String error) {
+            }
+        };
+
+        // Cannot send choice set with empty or null choice list
+        ChoiceSet choiceSet1 = new ChoiceSet("test", Collections.<ChoiceCell>emptyList(), choiceSetSelectionListener);
+        assertFalse(csm.setUpChoiceSet(choiceSet1));
+
+        // cells cant have duplicate text
+        ChoiceCell cell1 = new ChoiceCell("test");
+        ChoiceCell cell2 = new ChoiceCell("test");
+        ChoiceSet choiceSet2 = new ChoiceSet("test", Arrays.asList(cell1, cell2), choiceSetSelectionListener);
+        assertFalse(csm.setUpChoiceSet(choiceSet2));
+
+        // cells cannot mix and match VR / non-VR
+        ChoiceCell cell3 = new ChoiceCell("test", Collections.singletonList("Test"), null);
+        ChoiceCell cell4 = new ChoiceCell("test2");
+        ChoiceSet choiceSet3 = new ChoiceSet("test", Arrays.asList(cell3, cell4), choiceSetSelectionListener);
+        assertFalse(csm.setUpChoiceSet(choiceSet3));
+
+        // VR Commands must be unique
+        ChoiceCell cell5 = new ChoiceCell("test", Collections.singletonList("Test"), null);
+        ChoiceCell cell6 = new ChoiceCell("test2", Collections.singletonList("Test"), null);
+        ChoiceSet choiceSet4 = new ChoiceSet("test", Arrays.asList(cell5, cell6), choiceSetSelectionListener);
+        assertFalse(csm.setUpChoiceSet(choiceSet4));
+
+        // Passing Case
+        ChoiceCell cell7 = new ChoiceCell("test", Collections.singletonList("Test"), null);
+        ChoiceCell cell8 = new ChoiceCell("test2", Collections.singletonList("Test2"), null);
+        ChoiceSet choiceSet5 = new ChoiceSet("test", Arrays.asList(cell7, cell8), choiceSetSelectionListener);
+        assertTrue(csm.setUpChoiceSet(choiceSet5));
+    }
+
+    @Test
+    public void testFindIfPresent() {
+
+        ChoiceCell cell1 = new ChoiceCell("test");
+        ChoiceCell cell2 = new ChoiceCell("test2");
+        ChoiceCell cell3 = new ChoiceCell("test3");
+        HashSet<ChoiceCell> cellSet = new HashSet<>();
+        cellSet.add(cell1);
+        cellSet.add(cell2);
+
+        assertNotNull(csm.findIfPresent(cell1, cellSet));
+        assertNull(csm.findIfPresent(cell3, cellSet));
+    }
+
+    @Test
+    public void testUpdateIdsOnChoices() {
+
+        ChoiceCell cell1 = new ChoiceCell("test");
+        ChoiceCell cell2 = new ChoiceCell("test2");
+        ChoiceCell cell3 = new ChoiceCell("test3");
+        HashSet<ChoiceCell> cellSet = new HashSet<>();
+        cellSet.add(cell1);
+        cellSet.add(cell2);
+        cellSet.add(cell3);
+        // Cells are initially set to MAX_ID
+        assertEquals(cell1.getChoiceId(), 2000000000);
+        assertEquals(cell2.getChoiceId(), 2000000000);
+        assertEquals(cell3.getChoiceId(), 2000000000);
+        csm.updateIdsOnChoices(cellSet);
+        // We are looking for unique IDs
+        assertNotSame(cell1.getChoiceId(), 2000000000);
+        assertNotSame(cell2.getChoiceId(), 2000000000);
+        assertNotSame(cell3.getChoiceId(), 2000000000);
+    }
+
+    @Test
+    public void testChoicesToBeRemovedFromPendingWithArray() {
+
+        ChoiceCell cell1 = new ChoiceCell("test");
+        ChoiceCell cell2 = new ChoiceCell("test2");
+        ChoiceCell cell3 = new ChoiceCell("test3");
+
+        HashSet<ChoiceCell> pendingPreloadSet = new HashSet<>();
+        pendingPreloadSet.add(cell1);
+        pendingPreloadSet.add(cell2);
+        pendingPreloadSet.add(cell3);
+
+        csm.pendingPreloadChoices.clear();
+        csm.pendingPreloadChoices = pendingPreloadSet;
+
+        List<ChoiceCell> choices = new ArrayList<>();
+        choices.add(cell2);
+
+        HashSet<ChoiceCell> returnedChoices = csm.choicesToBeRemovedFromPendingWithArray(choices);
+
+        assertEquals(returnedChoices.size(), 1);
+        for (ChoiceCell cell : returnedChoices) {
+            assertEquals(cell.getText(), "test2");
+        }
+    }
+
+    @Test
+    public void testChoicesToBeUploadedWithArray() {
+
+        ChoiceCell cell1 = new ChoiceCell("test");
+        ChoiceCell cell2 = new ChoiceCell("test2");
+        ChoiceCell cell3 = new ChoiceCell("test3");
+
+        HashSet<ChoiceCell> pendingDeleteSet = new HashSet<>();
+        pendingDeleteSet.add(cell1);
+        pendingDeleteSet.add(cell2);
+        pendingDeleteSet.add(cell3);
+
+        csm.preloadedChoices.clear();
+        csm.preloadedChoices = pendingDeleteSet;
+
+        List<ChoiceCell> choices = new ArrayList<>();
+        choices.add(cell2);
+
+        HashSet<ChoiceCell> returnedChoices = csm.choicesToBeDeletedWithArray(choices);
+
+        assertEquals(returnedChoices.size(), 1);
+        for (ChoiceCell cell : returnedChoices) {
+            assertEquals(cell.getText(), "test2");
+        }
+    }
+
+    @Test
+    public void testPresentingKeyboardShouldReturnCancelIDIfKeyboardCanBeSent() {
+        ISdl internalInterface = mock(ISdl.class);
+        when(internalInterface.getTaskmaster()).thenReturn(taskmaster);
+        FileManager fileManager = mock(FileManager.class);
+
+        ChoiceSetManager newCSM = new ChoiceSetManager(internalInterface, fileManager);
+        ChoiceSetManager partialMockCSM = spy(newCSM);
+        when(partialMockCSM.getState()).thenReturn(BaseSubManager.READY);
+
+        Integer cancelId = partialMockCSM.presentKeyboard("initial text", mock(KeyboardProperties.class), mock(KeyboardListener.class));
+        assertNotNull(cancelId);
+    }
+
+    @Test
+    public void testPresentingKeyboardShouldNotReturnCancelIDIfKeyboardCannotBeSent() {
+        ISdl internalInterface = mock(ISdl.class);
+        when(internalInterface.getTaskmaster()).thenReturn(taskmaster);
+        FileManager fileManager = mock(FileManager.class);
+
+        ChoiceSetManager newCSM = new ChoiceSetManager(internalInterface, fileManager);
+        ChoiceSetManager partialMockCSM = spy(newCSM);
+        when(partialMockCSM.getState()).thenReturn(BaseSubManager.ERROR);
+
+        Integer cancelId = partialMockCSM.presentKeyboard("initial text", mock(KeyboardProperties.class), mock(KeyboardListener.class));
+        assertNull(cancelId);
+    }
+
+    @Test
+    public void testDismissingExecutingKeyboard() {
+        Integer testCancelID = 42;
+        PresentKeyboardOperation testKeyboardOp = mock(PresentKeyboardOperation.class);
+        doReturn(testCancelID).when(testKeyboardOp).getCancelID();
+        csm.currentlyPresentedKeyboardOperation = testKeyboardOp;
+        csm.dismissKeyboard(testCancelID);
+        verify(testKeyboardOp, times(1)).dismissKeyboard();
+    }
+
+    @Test
+    public void testDismissingQueuedKeyboard() {
+        Integer testCancelID = 42;
+
+        // Currently executing operation
+        PresentKeyboardOperation testKeyboardOp = mock(PresentKeyboardOperation.class);
+        doReturn(96).when(testKeyboardOp).getCancelID();
+        csm.currentlyPresentedKeyboardOperation = testKeyboardOp;
+
+        // Queued operations
+        PresentKeyboardOperation testKeyboardOp2 = mock(PresentKeyboardOperation.class);
+        doReturn(testCancelID).when(testKeyboardOp2).getCancelID();
+        csm.currentlyPresentedKeyboardOperation = testKeyboardOp2;
+
+        // Queued operation should be canceled
+        csm.dismissKeyboard(testCancelID);
+        verify(testKeyboardOp, times(0)).dismissKeyboard();
+        verify(testKeyboardOp2, times(1)).dismissKeyboard();
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetTests.java
index 5bd8216d2..4eeb04927 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSetTests.java
@@ -57,7 +57,7 @@ public class ChoiceSetTests {
     private Boolean canceledHandlerCalled;
 
     @Before
-    public void setUp() throws Exception{
+    public void setUp() throws Exception {
 
         listener = mock(ChoiceSetSelectionListener.class);
         layout = ChoiceSetLayout.CHOICE_SET_LAYOUT_LIST;
@@ -68,7 +68,7 @@ public class ChoiceSetTests {
 
 
     @Test
-    public void testSettersAndGetters(){
+    public void testSettersAndGetters() {
 
         // test small constructor
         ChoiceSet choiceSet = new ChoiceSet(TestValues.GENERAL_STRING, choices, listener);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperationTests.java
index ca5c7df56..2b472eda8 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperationTests.java
@@ -54,30 +54,30 @@ import static org.mockito.Mockito.mock;
 @RunWith(AndroidJUnit4.class)
 public class DeleteChoicesOperationTests {
 
-	private DeleteChoicesOperation deleteChoicesOperation;
+    private DeleteChoicesOperation deleteChoicesOperation;
 
-	@Before
-	public void setUp() throws Exception{
+    @Before
+    public void setUp() throws Exception {
 
-		ChoiceCell cell1 = new ChoiceCell("cell 1");
-		ChoiceCell cell2 = new ChoiceCell("cell 2");
-		HashSet<ChoiceCell> cellsToDelete = new HashSet<>();
-		cellsToDelete.add(cell1);
-		cellsToDelete.add(cell2);
+        ChoiceCell cell1 = new ChoiceCell("cell 1");
+        ChoiceCell cell2 = new ChoiceCell("cell 2");
+        HashSet<ChoiceCell> cellsToDelete = new HashSet<>();
+        cellsToDelete.add(cell1);
+        cellsToDelete.add(cell2);
 
-		ISdl internalInterface = mock(ISdl.class);
-		deleteChoicesOperation = new DeleteChoicesOperation(internalInterface, cellsToDelete, null);
-	}
+        ISdl internalInterface = mock(ISdl.class);
+        deleteChoicesOperation = new DeleteChoicesOperation(internalInterface, cellsToDelete, null);
+    }
 
 
-	@Test
-	public void testCreateListDeleteInteractionSets(){
-		List<DeleteInteractionChoiceSet> deletes = deleteChoicesOperation.createDeleteSets();
-		assertNotNull(deletes);
-		assertEquals(deletes.size(), 2);
-		for (DeleteInteractionChoiceSet delete : deletes) {
-			assertNotNull(delete);
-		}
-	}
+    @Test
+    public void testCreateListDeleteInteractionSets() {
+        List<DeleteInteractionChoiceSet> deletes = deleteChoicesOperation.createDeleteSets();
+        assertNotNull(deletes);
+        assertEquals(deletes.size(), 2);
+        for (DeleteInteractionChoiceSet delete : deletes) {
+            assertNotNull(delete);
+        }
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperationTests.java
index f5094917f..db592dfb6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperationTests.java
@@ -37,9 +37,9 @@ package com.smartdevicelink.managers.screen.choiceset;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.ImageField;
 import com.smartdevicelink.proxy.rpc.TextField;
 import com.smartdevicelink.proxy.rpc.WindowCapability;
@@ -68,125 +68,125 @@ import static org.mockito.Mockito.mock;
 @RunWith(AndroidJUnit4.class)
 public class PreloadChoicesOperationTests {
 
-	private PreloadChoicesOperation preloadChoicesOperation;
-	private PreloadChoicesOperation preloadChoicesOperationNullCapability;
-	private PreloadChoicesOperation preloadChoicesOperationEmptyCapability;
-
-
-	@Before
-	public void setUp() throws Exception{
-
-		ChoiceCell cell1 = new ChoiceCell("cell 1");
-		ChoiceCell cell2 = new ChoiceCell("cell 2", null, TestValues.GENERAL_ARTWORK);
-		HashSet<ChoiceCell> cellsToPreload = new HashSet<>();
-		cellsToPreload.add(cell1);
-		cellsToPreload.add(cell2);
-
-		ImageField imageField = new ImageField(ImageFieldName.choiceImage, Arrays.asList(FileType.GRAPHIC_PNG, FileType.GRAPHIC_JPEG));
-		ImageField imageField2 = new ImageField();
-		imageField2.setName(ImageFieldName.choiceSecondaryImage);
-		TextField textField = new TextField(TextFieldName.menuName, CharacterSet.CID1SET, 2, 2);
-
-		TextField textField2 = new TextField();
-		TextField textField3 = new TextField();
-
-		textField2.setName(TextFieldName.secondaryText);
-		textField3.setName(TextFieldName.tertiaryText);
-
-
-		WindowCapability windowCapability = new WindowCapability();
-		windowCapability.setImageFields(Arrays.asList(imageField, imageField2));
-		windowCapability.setImageTypeSupported(Arrays.asList(ImageType.STATIC, ImageType.DYNAMIC));
-		windowCapability.setTextFields(Arrays.asList(textField, textField2, textField3));
-
-		ISdl internalInterface = mock(ISdl.class);
-		FileManager fileManager = mock(FileManager.class);
-		preloadChoicesOperation = new PreloadChoicesOperation(internalInterface, fileManager, null, windowCapability, true, cellsToPreload, null);
-	}
-
-	/**
-	 * Sets up PreloadChoicesOperation with WindowCapability being null
-	 */
-	public void setUpNullWindowCapability() {
-
-		ChoiceCell cell1 = new ChoiceCell("cell 1");
-		ChoiceCell cell2 = new ChoiceCell("cell 2", null, TestValues.GENERAL_ARTWORK);
-		HashSet<ChoiceCell> cellsToPreload = new HashSet<>();
-		cellsToPreload.add(cell1);
-		cellsToPreload.add(cell2);
-
-		ISdl internalInterface = mock(ISdl.class);
-		FileManager fileManager = mock(FileManager.class);
-		preloadChoicesOperationNullCapability = new PreloadChoicesOperation(internalInterface, fileManager, null, null, true, cellsToPreload, null);
-	}
-
-	/**
-	 * Sets up PreloadChoicesOperation with an Capability not being set
-	 * certain imageFields and TextFields
-	 */
-	public void setUpEmptyWindowCapability() {
-
-		ChoiceCell cell1 = new ChoiceCell("cell 1");
-		ChoiceCell cell2 = new ChoiceCell("cell 2", null, TestValues.GENERAL_ARTWORK);
-		HashSet<ChoiceCell> cellsToPreload = new HashSet<>();
-		cellsToPreload.add(cell1);
-		cellsToPreload.add(cell2);
-
-		ImageField imageField = new ImageField();
-		imageField.setName(ImageFieldName.alertIcon);
-
-		TextField textField = new TextField();
-		textField.setName(TextFieldName.mainField1);
-
-		WindowCapability windowCapability = new WindowCapability();
-		windowCapability.setImageFields(Collections.singletonList(imageField));
-		windowCapability.setTextFields(Collections.singletonList(textField));
-
-		ISdl internalInterface = mock(ISdl.class);
-		FileManager fileManager = mock(FileManager.class);
-		preloadChoicesOperationEmptyCapability = new PreloadChoicesOperation(internalInterface, fileManager, null, windowCapability, true, cellsToPreload, null);
-	}
-
-
-	@Test
-	public void testArtworkNeedsUpload(){
-		boolean test = preloadChoicesOperation.artworkNeedsUpload(TestValues.GENERAL_ARTWORK);
-		assertTrue(test);
-	}
-
-	@Test
-	public void testArtworksToUpload(){
-		List<SdlArtwork> artworksToUpload = preloadChoicesOperation.artworksToUpload();
-		assertNotNull(artworksToUpload);
-		assertEquals(artworksToUpload.size(), 1);
-	}
-
-	/**
-	 * Testing shouldSend method's with varying WindowCapability set.
-	 */
-	@Test
-	public void testShouldSendText() {
-
-		setUpNullWindowCapability();
-		assertTrue(preloadChoicesOperationNullCapability.shouldSendChoicePrimaryImage());
-		assertTrue(preloadChoicesOperationNullCapability.shouldSendChoiceSecondaryImage());
-		assertTrue(preloadChoicesOperationNullCapability.shouldSendChoiceSecondaryText());
-		assertTrue(preloadChoicesOperationNullCapability.shouldSendChoiceTertiaryText());
-		assertTrue(preloadChoicesOperationNullCapability.shouldSendChoiceText());
-
-
-		assertTrue(preloadChoicesOperation.shouldSendChoicePrimaryImage());
-		assertTrue(preloadChoicesOperation.shouldSendChoiceSecondaryImage());
-		assertTrue(preloadChoicesOperation.shouldSendChoiceSecondaryText());
-		assertTrue(preloadChoicesOperation.shouldSendChoiceTertiaryText());
-		assertTrue(preloadChoicesOperation.shouldSendChoiceText());
-
-		setUpEmptyWindowCapability();
-		assertFalse(preloadChoicesOperationEmptyCapability.shouldSendChoicePrimaryImage());
-		assertFalse(preloadChoicesOperationEmptyCapability.shouldSendChoiceSecondaryImage());
-		assertFalse(preloadChoicesOperationEmptyCapability.shouldSendChoiceSecondaryText());
-		assertFalse(preloadChoicesOperationEmptyCapability.shouldSendChoiceTertiaryText());
-		assertFalse(preloadChoicesOperationEmptyCapability.shouldSendChoiceText());
-	}
+    private PreloadChoicesOperation preloadChoicesOperation;
+    private PreloadChoicesOperation preloadChoicesOperationNullCapability;
+    private PreloadChoicesOperation preloadChoicesOperationEmptyCapability;
+
+
+    @Before
+    public void setUp() throws Exception {
+
+        ChoiceCell cell1 = new ChoiceCell("cell 1");
+        ChoiceCell cell2 = new ChoiceCell("cell 2", null, TestValues.GENERAL_ARTWORK);
+        HashSet<ChoiceCell> cellsToPreload = new HashSet<>();
+        cellsToPreload.add(cell1);
+        cellsToPreload.add(cell2);
+
+        ImageField imageField = new ImageField(ImageFieldName.choiceImage, Arrays.asList(FileType.GRAPHIC_PNG, FileType.GRAPHIC_JPEG));
+        ImageField imageField2 = new ImageField();
+        imageField2.setName(ImageFieldName.choiceSecondaryImage);
+        TextField textField = new TextField(TextFieldName.menuName, CharacterSet.CID1SET, 2, 2);
+
+        TextField textField2 = new TextField();
+        TextField textField3 = new TextField();
+
+        textField2.setName(TextFieldName.secondaryText);
+        textField3.setName(TextFieldName.tertiaryText);
+
+
+        WindowCapability windowCapability = new WindowCapability();
+        windowCapability.setImageFields(Arrays.asList(imageField, imageField2));
+        windowCapability.setImageTypeSupported(Arrays.asList(ImageType.STATIC, ImageType.DYNAMIC));
+        windowCapability.setTextFields(Arrays.asList(textField, textField2, textField3));
+
+        ISdl internalInterface = mock(ISdl.class);
+        FileManager fileManager = mock(FileManager.class);
+        preloadChoicesOperation = new PreloadChoicesOperation(internalInterface, fileManager, null, windowCapability, true, cellsToPreload, null);
+    }
+
+    /**
+     * Sets up PreloadChoicesOperation with WindowCapability being null
+     */
+    public void setUpNullWindowCapability() {
+
+        ChoiceCell cell1 = new ChoiceCell("cell 1");
+        ChoiceCell cell2 = new ChoiceCell("cell 2", null, TestValues.GENERAL_ARTWORK);
+        HashSet<ChoiceCell> cellsToPreload = new HashSet<>();
+        cellsToPreload.add(cell1);
+        cellsToPreload.add(cell2);
+
+        ISdl internalInterface = mock(ISdl.class);
+        FileManager fileManager = mock(FileManager.class);
+        preloadChoicesOperationNullCapability = new PreloadChoicesOperation(internalInterface, fileManager, null, null, true, cellsToPreload, null);
+    }
+
+    /**
+     * Sets up PreloadChoicesOperation with an Capability not being set
+     * certain imageFields and TextFields
+     */
+    public void setUpEmptyWindowCapability() {
+
+        ChoiceCell cell1 = new ChoiceCell("cell 1");
+        ChoiceCell cell2 = new ChoiceCell("cell 2", null, TestValues.GENERAL_ARTWORK);
+        HashSet<ChoiceCell> cellsToPreload = new HashSet<>();
+        cellsToPreload.add(cell1);
+        cellsToPreload.add(cell2);
+
+        ImageField imageField = new ImageField();
+        imageField.setName(ImageFieldName.alertIcon);
+
+        TextField textField = new TextField();
+        textField.setName(TextFieldName.mainField1);
+
+        WindowCapability windowCapability = new WindowCapability();
+        windowCapability.setImageFields(Collections.singletonList(imageField));
+        windowCapability.setTextFields(Collections.singletonList(textField));
+
+        ISdl internalInterface = mock(ISdl.class);
+        FileManager fileManager = mock(FileManager.class);
+        preloadChoicesOperationEmptyCapability = new PreloadChoicesOperation(internalInterface, fileManager, null, windowCapability, true, cellsToPreload, null);
+    }
+
+
+    @Test
+    public void testArtworkNeedsUpload() {
+        boolean test = preloadChoicesOperation.artworkNeedsUpload(TestValues.GENERAL_ARTWORK);
+        assertTrue(test);
+    }
+
+    @Test
+    public void testArtworksToUpload() {
+        List<SdlArtwork> artworksToUpload = preloadChoicesOperation.artworksToUpload();
+        assertNotNull(artworksToUpload);
+        assertEquals(artworksToUpload.size(), 1);
+    }
+
+    /**
+     * Testing shouldSend method's with varying WindowCapability set.
+     */
+    @Test
+    public void testShouldSendText() {
+
+        setUpNullWindowCapability();
+        assertTrue(preloadChoicesOperationNullCapability.shouldSendChoicePrimaryImage());
+        assertTrue(preloadChoicesOperationNullCapability.shouldSendChoiceSecondaryImage());
+        assertTrue(preloadChoicesOperationNullCapability.shouldSendChoiceSecondaryText());
+        assertTrue(preloadChoicesOperationNullCapability.shouldSendChoiceTertiaryText());
+        assertTrue(preloadChoicesOperationNullCapability.shouldSendChoiceText());
+
+
+        assertTrue(preloadChoicesOperation.shouldSendChoicePrimaryImage());
+        assertTrue(preloadChoicesOperation.shouldSendChoiceSecondaryImage());
+        assertTrue(preloadChoicesOperation.shouldSendChoiceSecondaryText());
+        assertTrue(preloadChoicesOperation.shouldSendChoiceTertiaryText());
+        assertTrue(preloadChoicesOperation.shouldSendChoiceText());
+
+        setUpEmptyWindowCapability();
+        assertFalse(preloadChoicesOperationEmptyCapability.shouldSendChoicePrimaryImage());
+        assertFalse(preloadChoicesOperationEmptyCapability.shouldSendChoiceSecondaryImage());
+        assertFalse(preloadChoicesOperationEmptyCapability.shouldSendChoiceSecondaryText());
+        assertFalse(preloadChoicesOperationEmptyCapability.shouldSendChoiceTertiaryText());
+        assertFalse(preloadChoicesOperationEmptyCapability.shouldSendChoiceText());
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java
index 6da649165..3d22f352b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperationTests.java
@@ -40,9 +40,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.livio.taskmaster.Queue;
 import com.livio.taskmaster.Task;
 import com.livio.taskmaster.Taskmaster;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCResponse;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.CancelInteraction;
 import com.smartdevicelink.proxy.rpc.KeyboardProperties;
 import com.smartdevicelink.proxy.rpc.PerformInteraction;
@@ -75,221 +75,221 @@ import static org.mockito.Mockito.when;
 @RunWith(AndroidJUnit4.class)
 public class PresentChoiceSetOperationTests {
 
-	private PresentChoiceSetOperation presentChoiceSetOperation;
-	private ChoiceSet choiceSet;
-	private ISdl internalInterface;
-	private KeyboardListener keyboardListener;
-	private ChoiceSetSelectionListener choiceSetSelectionListener;
-
-	private Taskmaster taskmaster;
-	private Queue queue;
-
-	@Before
-	public void setUp() throws Exception{
-
-		internalInterface = mock(ISdl.class);
-
-		keyboardListener = mock(KeyboardListener.class);
-		choiceSetSelectionListener = mock(ChoiceSetSelectionListener.class);
-
-		ChoiceCell cell1 = new ChoiceCell("Cell1");
-		cell1.setChoiceId(0);
-		choiceSet = new ChoiceSet("Test", Collections.singletonList(cell1), choiceSetSelectionListener);
-
-		taskmaster = new Taskmaster.Builder().build();
-		queue = taskmaster.createQueue("test", 100, false);
-		taskmaster.start();
-	}
-
-
-	private KeyboardProperties getKeyBoardProperties(){
-		KeyboardProperties properties = new KeyboardProperties();
-		properties.setLanguage(Language.EN_US);
-		properties.setKeyboardLayout(KeyboardLayout.QWERTZ);
-		properties.setKeypressMode(KeypressMode.RESEND_CURRENT_ENTRY);
-		return properties;
-	}
-
-	@Test
-    public void testGetLayoutMode(){
-		// First we will check knowing our keyboard listener is NOT NULL
-		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, getKeyBoardProperties(), keyboardListener, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
-
-		assertEquals(presentChoiceSetOperation.getLayoutMode(), LayoutMode.LIST_WITH_SEARCH);
-		presentChoiceSetOperation.keyboardListener = null;
-		assertEquals(presentChoiceSetOperation.getLayoutMode(), LayoutMode.LIST_ONLY);
-	}
-
-	@Test
-	public void testGetPerformInteraction(){
-		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, getKeyBoardProperties(), keyboardListener, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
-
-		PerformInteraction pi = presentChoiceSetOperation.getPerformInteraction();
-		assertEquals(pi.getInitialText(), "Test");
-		assertNull(pi.getHelpPrompt());
-		assertNull(pi.getTimeoutPrompt());
-		assertNull(pi.getVrHelp());
-		assertEquals(pi.getTimeout(), Integer.valueOf(10000));
-		assertEquals(pi.getCancelID(), TestValues.GENERAL_INTEGER);
-		assertEquals(presentChoiceSetOperation.getLayoutMode(), LayoutMode.LIST_WITH_SEARCH);
-	}
-
-	@Test
-	public void testSetSelectedCellWithId(){
-		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, getKeyBoardProperties(), keyboardListener, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
-
-		assertNull(presentChoiceSetOperation.selectedCellRow);
-		presentChoiceSetOperation.setSelectedCellWithId(0);
-		assertEquals(presentChoiceSetOperation.selectedCellRow, Integer.valueOf(0));
-	}
-
-	private void sleep() {
-		try {
-			Thread.sleep(100);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Test
-	public void testCancelingChoiceSetSuccessfullyIfThreadIsRunning(){
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
-		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
-		queue.add(presentChoiceSetOperation, false);
-
-		sleep();
-
-		assertEquals(Task.IN_PROGRESS, presentChoiceSetOperation.getState());
-
-		choiceSet.cancel();
-		Answer<Void> cancelInteractionAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				CancelInteraction cancelInteraction = (CancelInteraction) args[0];
-
-				assertEquals(cancelInteraction.getCancelID(), TestValues.GENERAL_INTEGER);
-				assertEquals(cancelInteraction.getInteractionFunctionID().intValue(), FunctionID.PERFORM_INTERACTION.getId());
-
-				RPCResponse response = new RPCResponse(FunctionID.CANCEL_INTERACTION.toString());
-				response.setSuccess(true);
-				cancelInteraction.getOnRPCResponseListener().onResponse(0, response);
-
-				return null;
-			}
-		};
-		doAnswer(cancelInteractionAnswer).when(internalInterface).sendRPC(any(CancelInteraction.class));
-
-		verify(internalInterface, times(1)).sendRPC(any(CancelInteraction.class));
+    private PresentChoiceSetOperation presentChoiceSetOperation;
+    private ChoiceSet choiceSet;
+    private ISdl internalInterface;
+    private KeyboardListener keyboardListener;
+    private ChoiceSetSelectionListener choiceSetSelectionListener;
+
+    private Taskmaster taskmaster;
+    private Queue queue;
+
+    @Before
+    public void setUp() throws Exception {
+
+        internalInterface = mock(ISdl.class);
+
+        keyboardListener = mock(KeyboardListener.class);
+        choiceSetSelectionListener = mock(ChoiceSetSelectionListener.class);
+
+        ChoiceCell cell1 = new ChoiceCell("Cell1");
+        cell1.setChoiceId(0);
+        choiceSet = new ChoiceSet("Test", Collections.singletonList(cell1), choiceSetSelectionListener);
+
+        taskmaster = new Taskmaster.Builder().build();
+        queue = taskmaster.createQueue("test", 100, false);
+        taskmaster.start();
+    }
+
+
+    private KeyboardProperties getKeyBoardProperties() {
+        KeyboardProperties properties = new KeyboardProperties();
+        properties.setLanguage(Language.EN_US);
+        properties.setKeyboardLayout(KeyboardLayout.QWERTZ);
+        properties.setKeypressMode(KeypressMode.RESEND_CURRENT_ENTRY);
+        return properties;
+    }
+
+    @Test
+    public void testGetLayoutMode() {
+        // First we will check knowing our keyboard listener is NOT NULL
+        presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, getKeyBoardProperties(), keyboardListener, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
+
+        assertEquals(presentChoiceSetOperation.getLayoutMode(), LayoutMode.LIST_WITH_SEARCH);
+        presentChoiceSetOperation.keyboardListener = null;
+        assertEquals(presentChoiceSetOperation.getLayoutMode(), LayoutMode.LIST_ONLY);
+    }
+
+    @Test
+    public void testGetPerformInteraction() {
+        presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, getKeyBoardProperties(), keyboardListener, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
+
+        PerformInteraction pi = presentChoiceSetOperation.getPerformInteraction();
+        assertEquals(pi.getInitialText(), "Test");
+        assertNull(pi.getHelpPrompt());
+        assertNull(pi.getTimeoutPrompt());
+        assertNull(pi.getVrHelp());
+        assertEquals(pi.getTimeout(), Integer.valueOf(10000));
+        assertEquals(pi.getCancelID(), TestValues.GENERAL_INTEGER);
+        assertEquals(presentChoiceSetOperation.getLayoutMode(), LayoutMode.LIST_WITH_SEARCH);
+    }
+
+    @Test
+    public void testSetSelectedCellWithId() {
+        presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, getKeyBoardProperties(), keyboardListener, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
+
+        assertNull(presentChoiceSetOperation.selectedCellRow);
+        presentChoiceSetOperation.setSelectedCellWithId(0);
+        assertEquals(presentChoiceSetOperation.selectedCellRow, Integer.valueOf(0));
+    }
+
+    private void sleep() {
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testCancelingChoiceSetSuccessfullyIfThreadIsRunning() {
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
+        presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
+        queue.add(presentChoiceSetOperation, false);
+
+        sleep();
+
+        assertEquals(Task.IN_PROGRESS, presentChoiceSetOperation.getState());
+
+        choiceSet.cancel();
+        Answer<Void> cancelInteractionAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                CancelInteraction cancelInteraction = (CancelInteraction) args[0];
+
+                assertEquals(cancelInteraction.getCancelID(), TestValues.GENERAL_INTEGER);
+                assertEquals(cancelInteraction.getInteractionFunctionID().intValue(), FunctionID.PERFORM_INTERACTION.getId());
+
+                RPCResponse response = new RPCResponse(FunctionID.CANCEL_INTERACTION.toString());
+                response.setSuccess(true);
+                cancelInteraction.getOnRPCResponseListener().onResponse(0, response);
+
+                return null;
+            }
+        };
+        doAnswer(cancelInteractionAnswer).when(internalInterface).sendRPC(any(CancelInteraction.class));
+
+        verify(internalInterface, times(1)).sendRPC(any(CancelInteraction.class));
         verify(internalInterface, times(1)).sendRPC(any(PerformInteraction.class));
 
-		assertEquals(Task.IN_PROGRESS, presentChoiceSetOperation.getState());
-	}
+        assertEquals(Task.IN_PROGRESS, presentChoiceSetOperation.getState());
+    }
 
-	@Test
-	public void testCancelingChoiceSetUnsuccessfullyIfThreadIsRunning(){
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
-		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
-		queue.add(presentChoiceSetOperation, false);
-		sleep();
+    @Test
+    public void testCancelingChoiceSetUnsuccessfullyIfThreadIsRunning() {
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
+        presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
+        queue.add(presentChoiceSetOperation, false);
+        sleep();
 
-		assertEquals(Task.IN_PROGRESS, presentChoiceSetOperation.getState());
+        assertEquals(Task.IN_PROGRESS, presentChoiceSetOperation.getState());
 
-		choiceSet.cancel();
-		Answer<Void> cancelInteractionAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				CancelInteraction cancelInteraction = (CancelInteraction) args[0];
+        choiceSet.cancel();
+        Answer<Void> cancelInteractionAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                CancelInteraction cancelInteraction = (CancelInteraction) args[0];
 
-				assertEquals(cancelInteraction.getCancelID(), TestValues.GENERAL_INTEGER);
-				assertEquals(cancelInteraction.getInteractionFunctionID().intValue(), FunctionID.PERFORM_INTERACTION.getId());
+                assertEquals(cancelInteraction.getCancelID(), TestValues.GENERAL_INTEGER);
+                assertEquals(cancelInteraction.getInteractionFunctionID().intValue(), FunctionID.PERFORM_INTERACTION.getId());
 
-				RPCResponse response = new RPCResponse(FunctionID.CANCEL_INTERACTION.toString());
-				response.setSuccess(false);
-				cancelInteraction.getOnRPCResponseListener().onResponse(0, response);
+                RPCResponse response = new RPCResponse(FunctionID.CANCEL_INTERACTION.toString());
+                response.setSuccess(false);
+                cancelInteraction.getOnRPCResponseListener().onResponse(0, response);
 
-				return null;
-			}
-		};
-		doAnswer(cancelInteractionAnswer).when(internalInterface).sendRPC(any(CancelInteraction.class));
+                return null;
+            }
+        };
+        doAnswer(cancelInteractionAnswer).when(internalInterface).sendRPC(any(CancelInteraction.class));
 
-		verify(internalInterface, times(1)).sendRPC(any(CancelInteraction.class));
-		verify(internalInterface, times(1)).sendRPC(any(PerformInteraction.class));
+        verify(internalInterface, times(1)).sendRPC(any(CancelInteraction.class));
+        verify(internalInterface, times(1)).sendRPC(any(PerformInteraction.class));
 
-		assertEquals(Task.IN_PROGRESS, presentChoiceSetOperation.getState());
-	}
+        assertEquals(Task.IN_PROGRESS, presentChoiceSetOperation.getState());
+    }
 
-	@Test
-	public void testCancelingChoiceSetIfThreadHasFinished(){
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
-		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
-		presentChoiceSetOperation.finishOperation();
+    @Test
+    public void testCancelingChoiceSetIfThreadHasFinished() {
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
+        presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
+        presentChoiceSetOperation.finishOperation();
 
-		assertEquals(Task.FINISHED, presentChoiceSetOperation.getState());
+        assertEquals(Task.FINISHED, presentChoiceSetOperation.getState());
 
-		choiceSet.cancel();
-		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+        choiceSet.cancel();
+        verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
 
-		assertEquals(Task.FINISHED, presentChoiceSetOperation.getState());
-	}
+        assertEquals(Task.FINISHED, presentChoiceSetOperation.getState());
+    }
 
-	@Test
-	public void testCancelingChoiceSetIfThreadHasNotYetRun(){
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
-		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
+    @Test
+    public void testCancelingChoiceSetIfThreadHasNotYetRun() {
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
+        presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
 
-		assertEquals(Task.BLOCKED, presentChoiceSetOperation.getState());
+        assertEquals(Task.BLOCKED, presentChoiceSetOperation.getState());
 
-		choiceSet.cancel();
+        choiceSet.cancel();
 
-		// Once the operation has started
-		queue.add(presentChoiceSetOperation, false);
-		sleep();
+        // Once the operation has started
+        queue.add(presentChoiceSetOperation, false);
+        sleep();
 
-		assertEquals(Task.CANCELED, presentChoiceSetOperation.getState());
+        assertEquals(Task.CANCELED, presentChoiceSetOperation.getState());
 
-		// Make sure neither a `CancelInteraction` or `PerformInteraction` RPC is ever sent
-		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
-		verify(internalInterface, never()).sendRPC(any(PerformInteraction.class));
-	}
+        // Make sure neither a `CancelInteraction` or `PerformInteraction` RPC is ever sent
+        verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+        verify(internalInterface, never()).sendRPC(any(PerformInteraction.class));
+    }
 
-	@Test
-	public void testCancelingChoiceSetIfHeadUnitDoesNotSupportFeature(){
-		// Cancel Interaction is only supported on RPC specs v.6.0.0+
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(5, 3));
-		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
-		queue.add(presentChoiceSetOperation, false);
-		sleep();
+    @Test
+    public void testCancelingChoiceSetIfHeadUnitDoesNotSupportFeature() {
+        // Cancel Interaction is only supported on RPC specs v.6.0.0+
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(5, 3));
+        presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
+        queue.add(presentChoiceSetOperation, false);
+        sleep();
 
-		assertEquals(Task.IN_PROGRESS, presentChoiceSetOperation.getState());
+        assertEquals(Task.IN_PROGRESS, presentChoiceSetOperation.getState());
 
-		choiceSet.cancel();
+        choiceSet.cancel();
 
-		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
-		verify(internalInterface, times(1)).sendRPC(any(PerformInteraction.class));
-	}
+        verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+        verify(internalInterface, times(1)).sendRPC(any(PerformInteraction.class));
+    }
 
-	@Test
-	public void testCancelingChoiceSetIfHeadUnitDoesNotSupportFeatureButThreadIsNotRunning(){
-		// Cancel Interaction is only supported on RPC specs v.6.0.0+
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(5, 3));
-		presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
+    @Test
+    public void testCancelingChoiceSetIfHeadUnitDoesNotSupportFeatureButThreadIsNotRunning() {
+        // Cancel Interaction is only supported on RPC specs v.6.0.0+
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(5, 3));
+        presentChoiceSetOperation = new PresentChoiceSetOperation(internalInterface, choiceSet, InteractionMode.MANUAL_ONLY, null, null, choiceSetSelectionListener, TestValues.GENERAL_INTEGER);
 
-		assertEquals(Task.BLOCKED, presentChoiceSetOperation.getState());
+        assertEquals(Task.BLOCKED, presentChoiceSetOperation.getState());
 
-		choiceSet.cancel();
+        choiceSet.cancel();
 
-		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+        verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
 
-		// Once the operation has started
-		queue.add(presentChoiceSetOperation, false);
-		sleep();
+        // Once the operation has started
+        queue.add(presentChoiceSetOperation, false);
+        sleep();
 
-		assertEquals(Task.CANCELED, presentChoiceSetOperation.getState());
+        assertEquals(Task.CANCELED, presentChoiceSetOperation.getState());
 
-		// Make sure neither a `CancelInteraction` or `PerformInteraction` RPC is ever sent
-		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
-		verify(internalInterface, never()).sendRPC(any(PerformInteraction.class));
-	}
+        // Make sure neither a `CancelInteraction` or `PerformInteraction` RPC is ever sent
+        verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+        verify(internalInterface, never()).sendRPC(any(PerformInteraction.class));
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java
index 6eb3a1912..5d6df7958 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperationTests.java
@@ -40,9 +40,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.livio.taskmaster.Queue;
 import com.livio.taskmaster.Task;
 import com.livio.taskmaster.Taskmaster;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCResponse;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.CancelInteraction;
 import com.smartdevicelink.proxy.rpc.KeyboardProperties;
 import com.smartdevicelink.proxy.rpc.PerformInteraction;
@@ -73,204 +73,204 @@ import static org.mockito.Mockito.when;
 @RunWith(AndroidJUnit4.class)
 public class PresentKeyboardOperationTests {
 
-	private PresentKeyboardOperation presentKeyboardOperation;
-	private KeyboardListener keyboardListener;
-	private ISdl internalInterface;
-
-	private Taskmaster taskmaster;
-	private Queue queue;
-
-	@Before
-	public void setUp() throws Exception{
-
-		internalInterface = mock(ISdl.class);
-		keyboardListener = mock(KeyboardListener.class);
-
-		Answer<Void> setGlobalPropertiesAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				SetGlobalProperties setGlobalProperties = (SetGlobalProperties) args[0];
-
-				RPCResponse response = new RPCResponse(FunctionID.SET_GLOBAL_PROPERTIES.toString());
-				response.setSuccess(true);
-				setGlobalProperties.getOnRPCResponseListener().onResponse(0, response);
-
-				return null;
-			}
-		};
-		doAnswer(setGlobalPropertiesAnswer).when(internalInterface).sendRPC(any(SetGlobalProperties.class));
-
-		taskmaster = new Taskmaster.Builder().build();
-		queue = taskmaster.createQueue("test", 100, false);
-		taskmaster.start();
-	}
-
-	private KeyboardProperties getKeyBoardProperties(){
-		KeyboardProperties properties = new KeyboardProperties();
-		properties.setLanguage(Language.EN_US);
-		properties.setKeyboardLayout(KeyboardLayout.QWERTZ);
-		properties.setKeypressMode(KeypressMode.RESEND_CURRENT_ENTRY);
-		return properties;
-	}
-
-	@Test
-	public void testGetPerformInteraction(){
-		presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, getKeyBoardProperties(), "Test", null, keyboardListener, TestValues.GENERAL_INTEGER);
-
-		PerformInteraction pi = presentKeyboardOperation.getPerformInteraction();
-		assertEquals(pi.getInitialText(), "Test");
-		assertNull(pi.getHelpPrompt());
-		assertNull(pi.getTimeoutPrompt());
-		assertNull(pi.getVrHelp());
-		assertEquals(pi.getInteractionLayout(), LayoutMode.KEYBOARD);
-		assertEquals(pi.getCancelID(), TestValues.GENERAL_INTEGER);
-	}
-
-	private void sleep() {
-		try {
-			Thread.sleep(100);
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	@Test
-	public void testCancelingKeyboardSuccessfullyIfThreadIsRunning(){
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
-		presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
-		queue.add(presentKeyboardOperation, false);
-		sleep();
-
-		assertEquals(Task.IN_PROGRESS, presentKeyboardOperation.getState());
-
-		presentKeyboardOperation.dismissKeyboard();
-		Answer<Void> cancelInteractionAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				CancelInteraction cancelInteraction = (CancelInteraction) args[0];
-
-				assertEquals(cancelInteraction.getCancelID(), TestValues.GENERAL_INTEGER);
-				assertEquals(cancelInteraction.getInteractionFunctionID().intValue(), FunctionID.PERFORM_INTERACTION.getId());
-
-				RPCResponse response = new RPCResponse(FunctionID.CANCEL_INTERACTION.toString());
-				response.setSuccess(true);
-				cancelInteraction.getOnRPCResponseListener().onResponse(0, response);
-
-				return null;
-			}
-		};
-		doAnswer(cancelInteractionAnswer).when(internalInterface).sendRPC(any(CancelInteraction.class));
-
-		verify(internalInterface, times(1)).sendRPC(any(CancelInteraction.class));
-		verify(internalInterface, times(1)).sendRPC(any(PerformInteraction.class));
-
-		assertEquals(Task.IN_PROGRESS, presentKeyboardOperation.getState());
-	}
-
-	@Test
-	public void testCancelingKeyboardUnsuccessfullyIfThreadIsRunning(){
+    private PresentKeyboardOperation presentKeyboardOperation;
+    private KeyboardListener keyboardListener;
+    private ISdl internalInterface;
+
+    private Taskmaster taskmaster;
+    private Queue queue;
+
+    @Before
+    public void setUp() throws Exception {
+
+        internalInterface = mock(ISdl.class);
+        keyboardListener = mock(KeyboardListener.class);
+
+        Answer<Void> setGlobalPropertiesAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                SetGlobalProperties setGlobalProperties = (SetGlobalProperties) args[0];
+
+                RPCResponse response = new RPCResponse(FunctionID.SET_GLOBAL_PROPERTIES.toString());
+                response.setSuccess(true);
+                setGlobalProperties.getOnRPCResponseListener().onResponse(0, response);
+
+                return null;
+            }
+        };
+        doAnswer(setGlobalPropertiesAnswer).when(internalInterface).sendRPC(any(SetGlobalProperties.class));
+
+        taskmaster = new Taskmaster.Builder().build();
+        queue = taskmaster.createQueue("test", 100, false);
+        taskmaster.start();
+    }
+
+    private KeyboardProperties getKeyBoardProperties() {
+        KeyboardProperties properties = new KeyboardProperties();
+        properties.setLanguage(Language.EN_US);
+        properties.setKeyboardLayout(KeyboardLayout.QWERTZ);
+        properties.setKeypressMode(KeypressMode.RESEND_CURRENT_ENTRY);
+        return properties;
+    }
+
+    @Test
+    public void testGetPerformInteraction() {
+        presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, getKeyBoardProperties(), "Test", null, keyboardListener, TestValues.GENERAL_INTEGER);
+
+        PerformInteraction pi = presentKeyboardOperation.getPerformInteraction();
+        assertEquals(pi.getInitialText(), "Test");
+        assertNull(pi.getHelpPrompt());
+        assertNull(pi.getTimeoutPrompt());
+        assertNull(pi.getVrHelp());
+        assertEquals(pi.getInteractionLayout(), LayoutMode.KEYBOARD);
+        assertEquals(pi.getCancelID(), TestValues.GENERAL_INTEGER);
+    }
+
+    private void sleep() {
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testCancelingKeyboardSuccessfullyIfThreadIsRunning() {
         when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
         presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
         queue.add(presentKeyboardOperation, false);
         sleep();
 
+        assertEquals(Task.IN_PROGRESS, presentKeyboardOperation.getState());
+
         presentKeyboardOperation.dismissKeyboard();
         Answer<Void> cancelInteractionAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				CancelInteraction cancelInteraction = (CancelInteraction) args[0];
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                CancelInteraction cancelInteraction = (CancelInteraction) args[0];
 
-				assertEquals(cancelInteraction.getCancelID(), TestValues.GENERAL_INTEGER);
-				assertEquals(cancelInteraction.getInteractionFunctionID().intValue(), FunctionID.PERFORM_INTERACTION.getId());
+                assertEquals(cancelInteraction.getCancelID(), TestValues.GENERAL_INTEGER);
+                assertEquals(cancelInteraction.getInteractionFunctionID().intValue(), FunctionID.PERFORM_INTERACTION.getId());
 
-				RPCResponse response = new RPCResponse(FunctionID.CANCEL_INTERACTION.toString());
-				response.setSuccess(false);
-				cancelInteraction.getOnRPCResponseListener().onResponse(0, response);
+                RPCResponse response = new RPCResponse(FunctionID.CANCEL_INTERACTION.toString());
+                response.setSuccess(true);
+                cancelInteraction.getOnRPCResponseListener().onResponse(0, response);
 
-				return null;
-			}
-		};
-		doAnswer(cancelInteractionAnswer).when(internalInterface).sendRPC(any(CancelInteraction.class));
+                return null;
+            }
+        };
+        doAnswer(cancelInteractionAnswer).when(internalInterface).sendRPC(any(CancelInteraction.class));
 
         verify(internalInterface, times(1)).sendRPC(any(CancelInteraction.class));
         verify(internalInterface, times(1)).sendRPC(any(PerformInteraction.class));
 
-		assertEquals(Task.IN_PROGRESS, presentKeyboardOperation.getState());
-	}
+        assertEquals(Task.IN_PROGRESS, presentKeyboardOperation.getState());
+    }
 
-	@Test
-	public void testCancelingKeyboardIfThreadHasFinished(){
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
-		presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
-		presentKeyboardOperation.finishOperation();
+    @Test
+    public void testCancelingKeyboardUnsuccessfullyIfThreadIsRunning() {
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
+        presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
+        queue.add(presentKeyboardOperation, false);
+        sleep();
 
-		assertEquals(Task.FINISHED, presentKeyboardOperation.getState());
+        presentKeyboardOperation.dismissKeyboard();
+        Answer<Void> cancelInteractionAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                CancelInteraction cancelInteraction = (CancelInteraction) args[0];
 
-		presentKeyboardOperation.dismissKeyboard();
-		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+                assertEquals(cancelInteraction.getCancelID(), TestValues.GENERAL_INTEGER);
+                assertEquals(cancelInteraction.getInteractionFunctionID().intValue(), FunctionID.PERFORM_INTERACTION.getId());
 
-		assertEquals(Task.FINISHED, presentKeyboardOperation.getState());
-	}
+                RPCResponse response = new RPCResponse(FunctionID.CANCEL_INTERACTION.toString());
+                response.setSuccess(false);
+                cancelInteraction.getOnRPCResponseListener().onResponse(0, response);
 
-	@Test
-	public void testCancelingKeyboardIfThreadHasNotYetRun(){
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
-		presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
+                return null;
+            }
+        };
+        doAnswer(cancelInteractionAnswer).when(internalInterface).sendRPC(any(CancelInteraction.class));
 
-		assertEquals(Task.BLOCKED, presentKeyboardOperation.getState());
+        verify(internalInterface, times(1)).sendRPC(any(CancelInteraction.class));
+        verify(internalInterface, times(1)).sendRPC(any(PerformInteraction.class));
 
-		presentKeyboardOperation.dismissKeyboard();
+        assertEquals(Task.IN_PROGRESS, presentKeyboardOperation.getState());
+    }
 
-		// Once the operation has started
-		queue.add(presentKeyboardOperation, false);
-		sleep();
+    @Test
+    public void testCancelingKeyboardIfThreadHasFinished() {
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
+        presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
+        presentKeyboardOperation.finishOperation();
 
-		assertEquals(Task.CANCELED, presentKeyboardOperation.getState());
+        assertEquals(Task.FINISHED, presentKeyboardOperation.getState());
 
-		// Make sure neither a `CancelInteraction` or `PerformInteraction` RPC is ever sent
-		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
-		verify(internalInterface, never()).sendRPC(any(PerformInteraction.class));
-	}
+        presentKeyboardOperation.dismissKeyboard();
+        verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
 
-	@Test
-	public void testCancelingChoiceSetIfHeadUnitDoesNotSupportFeature(){
-		// Cancel Interaction is only supported on RPC specs v.6.0.0+
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(5, 3));
-		presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
-		queue.add(presentKeyboardOperation, false);
-		sleep();
+        assertEquals(Task.FINISHED, presentKeyboardOperation.getState());
+    }
 
-		assertEquals(Task.IN_PROGRESS, presentKeyboardOperation.getState());
+    @Test
+    public void testCancelingKeyboardIfThreadHasNotYetRun() {
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(6, 0));
+        presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
 
-		presentKeyboardOperation.dismissKeyboard();
+        assertEquals(Task.BLOCKED, presentKeyboardOperation.getState());
 
-		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
-		verify(internalInterface, times(1)).sendRPC(any(PerformInteraction.class));
-	}
+        presentKeyboardOperation.dismissKeyboard();
 
-	@Test
-	public void testCancelingChoiceSetIfHeadUnitDoesNotSupportFeatureButThreadIsNotRunning(){
-		// Cancel Interaction is only supported on RPC specs v.6.0.0+
-		when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(5, 3));
-		presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
+        // Once the operation has started
+        queue.add(presentKeyboardOperation, false);
+        sleep();
+
+        assertEquals(Task.CANCELED, presentKeyboardOperation.getState());
 
-		assertEquals(Task.BLOCKED, presentKeyboardOperation.getState());
+        // Make sure neither a `CancelInteraction` or `PerformInteraction` RPC is ever sent
+        verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+        verify(internalInterface, never()).sendRPC(any(PerformInteraction.class));
+    }
 
-		presentKeyboardOperation.dismissKeyboard();
+    @Test
+    public void testCancelingChoiceSetIfHeadUnitDoesNotSupportFeature() {
+        // Cancel Interaction is only supported on RPC specs v.6.0.0+
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(5, 3));
+        presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
+        queue.add(presentKeyboardOperation, false);
+        sleep();
 
-		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+        assertEquals(Task.IN_PROGRESS, presentKeyboardOperation.getState());
+
+        presentKeyboardOperation.dismissKeyboard();
+
+        verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+        verify(internalInterface, times(1)).sendRPC(any(PerformInteraction.class));
+    }
 
-		// Once the operation has started
-		queue.add(presentKeyboardOperation, false);
-		sleep();
+    @Test
+    public void testCancelingChoiceSetIfHeadUnitDoesNotSupportFeatureButThreadIsNotRunning() {
+        // Cancel Interaction is only supported on RPC specs v.6.0.0+
+        when(internalInterface.getSdlMsgVersion()).thenReturn(new SdlMsgVersion(5, 3));
+        presentKeyboardOperation = new PresentKeyboardOperation(internalInterface, null, "Test", null, null, TestValues.GENERAL_INTEGER);
+
+        assertEquals(Task.BLOCKED, presentKeyboardOperation.getState());
+
+        presentKeyboardOperation.dismissKeyboard();
+
+        verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+
+        // Once the operation has started
+        queue.add(presentKeyboardOperation, false);
+        sleep();
 
-		assertEquals(Task.CANCELED, presentKeyboardOperation.getState());
+        assertEquals(Task.CANCELED, presentKeyboardOperation.getState());
 
-		// Make sure neither a `CancelInteraction` or `PerformInteraction` RPC is ever sent
-		verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
-		verify(internalInterface, never()).sendRPC(any(PerformInteraction.class));
-	}
+        // Make sure neither a `CancelInteraction` or `PerformInteraction` RPC is ever sent
+        verify(internalInterface, never()).sendRPC(any(CancelInteraction.class));
+        verify(internalInterface, never()).sendRPC(any(PerformInteraction.class));
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdatesModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdatesModeTests.java
index 2d2a8853c..27cd9ff1c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdatesModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/DynamicMenuUpdatesModeTests.java
@@ -40,60 +40,60 @@ import java.util.List;
 
 public class DynamicMenuUpdatesModeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "FORCE_ON";
-		DynamicMenuUpdatesMode forceOn = DynamicMenuUpdatesMode.valueForString(example);
-		example = "FORCE_OFF";
-		DynamicMenuUpdatesMode forceOff = DynamicMenuUpdatesMode.valueForString(example);
-		example = "ON_WITH_COMPAT_MODE";
-		DynamicMenuUpdatesMode onWithCompatMode = DynamicMenuUpdatesMode.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "FORCE_ON";
+        DynamicMenuUpdatesMode forceOn = DynamicMenuUpdatesMode.valueForString(example);
+        example = "FORCE_OFF";
+        DynamicMenuUpdatesMode forceOff = DynamicMenuUpdatesMode.valueForString(example);
+        example = "ON_WITH_COMPAT_MODE";
+        DynamicMenuUpdatesMode onWithCompatMode = DynamicMenuUpdatesMode.valueForString(example);
 
-		assertNotNull("FORCE_ON returned null", forceOn);
-		assertNotNull("FORCE_OFF returned null", forceOff);
-		assertNotNull("ON_WITH_COMPAT_MODE returned null", onWithCompatMode);
-	}
+        assertNotNull("FORCE_ON returned null", forceOn);
+        assertNotNull("FORCE_OFF returned null", forceOff);
+        assertNotNull("ON_WITH_COMPAT_MODE returned null", onWithCompatMode);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "deFaUlt";
-		try {
-			DynamicMenuUpdatesMode temp = DynamicMenuUpdatesMode.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "deFaUlt";
+        try {
+            DynamicMenuUpdatesMode temp = DynamicMenuUpdatesMode.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			DynamicMenuUpdatesMode temp = DynamicMenuUpdatesMode.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            DynamicMenuUpdatesMode temp = DynamicMenuUpdatesMode.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of DynamicMenuUpdatesMode.
-	 */
-	public void testListEnum() {
-		List<DynamicMenuUpdatesMode> enumValueList = Arrays.asList(DynamicMenuUpdatesMode.values());
+    /**
+     * Verifies the possible enum values of DynamicMenuUpdatesMode.
+     */
+    public void testListEnum() {
+        List<DynamicMenuUpdatesMode> enumValueList = Arrays.asList(DynamicMenuUpdatesMode.values());
 
-		List<DynamicMenuUpdatesMode> enumTestList = new ArrayList<>();
-		enumTestList.add(DynamicMenuUpdatesMode.FORCE_ON);
-		enumTestList.add(DynamicMenuUpdatesMode.FORCE_OFF);
-		enumTestList.add(DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE);
+        List<DynamicMenuUpdatesMode> enumTestList = new ArrayList<>();
+        enumTestList.add(DynamicMenuUpdatesMode.FORCE_ON);
+        enumTestList.add(DynamicMenuUpdatesMode.FORCE_OFF);
+        enumTestList.add(DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java
index eae5b530a..dfd0477e5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java
@@ -54,116 +54,115 @@ import static junit.framework.TestCase.assertTrue;
 @RunWith(AndroidJUnit4.class)
 public class MenuCellTests {
 
-	private MenuSelectionListener menuSelectionListener = new MenuSelectionListener() {
-		@Override
-		public void onTriggered(TriggerSource trigger) {
-			// stuff
-		}
-	};
+    private MenuSelectionListener menuSelectionListener = new MenuSelectionListener() {
+        @Override
+        public void onTriggered(TriggerSource trigger) {
+            // stuff
+        }
+    };
 
-	@Test
-	public void testSettersAndGetters(){
+    @Test
+    public void testSettersAndGetters() {
 
-		// set everything
-		MenuCell menuCell = new MenuCell(TestValues.GENERAL_STRING, null, null, menuSelectionListener);
-		menuCell.setIcon(TestValues.GENERAL_ARTWORK);
-		menuCell.setVoiceCommands(TestValues.GENERAL_STRING_LIST);
-		menuCell.setMenuSelectionListener(menuSelectionListener);
-		menuCell.setSubMenuLayout(TestValues.GENERAL_MENU_LAYOUT);
+        // set everything
+        MenuCell menuCell = new MenuCell(TestValues.GENERAL_STRING, null, null, menuSelectionListener);
+        menuCell.setIcon(TestValues.GENERAL_ARTWORK);
+        menuCell.setVoiceCommands(TestValues.GENERAL_STRING_LIST);
+        menuCell.setMenuSelectionListener(menuSelectionListener);
+        menuCell.setSubMenuLayout(TestValues.GENERAL_MENU_LAYOUT);
 
-		// use getters and assert equality
-		assertEquals(menuCell.getTitle(), TestValues.GENERAL_STRING);
-		assertEquals(menuCell.getIcon(), TestValues.GENERAL_ARTWORK);
-		assertEquals(menuCell.getVoiceCommands(), TestValues.GENERAL_STRING_LIST);
-		assertEquals(menuCell.getMenuSelectionListener(), menuSelectionListener);
-		assertEquals(menuCell.getCellId(), TestValues.GENERAL_MENU_MAX_ID);
-		assertEquals(menuCell.getParentCellId(), TestValues.GENERAL_MENU_MAX_ID);
-		assertEquals(menuCell.getSubMenuLayout(), TestValues.GENERAL_MENU_LAYOUT);
-	}
+        // use getters and assert equality
+        assertEquals(menuCell.getTitle(), TestValues.GENERAL_STRING);
+        assertEquals(menuCell.getIcon(), TestValues.GENERAL_ARTWORK);
+        assertEquals(menuCell.getVoiceCommands(), TestValues.GENERAL_STRING_LIST);
+        assertEquals(menuCell.getMenuSelectionListener(), menuSelectionListener);
+        assertEquals(menuCell.getCellId(), TestValues.GENERAL_MENU_MAX_ID);
+        assertEquals(menuCell.getParentCellId(), TestValues.GENERAL_MENU_MAX_ID);
+        assertEquals(menuCell.getSubMenuLayout(), TestValues.GENERAL_MENU_LAYOUT);
+    }
 
-	@Test
-	public void testConstructors(){
+    @Test
+    public void testConstructors() {
 
-		// first constructor was tested in previous method, use the last two here
+        // first constructor was tested in previous method, use the last two here
 
-		MenuCell menuCell3 =new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
-		assertEquals(menuCell3.getTitle(), TestValues.GENERAL_STRING);
-		assertEquals(menuCell3.getIcon(), TestValues.GENERAL_ARTWORK);
-		assertEquals(menuCell3.getVoiceCommands(), TestValues.GENERAL_STRING_LIST);
-		assertEquals(menuCell3.getMenuSelectionListener(), menuSelectionListener);
+        MenuCell menuCell3 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
+        assertEquals(menuCell3.getTitle(), TestValues.GENERAL_STRING);
+        assertEquals(menuCell3.getIcon(), TestValues.GENERAL_ARTWORK);
+        assertEquals(menuCell3.getVoiceCommands(), TestValues.GENERAL_STRING_LIST);
+        assertEquals(menuCell3.getMenuSelectionListener(), menuSelectionListener);
 
-		MenuCell menuCell4 =new MenuCell(TestValues.GENERAL_STRING,null, null, menuSelectionListener);
-		assertEquals(menuCell4.getTitle(), TestValues.GENERAL_STRING);
-		assertEquals(menuCell4.getMenuSelectionListener(), menuSelectionListener);
+        MenuCell menuCell4 = new MenuCell(TestValues.GENERAL_STRING, null, null, menuSelectionListener);
+        assertEquals(menuCell4.getTitle(), TestValues.GENERAL_STRING);
+        assertEquals(menuCell4.getMenuSelectionListener(), menuSelectionListener);
 
-		MenuCell menuCell5 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_MENU_LAYOUT, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_MENUCELL_LIST);
-		assertEquals(menuCell5.getTitle(), TestValues.GENERAL_STRING);
-		assertEquals(menuCell5.getIcon(), TestValues.GENERAL_ARTWORK);
-		assertEquals(menuCell5.getSubMenuLayout(), TestValues.GENERAL_MENU_LAYOUT);
-		assertEquals(menuCell5.getSubCells(), TestValues.GENERAL_MENUCELL_LIST);
-	}
+        MenuCell menuCell5 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_MENU_LAYOUT, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_MENUCELL_LIST);
+        assertEquals(menuCell5.getTitle(), TestValues.GENERAL_STRING);
+        assertEquals(menuCell5.getIcon(), TestValues.GENERAL_ARTWORK);
+        assertEquals(menuCell5.getSubMenuLayout(), TestValues.GENERAL_MENU_LAYOUT);
+        assertEquals(menuCell5.getSubCells(), TestValues.GENERAL_MENUCELL_LIST);
+    }
 
-	@Test
-	public void testEquality(){
+    @Test
+    public void testEquality() {
 
-		//We should use assertTrue (or assertFalse) because we want to use the overridden equals() method
+        //We should use assertTrue (or assertFalse) because we want to use the overridden equals() method
 
-		MenuCell menuCell = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
-		MenuCell menuCell2 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
+        MenuCell menuCell = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
+        MenuCell menuCell2 = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
 
-		// these are the same object, should be equal.
-		assertTrue(menuCell.equals(menuCell));
+        // these are the same object, should be equal.
+        assertTrue(menuCell.equals(menuCell));
 
-		// Make sure these are marked as equals, even though they are different objects
-		assertTrue(menuCell.equals(menuCell2));
+        // Make sure these are marked as equals, even though they are different objects
+        assertTrue(menuCell.equals(menuCell2));
 
-		MenuCell menuCell3 = new MenuCell(TestValues.GENERAL_STRING, null, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
+        MenuCell menuCell3 = new MenuCell(TestValues.GENERAL_STRING, null, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
 
-		// these should be different
-		assertFalse(menuCell.equals(menuCell3));
-	}
+        // these should be different
+        assertFalse(menuCell.equals(menuCell3));
+    }
 
-	@Test
-	public void testClone(){
-		MenuCell original = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
-		MenuCell clone = original.clone();
+    @Test
+    public void testClone() {
+        MenuCell original = new MenuCell(TestValues.GENERAL_STRING, TestValues.GENERAL_ARTWORK, TestValues.GENERAL_STRING_LIST, menuSelectionListener);
+        MenuCell clone = original.clone();
 
-		assertNotNull(clone);
-		assertNotSame(original, clone);
+        assertNotNull(clone);
+        assertNotSame(original, clone);
 
-		assertEquals(original.getTitle(), clone.getTitle());
-		assertEquals(original.getCellId(), clone.getCellId());
-		assertEquals(original.getParentCellId(), clone.getParentCellId());
+        assertEquals(original.getTitle(), clone.getTitle());
+        assertEquals(original.getCellId(), clone.getCellId());
+        assertEquals(original.getParentCellId(), clone.getParentCellId());
 
-		SdlArtworkTests.equalTest(original.getIcon(), clone.getIcon());
+        SdlArtworkTests.equalTest(original.getIcon(), clone.getIcon());
 
-		//Test subcells
-		List<MenuCell> subcells = new ArrayList<>();
-		subcells.add(original.clone());
-		subcells.add(clone.clone());
+        //Test subcells
+        List<MenuCell> subcells = new ArrayList<>();
+        subcells.add(original.clone());
+        subcells.add(clone.clone());
 
-		original = new MenuCell(TestValues.GENERAL_STRING, MenuLayout.LIST, TestValues.GENERAL_ARTWORK,subcells);
-		clone = original.clone();
+        original = new MenuCell(TestValues.GENERAL_STRING, MenuLayout.LIST, TestValues.GENERAL_ARTWORK, subcells);
+        clone = original.clone();
 
-		assertNotNull(original.getSubCells());
-		assertNotNull(clone.getSubCells());
-		assertNotSame(original.getSubCells(), clone.getSubCells());
+        assertNotNull(original.getSubCells());
+        assertNotNull(clone.getSubCells());
+        assertNotSame(original.getSubCells(), clone.getSubCells());
 
-		List<MenuCell> originalSubCells = original.getSubCells();
-		List<MenuCell> cloneSubCells = clone.getSubCells();
+        List<MenuCell> originalSubCells = original.getSubCells();
+        List<MenuCell> cloneSubCells = clone.getSubCells();
 
-		assertEquals(originalSubCells.size(), cloneSubCells.size());
+        assertEquals(originalSubCells.size(), cloneSubCells.size());
 
-		for(int i = 0; i < originalSubCells.size(); i++){
+        for (int i = 0; i < originalSubCells.size(); i++) {
 
-			assertNotNull(originalSubCells.get(i));
-			assertNotNull(cloneSubCells.get(i));
+            assertNotNull(originalSubCells.get(i));
+            assertNotNull(cloneSubCells.get(i));
 
-			assertNotSame(originalSubCells.get(i), cloneSubCells.get(i));
-		}
+            assertNotSame(originalSubCells.get(i), cloneSubCells.get(i));
+        }
 
 
-
-	}
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuConfigurationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuConfigurationTests.java
index 2986d496a..5498ebe73 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuConfigurationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuConfigurationTests.java
@@ -48,14 +48,14 @@ import static junit.framework.TestCase.assertEquals;
 public class MenuConfigurationTests {
 
 
-	@Test
-	public void testSettersAndGetters(){
+    @Test
+    public void testSettersAndGetters() {
 
-		// set everything - we only use the constructor to set variables in the Menu Manager
-		MenuConfiguration menuConfiguration = new MenuConfiguration(TestValues.GENERAL_MENU_LAYOUT, TestValues.GENERAL_MENU_LAYOUT);
+        // set everything - we only use the constructor to set variables in the Menu Manager
+        MenuConfiguration menuConfiguration = new MenuConfiguration(TestValues.GENERAL_MENU_LAYOUT, TestValues.GENERAL_MENU_LAYOUT);
 
-		// use getters and assert equality
-		assertEquals(menuConfiguration.getMenuLayout(), TestValues.GENERAL_MENU_LAYOUT);
-		assertEquals(menuConfiguration.getSubMenuLayout(), TestValues.GENERAL_MENU_LAYOUT);
-	}
+        // use getters and assert equality
+        assertEquals(menuConfiguration.getMenuLayout(), TestValues.GENERAL_MENU_LAYOUT);
+        assertEquals(menuConfiguration.getSubMenuLayout(), TestValues.GENERAL_MENU_LAYOUT);
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
index 08b0deb86..43392b626 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java
@@ -37,12 +37,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.smartdevicelink.R;
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.RPCResponse;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.OnCommand;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
@@ -85,673 +85,673 @@ import static org.mockito.Mockito.verify;
 @RunWith(AndroidJUnit4.class)
 public class MenuManagerTests {
 
-	private OnRPCNotificationListener onHMIStatusListener, commandListener;
-	private MenuManager menuManager;
-	private List<MenuCell> cells;
-	private MenuCell mainCell1, mainCell4;
-
-	// SETUP / HELPERS
-
-	@Before
-	public void setUp() throws Exception{
-
-		cells = createTestCells();
-
-		final ISdl internalInterface = mock(ISdl.class);
-		FileManager fileManager = mock(FileManager.class);
-
-		// When internalInterface.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, OnRPCNotificationListener) is called
-		// inside MenuManager's constructor, then keep a reference to the OnRPCNotificationListener so we can trigger it later
-		// to emulate what Core does when it sends OnHMIStatus notification
-		Answer<Void> onHMIStatusAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				onHMIStatusListener = (OnRPCNotificationListener) args[1];
-				return null;
-			}
-		};
-		doAnswer(onHMIStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
-
-		Answer<Void> onCommandAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				commandListener = (OnRPCNotificationListener) args[1];
-				return null;
-			}
-		};
-		doAnswer(onCommandAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_COMMAND), any(OnRPCNotificationListener.class));
-
-		Answer<Void> answer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				RPCRequest request = (RPCRequest) args[0];
-				RPCResponse response = new RPCResponse(FunctionID.SET_GLOBAL_PROPERTIES.toString());
-				response.setSuccess(true);
-				request.getOnRPCResponseListener().onResponse(0, response);
-				return null;
-			}
-		};
-		doAnswer(answer).when(internalInterface).sendRPC(any(SetGlobalProperties.class));
-
-		menuManager = new MenuManager(internalInterface, fileManager);
-
-		// Check some stuff during setup
-		assertEquals(menuManager.currentHMILevel, HMILevel.HMI_NONE);
-		assertEquals(menuManager.getState(), BaseSubManager.SETTING_UP);
-		assertEquals(menuManager.currentSystemContext, SystemContext.SYSCTXT_MAIN);
-		assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE);
-		assertEquals(menuManager.lastMenuId, 1);
-		assertNull(menuManager.menuCells);
-		assertNull(menuManager.waitingUpdateMenuCells);
-		assertNull(menuManager.oldMenuCells);
-		assertNull(menuManager.inProgressUpdate);
-		assertNull(menuManager.keepsNew);
-		assertNull(menuManager.keepsOld);
-		assertNull(menuManager.menuConfiguration);
-		assertNotNull(menuManager.hmiListener);
-		assertNotNull(menuManager.commandListener);
-		assertNotNull(menuManager.onDisplaysCapabilityListener);
-
-	}
-
-	@After
-	public void tearDown() throws Exception {
-
-		menuManager.dispose();
-
-		assertEquals(menuManager.currentSystemContext, SystemContext.SYSCTXT_MAIN);
-		assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE);
-		assertEquals(menuManager.lastMenuId, 1);
-		assertNull(menuManager.menuCells);
-		assertNull(menuManager.oldMenuCells);
-		assertNull(menuManager.currentHMILevel);
-		assertNull(menuManager.defaultMainWindowCapability);
-		assertNull(menuManager.inProgressUpdate);
-		assertNull(menuManager.waitingUpdateMenuCells);
-		assertNull(menuManager.keepsNew);
-		assertNull(menuManager.keepsOld);
-		assertNull(menuManager.menuConfiguration);
-
-		// after everything, make sure we are in the correct state
-		assertEquals(menuManager.getState(), BaseSubManager.SHUTDOWN);
-
-	}
-
-	@Test
-	public void testStartMenuManager(){
-
-		menuManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				// Make sure the state has changed, as the Screen Manager is dependant on it
-				assertEquals(menuManager.getState(), BaseSubManager.READY);
-			}
-		});
-	}
-
-	@Test
-	public void testHMINotReady(){
-
-		menuManager.currentHMILevel = HMILevel.HMI_NONE;
-		menuManager.setMenuCells(cells);
-
-		// updating voice commands before HMI is ready
-		assertTrue(menuManager.waitingOnHMIUpdate);
-		// these are the 2 commands we have waiting
-		assertEquals(menuManager.waitingUpdateMenuCells.size(), 4);
-		assertEquals(menuManager.currentHMILevel, HMILevel.HMI_NONE);
-		// The Menu Manager should send new menu once HMI full occurs
-		sendFakeCoreOnHMIFullNotifications();
-		// Listener should be triggered - which sets new HMI level and should proceed to send our pending update
-		assertEquals(menuManager.currentHMILevel, HMILevel.HMI_FULL);
-		// This being false means it received the hmi notification and sent the pending commands
-		assertFalse(menuManager.waitingOnHMIUpdate);
-	}
-
-	@Test
-	public void testUpdatingOldWay(){
-
-		// Force Menu Manager to use the old way of deleting / sending all
-		menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_OFF);
-		assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_OFF);
-		// when we only send one command to update, we should only be returned one add command
-		List<MenuCell> newArray = Arrays.asList(mainCell1, mainCell4);
-		assertEquals(menuManager.allCommandsForCells(newArray, false).size(), 4); // 1 root cells, 1 sub menu root cell, 2 sub menu cells
-		menuManager.currentHMILevel = HMILevel.HMI_FULL;
-		menuManager.setMenuCells(newArray);
-		// Algorithm should NOT have run
-		assertNull(menuManager.keepsNew);
-		assertNull(menuManager.keepsOld);
-
-		// Unlike voice commands, the Menu Manager dynamically assigns Cell ID's. Because of this, we need to get the updated
-		// cell list after setting it and then test the listeners, as they use the newly assigned cell ID's.
-		List<MenuCell> updatedCells = menuManager.getMenuCells();
-
-		for (MenuCell cell : updatedCells){
-
-			// grab 2 of our newly updated cells - 1 root and 1 sub cell, and make sure they can get triggered
-			if (cell.getTitle().equalsIgnoreCase("Test Cell 1")){
-				// Fake onCommand - we want to make sure that we can pass back onCommand events to our root Menu Cell
-				OnCommand onCommand = new OnCommand();
-				onCommand.setCmdID(cell.getCellId());
-				onCommand.setTriggerSource(TriggerSource.TS_MENU); // these are menu commands
-				commandListener.onNotified(onCommand); // send off the notification
-
-				// verify the mock listener has only been hit once for a root cell
-				verify(cell.getMenuSelectionListener(), times(1)).onTriggered(TriggerSource.TS_MENU);
-			}
-
-			if (cell.getTitle().equalsIgnoreCase("SubCell 2")){
-				// Fake onCommand - we want to make sure that we can pass back onCommand events to our sub Menu Cell
-				OnCommand onCommand2 = new OnCommand();
-				onCommand2.setCmdID(cell.getCellId());
-				onCommand2.setTriggerSource(TriggerSource.TS_MENU); // these are menu commands
-				commandListener.onNotified(onCommand2); // send off the notification
-
-				// verify the mock listener has only been hit once for a sub cell
-				verify(cell.getMenuSelectionListener(), times(1)).onTriggered(TriggerSource.TS_MENU);
-			}
-		}
-	}
-
-	@Test
-	public void testAlgorithmTest1(){
-
-		// Force Menu Manager to use the new way
-		menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
-		assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_ON);
-
-		// start fresh
-		menuManager.oldMenuCells = null;
-		menuManager.menuCells = null;
-		menuManager.inProgressUpdate = null;
-		menuManager.waitingUpdateMenuCells = null;
-		menuManager.waitingOnHMIUpdate = false;
-
-		menuManager.currentHMILevel = HMILevel.HMI_FULL;
-		// send new cells. They should set the old way
-		List<MenuCell> oldMenu = createDynamicMenu1();
-		List<MenuCell> newMenu = createDynamicMenu1New();
-		menuManager.setMenuCells(oldMenu);
-		assertEquals(menuManager.menuCells.size(), 4);
-
-		// this happens in the menu manager but lets make sure its behaving
-		RunScore runScore = menuManager.runMenuCompareAlgorithm(oldMenu, newMenu);
-
-		List<Integer> oldMenuScore = Arrays.asList(0,0,0,0);
-		List<Integer> newMenuScore = Arrays.asList(0,0,0,0,1);
-
-		assertEquals(runScore.getScore(), 1);
-		assertEquals(runScore.getOldMenu(), oldMenuScore);
-		assertEquals(runScore.getCurrentMenu(), newMenuScore);
-
-		menuManager.setMenuCells(newMenu);
-		assertEquals(menuManager.menuCells.size(), 5);
-		assertEquals(menuManager.keepsNew.size(), 4);
-		assertEquals(menuManager.keepsOld.size(), 4);
-	}
-
-	@Test
-	public void testAlgorithmTest2(){
-
-		// Force Menu Manager to use the new way
-		menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
-		assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_ON);
-
-		// start fresh
-		menuManager.oldMenuCells = null;
-		menuManager.menuCells = null;
-		menuManager.inProgressUpdate = null;
-		menuManager.waitingUpdateMenuCells = null;
-		menuManager.waitingOnHMIUpdate = false;
-
-		menuManager.currentHMILevel = HMILevel.HMI_FULL;
-		// send new cells. They should set the old way
-		List<MenuCell> oldMenu = createDynamicMenu2();
-		List<MenuCell> newMenu = createDynamicMenu2New();
-		menuManager.setMenuCells(oldMenu);
-		assertEquals(menuManager.menuCells.size(), 4);
-
-		// this happens in the menu manager but lets make sure its behaving
-		RunScore runScore = menuManager.runMenuCompareAlgorithm(oldMenu, newMenu);
-
-		List<Integer> oldMenuScore = Arrays.asList(0,0,0,2);
-		List<Integer> newMenuScore = Arrays.asList(0,0,0);
-
-		assertEquals(runScore.getScore(), 0);
-		assertEquals(runScore.getOldMenu(), oldMenuScore);
-		assertEquals(runScore.getCurrentMenu(), newMenuScore);
-
-		menuManager.setMenuCells(newMenu);
-		assertEquals(menuManager.menuCells.size(), 3);
-		assertEquals(menuManager.keepsNew.size(), 3);
-		assertEquals(menuManager.keepsOld.size(), 3);
-	}
-
-	@Test
-	public void testAlgorithmTest3(){
-
-		// Force Menu Manager to use the new way
-		menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
-		assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_ON);
-
-		// start fresh
-		menuManager.oldMenuCells = null;
-		menuManager.menuCells = null;
-		menuManager.inProgressUpdate = null;
-		menuManager.waitingUpdateMenuCells = null;
-		menuManager.waitingOnHMIUpdate = false;
-
-		menuManager.currentHMILevel = HMILevel.HMI_FULL;
-		// send new cells. They should set the old way
-		List<MenuCell> oldMenu = createDynamicMenu3();
-		List<MenuCell> newMenu = createDynamicMenu3New();
-		menuManager.setMenuCells(oldMenu);
-		assertEquals(menuManager.menuCells.size(), 3);
-
-		// this happens in the menu manager but lets make sure its behaving
-		RunScore runScore = menuManager.runMenuCompareAlgorithm(oldMenu, newMenu);
-
-		List<Integer> oldMenuScore = Arrays.asList(2,2,2);
-		List<Integer> newMenuScore = Arrays.asList(1,1,1);
-
-		assertEquals(runScore.getScore(), 3);
-		assertEquals(runScore.getOldMenu(), oldMenuScore);
-		assertEquals(runScore.getCurrentMenu(), newMenuScore);
-
-		menuManager.setMenuCells(newMenu);
-		assertEquals(menuManager.menuCells.size(), 3);
-		assertEquals(menuManager.keepsNew.size(), 0);
-		assertEquals(menuManager.keepsOld.size(), 0);
-	}
-
-	@Test
-	public void testAlgorithmTest4(){
-
-		// Force Menu Manager to use the new way
-		menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
-		assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_ON);
-
-		// start fresh
-		menuManager.oldMenuCells = null;
-		menuManager.menuCells = null;
-		menuManager.inProgressUpdate = null;
-		menuManager.waitingUpdateMenuCells = null;
-		menuManager.waitingOnHMIUpdate = false;
-
-		menuManager.currentHMILevel = HMILevel.HMI_FULL;
-		// send new cells. They should set the old way
-		List<MenuCell> oldMenu = createDynamicMenu4();
-		List<MenuCell> newMenu = createDynamicMenu4New();
-		menuManager.setMenuCells(oldMenu);
-		assertEquals(menuManager.menuCells.size(), 4);
-
-		// this happens in the menu manager but lets make sure its behaving
-		RunScore runScore = menuManager.runMenuCompareAlgorithm(oldMenu, newMenu);
-
-		List<Integer> oldMenuScore = Arrays.asList(0,2,0,2);
-		List<Integer> newMenuScore = Arrays.asList(1,0,1,0);
-
-		assertEquals(runScore.getScore(), 2);
-		assertEquals(runScore.getOldMenu(), oldMenuScore);
-		assertEquals(runScore.getCurrentMenu(), newMenuScore);
-
-		menuManager.setMenuCells(newMenu);
-		assertEquals(menuManager.menuCells.size(), 4);
-		assertEquals(menuManager.keepsNew.size(), 2);
-		assertEquals(menuManager.keepsOld.size(), 2);
-	}
-
-	@Test
-	public void testAlgorithmTest5(){
-
-		// Force Menu Manager to use the new way
-		menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
-		assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_ON);
-
-		// start fresh
-		menuManager.oldMenuCells = null;
-		menuManager.menuCells = null;
-		menuManager.inProgressUpdate = null;
-		menuManager.waitingUpdateMenuCells = null;
-		menuManager.waitingOnHMIUpdate = false;
-
-		menuManager.currentHMILevel = HMILevel.HMI_FULL;
-		// send new cells. They should set the old way
-		List<MenuCell> oldMenu = createDynamicMenu5();
-		List<MenuCell> newMenu = createDynamicMenu5New();
-		menuManager.setMenuCells(oldMenu);
-		assertEquals(menuManager.menuCells.size(), 4);
-
-		// this happens in the menu manager but lets make sure its behaving
-		RunScore runScore = menuManager.runMenuCompareAlgorithm(oldMenu, newMenu);
-
-		List<Integer> oldMenuScore = Arrays.asList(2,0,0,0);
-		List<Integer> newMenuScore = Arrays.asList(0,0,0,1);
-
-		assertEquals(runScore.getScore(), 1);
-		assertEquals(runScore.getOldMenu(), oldMenuScore);
-		assertEquals(runScore.getCurrentMenu(), newMenuScore);
-
-		menuManager.setMenuCells(newMenu);
-		assertEquals(menuManager.menuCells.size(), 4);
-		assertEquals(menuManager.keepsNew.size(), 3);
-		assertEquals(menuManager.keepsOld.size(), 3);
-	}
-
-	@Test
-	public void testSettingNullMenu(){
-
-		// Make sure we can send an empty menu with no issues
-		// start fresh
-		menuManager.oldMenuCells = null;
-		menuManager.menuCells = null;
-		menuManager.inProgressUpdate = null;
-		menuManager.waitingUpdateMenuCells = null;
-		menuManager.waitingOnHMIUpdate = false;
-
-		menuManager.currentHMILevel = HMILevel.HMI_FULL;
-		// send new cells. They should set the old way
-		List<MenuCell> oldMenu = createDynamicMenu1();
-		List<MenuCell> newMenu = null;
-		menuManager.setMenuCells(oldMenu);
-		assertEquals(menuManager.menuCells.size(), 4);
-
-		menuManager.setMenuCells(newMenu);
-		assertEquals(menuManager.menuCells.size(), 0);
-	}
-
-	@Test
-	public void testClearingMenu(){
-
-		// Make sure we can send an empty menu with no issues
-		// start fresh
-		menuManager.oldMenuCells = null;
-		menuManager.menuCells = null;
-		menuManager.inProgressUpdate = null;
-		menuManager.waitingUpdateMenuCells = null;
-		menuManager.waitingOnHMIUpdate = false;
-
-		menuManager.currentHMILevel = HMILevel.HMI_FULL;
-		// send new cells. They should set the old way
-		List<MenuCell> oldMenu = createDynamicMenu1();
-		List<MenuCell> newMenu = Collections.emptyList();
-		menuManager.setMenuCells(oldMenu);
-		assertEquals(menuManager.menuCells.size(), 4);
-
-		menuManager.setMenuCells(newMenu);
-		assertEquals(menuManager.menuCells.size(), 0);
-	}
-
-	@Test
-	public void testOpeningMainMenu(){
-		// call open Menu
-		MenuManager mockMenuManager = mock(MenuManager.class);
-		mockMenuManager.openMenu();
-		verify(mockMenuManager, Mockito.times(1)).openMenu();
-	}
-
-	@Test
-	public void testOpeningSubMenuNullCells(){
-		// call open Menu
-		MenuManager mockMenuManager = mock(MenuManager.class);
-		MenuCell cell = mock(MenuCell.class);
-		mockMenuManager.oldMenuCells = null;
-		assertFalse(mockMenuManager.openSubMenu(cell));
-	}
-
-	@Test
-	public void testOpeningSubMenu(){
-		// call open Menu
-		List<MenuCell> testCells = createTestCells();
-		menuManager.oldMenuCells = testCells;
-		menuManager.sdlMsgVersion = new SdlMsgVersion(6,0);
-		// has to get success response to be true
-		assertTrue(menuManager.openSubMenu(testCells.get(3)));
-  }
+    private OnRPCNotificationListener onHMIStatusListener, commandListener;
+    private MenuManager menuManager;
+    private List<MenuCell> cells;
+    private MenuCell mainCell1, mainCell4;
+
+    // SETUP / HELPERS
+
+    @Before
+    public void setUp() throws Exception {
+
+        cells = createTestCells();
+
+        final ISdl internalInterface = mock(ISdl.class);
+        FileManager fileManager = mock(FileManager.class);
+
+        // When internalInterface.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, OnRPCNotificationListener) is called
+        // inside MenuManager's constructor, then keep a reference to the OnRPCNotificationListener so we can trigger it later
+        // to emulate what Core does when it sends OnHMIStatus notification
+        Answer<Void> onHMIStatusAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                onHMIStatusListener = (OnRPCNotificationListener) args[1];
+                return null;
+            }
+        };
+        doAnswer(onHMIStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
+
+        Answer<Void> onCommandAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                commandListener = (OnRPCNotificationListener) args[1];
+                return null;
+            }
+        };
+        doAnswer(onCommandAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_COMMAND), any(OnRPCNotificationListener.class));
+
+        Answer<Void> answer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                RPCRequest request = (RPCRequest) args[0];
+                RPCResponse response = new RPCResponse(FunctionID.SET_GLOBAL_PROPERTIES.toString());
+                response.setSuccess(true);
+                request.getOnRPCResponseListener().onResponse(0, response);
+                return null;
+            }
+        };
+        doAnswer(answer).when(internalInterface).sendRPC(any(SetGlobalProperties.class));
+
+        menuManager = new MenuManager(internalInterface, fileManager);
+
+        // Check some stuff during setup
+        assertEquals(menuManager.currentHMILevel, HMILevel.HMI_NONE);
+        assertEquals(menuManager.getState(), BaseSubManager.SETTING_UP);
+        assertEquals(menuManager.currentSystemContext, SystemContext.SYSCTXT_MAIN);
+        assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE);
+        assertEquals(menuManager.lastMenuId, 1);
+        assertNull(menuManager.menuCells);
+        assertNull(menuManager.waitingUpdateMenuCells);
+        assertNull(menuManager.oldMenuCells);
+        assertNull(menuManager.inProgressUpdate);
+        assertNull(menuManager.keepsNew);
+        assertNull(menuManager.keepsOld);
+        assertNull(menuManager.menuConfiguration);
+        assertNotNull(menuManager.hmiListener);
+        assertNotNull(menuManager.commandListener);
+        assertNotNull(menuManager.onDisplaysCapabilityListener);
+
+    }
+
+    @After
+    public void tearDown() throws Exception {
+
+        menuManager.dispose();
+
+        assertEquals(menuManager.currentSystemContext, SystemContext.SYSCTXT_MAIN);
+        assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.ON_WITH_COMPAT_MODE);
+        assertEquals(menuManager.lastMenuId, 1);
+        assertNull(menuManager.menuCells);
+        assertNull(menuManager.oldMenuCells);
+        assertNull(menuManager.currentHMILevel);
+        assertNull(menuManager.defaultMainWindowCapability);
+        assertNull(menuManager.inProgressUpdate);
+        assertNull(menuManager.waitingUpdateMenuCells);
+        assertNull(menuManager.keepsNew);
+        assertNull(menuManager.keepsOld);
+        assertNull(menuManager.menuConfiguration);
+
+        // after everything, make sure we are in the correct state
+        assertEquals(menuManager.getState(), BaseSubManager.SHUTDOWN);
+
+    }
+
+    @Test
+    public void testStartMenuManager() {
+
+        menuManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                // Make sure the state has changed, as the Screen Manager is dependant on it
+                assertEquals(menuManager.getState(), BaseSubManager.READY);
+            }
+        });
+    }
+
+    @Test
+    public void testHMINotReady() {
+
+        menuManager.currentHMILevel = HMILevel.HMI_NONE;
+        menuManager.setMenuCells(cells);
+
+        // updating voice commands before HMI is ready
+        assertTrue(menuManager.waitingOnHMIUpdate);
+        // these are the 2 commands we have waiting
+        assertEquals(menuManager.waitingUpdateMenuCells.size(), 4);
+        assertEquals(menuManager.currentHMILevel, HMILevel.HMI_NONE);
+        // The Menu Manager should send new menu once HMI full occurs
+        sendFakeCoreOnHMIFullNotifications();
+        // Listener should be triggered - which sets new HMI level and should proceed to send our pending update
+        assertEquals(menuManager.currentHMILevel, HMILevel.HMI_FULL);
+        // This being false means it received the hmi notification and sent the pending commands
+        assertFalse(menuManager.waitingOnHMIUpdate);
+    }
+
+    @Test
+    public void testUpdatingOldWay() {
+
+        // Force Menu Manager to use the old way of deleting / sending all
+        menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_OFF);
+        assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_OFF);
+        // when we only send one command to update, we should only be returned one add command
+        List<MenuCell> newArray = Arrays.asList(mainCell1, mainCell4);
+        assertEquals(menuManager.allCommandsForCells(newArray, false).size(), 4); // 1 root cells, 1 sub menu root cell, 2 sub menu cells
+        menuManager.currentHMILevel = HMILevel.HMI_FULL;
+        menuManager.setMenuCells(newArray);
+        // Algorithm should NOT have run
+        assertNull(menuManager.keepsNew);
+        assertNull(menuManager.keepsOld);
+
+        // Unlike voice commands, the Menu Manager dynamically assigns Cell ID's. Because of this, we need to get the updated
+        // cell list after setting it and then test the listeners, as they use the newly assigned cell ID's.
+        List<MenuCell> updatedCells = menuManager.getMenuCells();
+
+        for (MenuCell cell : updatedCells) {
+
+            // grab 2 of our newly updated cells - 1 root and 1 sub cell, and make sure they can get triggered
+            if (cell.getTitle().equalsIgnoreCase("Test Cell 1")) {
+                // Fake onCommand - we want to make sure that we can pass back onCommand events to our root Menu Cell
+                OnCommand onCommand = new OnCommand();
+                onCommand.setCmdID(cell.getCellId());
+                onCommand.setTriggerSource(TriggerSource.TS_MENU); // these are menu commands
+                commandListener.onNotified(onCommand); // send off the notification
+
+                // verify the mock listener has only been hit once for a root cell
+                verify(cell.getMenuSelectionListener(), times(1)).onTriggered(TriggerSource.TS_MENU);
+            }
+
+            if (cell.getTitle().equalsIgnoreCase("SubCell 2")) {
+                // Fake onCommand - we want to make sure that we can pass back onCommand events to our sub Menu Cell
+                OnCommand onCommand2 = new OnCommand();
+                onCommand2.setCmdID(cell.getCellId());
+                onCommand2.setTriggerSource(TriggerSource.TS_MENU); // these are menu commands
+                commandListener.onNotified(onCommand2); // send off the notification
+
+                // verify the mock listener has only been hit once for a sub cell
+                verify(cell.getMenuSelectionListener(), times(1)).onTriggered(TriggerSource.TS_MENU);
+            }
+        }
+    }
+
+    @Test
+    public void testAlgorithmTest1() {
+
+        // Force Menu Manager to use the new way
+        menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
+        assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_ON);
+
+        // start fresh
+        menuManager.oldMenuCells = null;
+        menuManager.menuCells = null;
+        menuManager.inProgressUpdate = null;
+        menuManager.waitingUpdateMenuCells = null;
+        menuManager.waitingOnHMIUpdate = false;
+
+        menuManager.currentHMILevel = HMILevel.HMI_FULL;
+        // send new cells. They should set the old way
+        List<MenuCell> oldMenu = createDynamicMenu1();
+        List<MenuCell> newMenu = createDynamicMenu1New();
+        menuManager.setMenuCells(oldMenu);
+        assertEquals(menuManager.menuCells.size(), 4);
+
+        // this happens in the menu manager but lets make sure its behaving
+        RunScore runScore = menuManager.runMenuCompareAlgorithm(oldMenu, newMenu);
+
+        List<Integer> oldMenuScore = Arrays.asList(0, 0, 0, 0);
+        List<Integer> newMenuScore = Arrays.asList(0, 0, 0, 0, 1);
+
+        assertEquals(runScore.getScore(), 1);
+        assertEquals(runScore.getOldMenu(), oldMenuScore);
+        assertEquals(runScore.getCurrentMenu(), newMenuScore);
+
+        menuManager.setMenuCells(newMenu);
+        assertEquals(menuManager.menuCells.size(), 5);
+        assertEquals(menuManager.keepsNew.size(), 4);
+        assertEquals(menuManager.keepsOld.size(), 4);
+    }
+
+    @Test
+    public void testAlgorithmTest2() {
+
+        // Force Menu Manager to use the new way
+        menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
+        assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_ON);
+
+        // start fresh
+        menuManager.oldMenuCells = null;
+        menuManager.menuCells = null;
+        menuManager.inProgressUpdate = null;
+        menuManager.waitingUpdateMenuCells = null;
+        menuManager.waitingOnHMIUpdate = false;
+
+        menuManager.currentHMILevel = HMILevel.HMI_FULL;
+        // send new cells. They should set the old way
+        List<MenuCell> oldMenu = createDynamicMenu2();
+        List<MenuCell> newMenu = createDynamicMenu2New();
+        menuManager.setMenuCells(oldMenu);
+        assertEquals(menuManager.menuCells.size(), 4);
+
+        // this happens in the menu manager but lets make sure its behaving
+        RunScore runScore = menuManager.runMenuCompareAlgorithm(oldMenu, newMenu);
+
+        List<Integer> oldMenuScore = Arrays.asList(0, 0, 0, 2);
+        List<Integer> newMenuScore = Arrays.asList(0, 0, 0);
+
+        assertEquals(runScore.getScore(), 0);
+        assertEquals(runScore.getOldMenu(), oldMenuScore);
+        assertEquals(runScore.getCurrentMenu(), newMenuScore);
+
+        menuManager.setMenuCells(newMenu);
+        assertEquals(menuManager.menuCells.size(), 3);
+        assertEquals(menuManager.keepsNew.size(), 3);
+        assertEquals(menuManager.keepsOld.size(), 3);
+    }
+
+    @Test
+    public void testAlgorithmTest3() {
+
+        // Force Menu Manager to use the new way
+        menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
+        assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_ON);
+
+        // start fresh
+        menuManager.oldMenuCells = null;
+        menuManager.menuCells = null;
+        menuManager.inProgressUpdate = null;
+        menuManager.waitingUpdateMenuCells = null;
+        menuManager.waitingOnHMIUpdate = false;
+
+        menuManager.currentHMILevel = HMILevel.HMI_FULL;
+        // send new cells. They should set the old way
+        List<MenuCell> oldMenu = createDynamicMenu3();
+        List<MenuCell> newMenu = createDynamicMenu3New();
+        menuManager.setMenuCells(oldMenu);
+        assertEquals(menuManager.menuCells.size(), 3);
+
+        // this happens in the menu manager but lets make sure its behaving
+        RunScore runScore = menuManager.runMenuCompareAlgorithm(oldMenu, newMenu);
+
+        List<Integer> oldMenuScore = Arrays.asList(2, 2, 2);
+        List<Integer> newMenuScore = Arrays.asList(1, 1, 1);
+
+        assertEquals(runScore.getScore(), 3);
+        assertEquals(runScore.getOldMenu(), oldMenuScore);
+        assertEquals(runScore.getCurrentMenu(), newMenuScore);
+
+        menuManager.setMenuCells(newMenu);
+        assertEquals(menuManager.menuCells.size(), 3);
+        assertEquals(menuManager.keepsNew.size(), 0);
+        assertEquals(menuManager.keepsOld.size(), 0);
+    }
+
+    @Test
+    public void testAlgorithmTest4() {
+
+        // Force Menu Manager to use the new way
+        menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
+        assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_ON);
+
+        // start fresh
+        menuManager.oldMenuCells = null;
+        menuManager.menuCells = null;
+        menuManager.inProgressUpdate = null;
+        menuManager.waitingUpdateMenuCells = null;
+        menuManager.waitingOnHMIUpdate = false;
+
+        menuManager.currentHMILevel = HMILevel.HMI_FULL;
+        // send new cells. They should set the old way
+        List<MenuCell> oldMenu = createDynamicMenu4();
+        List<MenuCell> newMenu = createDynamicMenu4New();
+        menuManager.setMenuCells(oldMenu);
+        assertEquals(menuManager.menuCells.size(), 4);
+
+        // this happens in the menu manager but lets make sure its behaving
+        RunScore runScore = menuManager.runMenuCompareAlgorithm(oldMenu, newMenu);
+
+        List<Integer> oldMenuScore = Arrays.asList(0, 2, 0, 2);
+        List<Integer> newMenuScore = Arrays.asList(1, 0, 1, 0);
+
+        assertEquals(runScore.getScore(), 2);
+        assertEquals(runScore.getOldMenu(), oldMenuScore);
+        assertEquals(runScore.getCurrentMenu(), newMenuScore);
+
+        menuManager.setMenuCells(newMenu);
+        assertEquals(menuManager.menuCells.size(), 4);
+        assertEquals(menuManager.keepsNew.size(), 2);
+        assertEquals(menuManager.keepsOld.size(), 2);
+    }
+
+    @Test
+    public void testAlgorithmTest5() {
+
+        // Force Menu Manager to use the new way
+        menuManager.setDynamicUpdatesMode(DynamicMenuUpdatesMode.FORCE_ON);
+        assertEquals(menuManager.dynamicMenuUpdatesMode, DynamicMenuUpdatesMode.FORCE_ON);
+
+        // start fresh
+        menuManager.oldMenuCells = null;
+        menuManager.menuCells = null;
+        menuManager.inProgressUpdate = null;
+        menuManager.waitingUpdateMenuCells = null;
+        menuManager.waitingOnHMIUpdate = false;
+
+        menuManager.currentHMILevel = HMILevel.HMI_FULL;
+        // send new cells. They should set the old way
+        List<MenuCell> oldMenu = createDynamicMenu5();
+        List<MenuCell> newMenu = createDynamicMenu5New();
+        menuManager.setMenuCells(oldMenu);
+        assertEquals(menuManager.menuCells.size(), 4);
+
+        // this happens in the menu manager but lets make sure its behaving
+        RunScore runScore = menuManager.runMenuCompareAlgorithm(oldMenu, newMenu);
+
+        List<Integer> oldMenuScore = Arrays.asList(2, 0, 0, 0);
+        List<Integer> newMenuScore = Arrays.asList(0, 0, 0, 1);
+
+        assertEquals(runScore.getScore(), 1);
+        assertEquals(runScore.getOldMenu(), oldMenuScore);
+        assertEquals(runScore.getCurrentMenu(), newMenuScore);
+
+        menuManager.setMenuCells(newMenu);
+        assertEquals(menuManager.menuCells.size(), 4);
+        assertEquals(menuManager.keepsNew.size(), 3);
+        assertEquals(menuManager.keepsOld.size(), 3);
+    }
+
+    @Test
+    public void testSettingNullMenu() {
+
+        // Make sure we can send an empty menu with no issues
+        // start fresh
+        menuManager.oldMenuCells = null;
+        menuManager.menuCells = null;
+        menuManager.inProgressUpdate = null;
+        menuManager.waitingUpdateMenuCells = null;
+        menuManager.waitingOnHMIUpdate = false;
+
+        menuManager.currentHMILevel = HMILevel.HMI_FULL;
+        // send new cells. They should set the old way
+        List<MenuCell> oldMenu = createDynamicMenu1();
+        List<MenuCell> newMenu = null;
+        menuManager.setMenuCells(oldMenu);
+        assertEquals(menuManager.menuCells.size(), 4);
+
+        menuManager.setMenuCells(newMenu);
+        assertEquals(menuManager.menuCells.size(), 0);
+    }
+
+    @Test
+    public void testClearingMenu() {
+
+        // Make sure we can send an empty menu with no issues
+        // start fresh
+        menuManager.oldMenuCells = null;
+        menuManager.menuCells = null;
+        menuManager.inProgressUpdate = null;
+        menuManager.waitingUpdateMenuCells = null;
+        menuManager.waitingOnHMIUpdate = false;
+
+        menuManager.currentHMILevel = HMILevel.HMI_FULL;
+        // send new cells. They should set the old way
+        List<MenuCell> oldMenu = createDynamicMenu1();
+        List<MenuCell> newMenu = Collections.emptyList();
+        menuManager.setMenuCells(oldMenu);
+        assertEquals(menuManager.menuCells.size(), 4);
+
+        menuManager.setMenuCells(newMenu);
+        assertEquals(menuManager.menuCells.size(), 0);
+    }
+
+    @Test
+    public void testOpeningMainMenu() {
+        // call open Menu
+        MenuManager mockMenuManager = mock(MenuManager.class);
+        mockMenuManager.openMenu();
+        verify(mockMenuManager, Mockito.times(1)).openMenu();
+    }
+
+    @Test
+    public void testOpeningSubMenuNullCells() {
+        // call open Menu
+        MenuManager mockMenuManager = mock(MenuManager.class);
+        MenuCell cell = mock(MenuCell.class);
+        mockMenuManager.oldMenuCells = null;
+        assertFalse(mockMenuManager.openSubMenu(cell));
+    }
+
+    @Test
+    public void testOpeningSubMenu() {
+        // call open Menu
+        List<MenuCell> testCells = createTestCells();
+        menuManager.oldMenuCells = testCells;
+        menuManager.sdlMsgVersion = new SdlMsgVersion(6, 0);
+        // has to get success response to be true
+        assertTrue(menuManager.openSubMenu(testCells.get(3)));
+    }
 
-  @Test
-	public void testSetMenuConfiguration(){
-		menuManager.currentHMILevel = HMILevel.HMI_FULL;
-		menuManager.currentSystemContext = SystemContext.SYSCTXT_MAIN;
-		menuManager.sdlMsgVersion = new SdlMsgVersion(6,0);
-		menuManager.defaultMainWindowCapability = new WindowCapability();
+    @Test
+    public void testSetMenuConfiguration() {
+        menuManager.currentHMILevel = HMILevel.HMI_FULL;
+        menuManager.currentSystemContext = SystemContext.SYSCTXT_MAIN;
+        menuManager.sdlMsgVersion = new SdlMsgVersion(6, 0);
+        menuManager.defaultMainWindowCapability = new WindowCapability();
 
-		List<MenuLayout> menuLayouts = Arrays.asList(MenuLayout.LIST, MenuLayout.TILES);
-		menuManager.defaultMainWindowCapability.setMenuLayoutsAvailable(menuLayouts);
+        List<MenuLayout> menuLayouts = Arrays.asList(MenuLayout.LIST, MenuLayout.TILES);
+        menuManager.defaultMainWindowCapability.setMenuLayoutsAvailable(menuLayouts);
 
-		MenuConfiguration menuConfigurationTest = new MenuConfiguration(MenuLayout.LIST, MenuLayout.LIST);
-		menuManager.setMenuConfiguration(menuConfigurationTest);
-		assertEquals(menuManager.menuConfiguration, menuConfigurationTest);
+        MenuConfiguration menuConfigurationTest = new MenuConfiguration(MenuLayout.LIST, MenuLayout.LIST);
+        menuManager.setMenuConfiguration(menuConfigurationTest);
+        assertEquals(menuManager.menuConfiguration, menuConfigurationTest);
 
-	}
+    }
 
-	// HELPERS
+    // HELPERS
 
-	// Emulate what happens when Core sends OnHMIStatus notification
-	private void sendFakeCoreOnHMIFullNotifications() {
-		OnHMIStatus onHMIStatusFakeNotification = new OnHMIStatus();
-		onHMIStatusFakeNotification.setHmiLevel(HMILevel.HMI_FULL);
-		onHMIStatusListener.onNotified(onHMIStatusFakeNotification);
-	}
+    // Emulate what happens when Core sends OnHMIStatus notification
+    private void sendFakeCoreOnHMIFullNotifications() {
+        OnHMIStatus onHMIStatusFakeNotification = new OnHMIStatus();
+        onHMIStatusFakeNotification.setHmiLevel(HMILevel.HMI_FULL);
+        onHMIStatusListener.onNotified(onHMIStatusFakeNotification);
+    }
 
-	// CREATING CELLS FOR TEST CASES
+    // CREATING CELLS FOR TEST CASES
 
-	private List<MenuCell> createTestCells(){
+    private List<MenuCell> createTestCells() {
 
-		// menu cell mock listener
-		MenuSelectionListener menuSelectionListener1 = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListener2 = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListener3 = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerSub1 = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerSub2 = mock(MenuSelectionListener.class);
+        // menu cell mock listener
+        MenuSelectionListener menuSelectionListener1 = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListener2 = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListener3 = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerSub1 = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerSub2 = mock(MenuSelectionListener.class);
 
-		// some arts
-		SdlArtwork livio = new SdlArtwork("livio", FileType.GRAPHIC_PNG, R.drawable.sdl_lockscreen_icon, false);
+        // some arts
+        SdlArtwork livio = new SdlArtwork("livio", FileType.GRAPHIC_PNG, R.drawable.sdl_lockscreen_icon, false);
 
-		// some menu cells
-		List<String> voice2 = Collections.singletonList("Cell two");
+        // some menu cells
+        List<String> voice2 = Collections.singletonList("Cell two");
 
-		mainCell1 = new MenuCell("Test Cell 1", livio, null, menuSelectionListener1);
-		MenuCell mainCell2 = new MenuCell("Test Cell 2", livio, voice2, menuSelectionListener2);
-		MenuCell mainCell3 = new MenuCell("Test Cell 3",null, null,  menuSelectionListener3);
+        mainCell1 = new MenuCell("Test Cell 1", livio, null, menuSelectionListener1);
+        MenuCell mainCell2 = new MenuCell("Test Cell 2", livio, voice2, menuSelectionListener2);
+        MenuCell mainCell3 = new MenuCell("Test Cell 3", null, null, menuSelectionListener3);
 
-		// SUB MENU
-		MenuCell subCell1 = new MenuCell("SubCell 1",null, null, menuSelectionListenerSub1);
-		MenuCell subCell2 = new MenuCell("SubCell 2",null, null, menuSelectionListenerSub2);
+        // SUB MENU
+        MenuCell subCell1 = new MenuCell("SubCell 1", null, null, menuSelectionListenerSub1);
+        MenuCell subCell2 = new MenuCell("SubCell 2", null, null, menuSelectionListenerSub2);
 
-		mainCell4 = new MenuCell("Test Cell 4", null, livio, Arrays.asList(subCell1,subCell2)); // sub menu parent cell
-		mainCell4.setCellId(4);
+        mainCell4 = new MenuCell("Test Cell 4", null, livio, Arrays.asList(subCell1, subCell2)); // sub menu parent cell
+        mainCell4.setCellId(4);
 
-		return Arrays.asList(mainCell1, mainCell2, mainCell3, mainCell4);
-	}
+        return Arrays.asList(mainCell1, mainCell2, mainCell3, mainCell4);
+    }
 
-	private List<MenuCell> createDynamicMenu1(){
+    private List<MenuCell> createDynamicMenu1() {
 
-		MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
 
-		MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
+        MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
 
-		MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
+        MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
 
-		MenuCell C = new MenuCell("C",null, null, menuSelectionListenerC);
+        MenuCell C = new MenuCell("C", null, null, menuSelectionListenerC);
 
-		MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
+        MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
 
-		return Arrays.asList(A, B, C, D);
+        return Arrays.asList(A, B, C, D);
 
-	}
+    }
 
-	private List<MenuCell> createDynamicMenu1New(){
+    private List<MenuCell> createDynamicMenu1New() {
 
-		MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerE = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerE = mock(MenuSelectionListener.class);
 
-		MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
+        MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
 
-		MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
+        MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
 
-		MenuCell C = new MenuCell("C",null, null, menuSelectionListenerC);
+        MenuCell C = new MenuCell("C", null, null, menuSelectionListenerC);
 
-		MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
+        MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
 
-		MenuCell E = new MenuCell("E", null, null, menuSelectionListenerE);
+        MenuCell E = new MenuCell("E", null, null, menuSelectionListenerE);
 
-		return Arrays.asList(A, B, C, D, E);
+        return Arrays.asList(A, B, C, D, E);
 
-	}
+    }
 
-	private List<MenuCell> createDynamicMenu2(){
+    private List<MenuCell> createDynamicMenu2() {
 
-		MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
 
-		MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
+        MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
 
-		MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
+        MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
 
-		MenuCell C = new MenuCell("C",null, null, menuSelectionListenerC);
+        MenuCell C = new MenuCell("C", null, null, menuSelectionListenerC);
 
-		MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
+        MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
 
-		return Arrays.asList(A, B, C, D);
+        return Arrays.asList(A, B, C, D);
 
-	}
+    }
 
-	private List<MenuCell> createDynamicMenu2New(){
+    private List<MenuCell> createDynamicMenu2New() {
 
-		MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
 
-		MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
+        MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
 
-		MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
+        MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
 
-		MenuCell C = new MenuCell("C",null, null, menuSelectionListenerC);
+        MenuCell C = new MenuCell("C", null, null, menuSelectionListenerC);
 
-		return Arrays.asList(A, B, C);
+        return Arrays.asList(A, B, C);
 
-	}
+    }
 
-	private List<MenuCell> createDynamicMenu3(){
+    private List<MenuCell> createDynamicMenu3() {
 
-		MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
 
-		MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
+        MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
 
-		MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
+        MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
 
-		MenuCell C = new MenuCell("C",null, null, menuSelectionListenerC);
+        MenuCell C = new MenuCell("C", null, null, menuSelectionListenerC);
 
-		return Arrays.asList(A, B, C);
+        return Arrays.asList(A, B, C);
 
-	}
+    }
 
-	private List<MenuCell> createDynamicMenu3New(){
+    private List<MenuCell> createDynamicMenu3New() {
 
-		MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerE = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerF = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerE = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerF = mock(MenuSelectionListener.class);
 
-		MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
+        MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
 
-		MenuCell E = new MenuCell("E", null, null, menuSelectionListenerE);
+        MenuCell E = new MenuCell("E", null, null, menuSelectionListenerE);
 
-		MenuCell F = new MenuCell("F", null, null, menuSelectionListenerF);
+        MenuCell F = new MenuCell("F", null, null, menuSelectionListenerF);
 
-		return Arrays.asList(D, E, F);
+        return Arrays.asList(D, E, F);
 
-	}
+    }
 
-	private List<MenuCell> createDynamicMenu4(){
+    private List<MenuCell> createDynamicMenu4() {
 
-		MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
 
-		MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
+        MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
 
-		MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
+        MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
 
-		MenuCell C = new MenuCell("C",null, null, menuSelectionListenerC);
+        MenuCell C = new MenuCell("C", null, null, menuSelectionListenerC);
 
-		MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
+        MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
 
-		return Arrays.asList(A, B, C, D);
+        return Arrays.asList(A, B, C, D);
 
-	}
+    }
 
-	private List<MenuCell> createDynamicMenu4New(){
+    private List<MenuCell> createDynamicMenu4New() {
 
-		MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
 
-		MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
+        MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
 
-		MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
+        MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
 
-		MenuCell C = new MenuCell("C",null, null, menuSelectionListenerC);
+        MenuCell C = new MenuCell("C", null, null, menuSelectionListenerC);
 
-		MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
+        MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
 
-		return Arrays.asList(B, A, D, C);
+        return Arrays.asList(B, A, D, C);
 
-	}
+    }
 
-	private List<MenuCell> createDynamicMenu5(){
+    private List<MenuCell> createDynamicMenu5() {
 
-		MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
 
-		MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
+        MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
 
-		MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
+        MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
 
-		MenuCell C = new MenuCell("C",null, null, menuSelectionListenerC);
+        MenuCell C = new MenuCell("C", null, null, menuSelectionListenerC);
 
-		MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
+        MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
 
-		return Arrays.asList(A, B, C, D);
+        return Arrays.asList(A, B, C, D);
 
-	}
+    }
 
-	private List<MenuCell> createDynamicMenu5New(){
+    private List<MenuCell> createDynamicMenu5New() {
 
-		MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
-		MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerA = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerB = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerC = mock(MenuSelectionListener.class);
+        MenuSelectionListener menuSelectionListenerD = mock(MenuSelectionListener.class);
 
-		MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
+        MenuCell A = new MenuCell("A", null, null, menuSelectionListenerA);
 
-		MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
+        MenuCell B = new MenuCell("B", null, null, menuSelectionListenerB);
 
-		MenuCell C = new MenuCell("C",null, null, menuSelectionListenerC);
+        MenuCell C = new MenuCell("C", null, null, menuSelectionListenerC);
 
-		MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
+        MenuCell D = new MenuCell("D", null, null, menuSelectionListenerD);
 
-		return Arrays.asList(B, C, D, A);
+        return Arrays.asList(B, C, D, A);
 
-	}
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java
index e3468b803..e92656846 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/RunScoreTests.java
@@ -44,16 +44,16 @@ import static junit.framework.TestCase.assertEquals;
 @RunWith(AndroidJUnit4.class)
 public class RunScoreTests {
 
-	@Test
-	public void testSettersAndGetters(){
+    @Test
+    public void testSettersAndGetters() {
 
-		// set everything - we only use the constructor to set variables in the Menu Manager
-		RunScore runScore = new RunScore(TestValues.GENERAL_INT, TestValues.GENERAL_INTEGER_LIST, TestValues.GENERAL_INTEGER_LIST);
+        // set everything - we only use the constructor to set variables in the Menu Manager
+        RunScore runScore = new RunScore(TestValues.GENERAL_INT, TestValues.GENERAL_INTEGER_LIST, TestValues.GENERAL_INTEGER_LIST);
 
-		// use getters and assert equality
-		assertEquals(runScore.getScore(), TestValues.GENERAL_INT);
-		assertEquals(runScore.getCurrentMenu(), TestValues.GENERAL_INTEGER_LIST);
-		assertEquals(runScore.getOldMenu(), TestValues.GENERAL_INTEGER_LIST);
-	}
+        // use getters and assert equality
+        assertEquals(runScore.getScore(), TestValues.GENERAL_INT);
+        assertEquals(runScore.getCurrentMenu(), TestValues.GENERAL_INTEGER_LIST);
+        assertEquals(runScore.getOldMenu(), TestValues.GENERAL_INTEGER_LIST);
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/SubCellCommandListTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/SubCellCommandListTests.java
index 29dd8e7c6..03afc5348 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/SubCellCommandListTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/SubCellCommandListTests.java
@@ -44,20 +44,20 @@ import static junit.framework.TestCase.assertEquals;
 @RunWith(AndroidJUnit4.class)
 public class SubCellCommandListTests {
 
-	@Test
-	public void testSettersAndGetters() {
+    @Test
+    public void testSettersAndGetters() {
 
-		RunScore runScore = new RunScore(TestValues.GENERAL_INT, TestValues.GENERAL_INTEGER_LIST, TestValues.GENERAL_INTEGER_LIST);
+        RunScore runScore = new RunScore(TestValues.GENERAL_INT, TestValues.GENERAL_INTEGER_LIST, TestValues.GENERAL_INTEGER_LIST);
 
-		// set everything
-		SubCellCommandList subCellCommandList = new SubCellCommandList(TestValues.GENERAL_STRING, TestValues.GENERAL_INTEGER, runScore, TestValues.GENERAL_MENUCELL_LIST, TestValues.GENERAL_MENUCELL_LIST);
+        // set everything
+        SubCellCommandList subCellCommandList = new SubCellCommandList(TestValues.GENERAL_STRING, TestValues.GENERAL_INTEGER, runScore, TestValues.GENERAL_MENUCELL_LIST, TestValues.GENERAL_MENUCELL_LIST);
 
-		// use getters and assert equality
-		assertEquals(subCellCommandList.getMenuTitle(), TestValues.GENERAL_STRING);
-		assertEquals(subCellCommandList.getParentId(), TestValues.GENERAL_INTEGER);
-		assertEquals(runScore, runScore);
-		assertEquals(subCellCommandList.getNewList(), TestValues.GENERAL_MENUCELL_LIST);
-		assertEquals(subCellCommandList.getOldList(), TestValues.GENERAL_MENUCELL_LIST);
+        // use getters and assert equality
+        assertEquals(subCellCommandList.getMenuTitle(), TestValues.GENERAL_STRING);
+        assertEquals(subCellCommandList.getParentId(), TestValues.GENERAL_INTEGER);
+        assertEquals(runScore, runScore);
+        assertEquals(subCellCommandList.getNewList(), TestValues.GENERAL_MENUCELL_LIST);
+        assertEquals(subCellCommandList.getOldList(), TestValues.GENERAL_MENUCELL_LIST);
 
-	}
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java
index a3d07438e..98fc161db 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManagerTests.java
@@ -36,8 +36,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
-import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.managers.ISdl;
+import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.rpc.OnCommand;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
@@ -70,141 +70,141 @@ import static org.mockito.Mockito.verify;
 @RunWith(AndroidJUnit4.class)
 public class VoiceCommandManagerTests {
 
-	private VoiceCommand command, command3;
-	private List<VoiceCommand> commands;
-	private VoiceCommandManager voiceCommandManager;
-	private static final int voiceCommandIdMin = 1900000000;
-	private OnRPCNotificationListener onHMIStatusListener, commandListener;
-
-	// SETUP / HELPERS
-
-	@Before
-	public void setUp() throws Exception{
-
-		VoiceCommandSelectionListener mockListener = mock(VoiceCommandSelectionListener.class);
-		command = new VoiceCommand(Arrays.asList("Command one", "Command two"), null);
-		VoiceCommand command2 = new VoiceCommand(Arrays.asList("Command three", "Command four"), null);
-		command3 = new VoiceCommand(Arrays.asList("Command five", "Command six"), mockListener);
-		commands = Arrays.asList(command,command2);
-
-		ISdl internalInterface = mock(ISdl.class);
-
-		// When internalInterface.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, OnRPCNotificationListener) is called
-		// inside the VoiceCommandManager's constructor, then keep a reference to the OnRPCNotificationListener so we can trigger it later
-		// to emulate what Core does when it sends OnHMIStatus notification
-		Answer<Void> onHMIStatusAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				onHMIStatusListener = (OnRPCNotificationListener) args[1];
-				return null;
-			}
-		};
-		doAnswer(onHMIStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
-
-		Answer<Void> onCommandAnswer = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				commandListener = (OnRPCNotificationListener) args[1];
-				return null;
-			}
-		};
-		doAnswer(onCommandAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_COMMAND), any(OnRPCNotificationListener.class));
-
-		voiceCommandManager = new VoiceCommandManager(internalInterface);
-
-		// Check some stuff during setup
-		assertEquals(voiceCommandManager.currentHMILevel, HMILevel.HMI_NONE);
-		assertEquals(voiceCommandManager.getState(), BaseSubManager.SETTING_UP);
-		assertEquals(voiceCommandManager.lastVoiceCommandId, voiceCommandIdMin);
-		assertFalse(voiceCommandManager.hasQueuedUpdate);
-		assertFalse(voiceCommandManager.waitingOnHMIUpdate);
-		assertNotNull(voiceCommandManager.commandListener);
-		assertNotNull(voiceCommandManager.hmiListener);
-		assertNull(voiceCommandManager.voiceCommands);
-		assertNull(voiceCommandManager.oldVoiceCommands);
-		assertNull(voiceCommandManager.inProgressUpdate);
-	}
-
-	@After
-	public void tearDown() throws Exception {
-
-		voiceCommandManager.dispose();
-
-		assertEquals(voiceCommandManager.lastVoiceCommandId, voiceCommandIdMin);
-		assertNull(voiceCommandManager.voiceCommands);
-		assertNull(voiceCommandManager.oldVoiceCommands);
-		assertNull(voiceCommandManager.currentHMILevel);
-		assertNull(voiceCommandManager.inProgressUpdate);
-		assertFalse(voiceCommandManager.hasQueuedUpdate);
-		assertFalse(voiceCommandManager.waitingOnHMIUpdate);
-		// after everything, make sure we are in the correct state
-		assertEquals(voiceCommandManager.getState(), BaseSubManager.SHUTDOWN);
-	}
-
-	@Test
-	public void testStartVoiceCommandManager(){
-
-		voiceCommandManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				// Make sure the state has changed, as the Screen Manager is dependant on it
-				assertEquals(voiceCommandManager.getState(), BaseSubManager.READY);
-			}
-		});
-	}
-
-	@Test
-	public void testHMINotReady(){
-
-		voiceCommandManager.currentHMILevel = HMILevel.HMI_NONE;
-		voiceCommandManager.setVoiceCommands(commands);
-
-		// updating voice commands before HMI is ready
-		assertNull(voiceCommandManager.inProgressUpdate);
-		assertTrue(voiceCommandManager.waitingOnHMIUpdate);
-		// these are the 2 commands we have waiting
-		assertEquals(voiceCommandManager.voiceCommands.size(), 2);
-		assertEquals(voiceCommandManager.currentHMILevel, HMILevel.HMI_NONE);
-
-		// The VCM should send the pending voice commands once HMI full occurs
-		sendFakeCoreOnHMIFullNotifications();
-		// Listener should be triggered - which sets new HMI level and should proceed to send our pending update
-		assertEquals(voiceCommandManager.currentHMILevel, HMILevel.HMI_FULL);
-		// This being false means it received the hmi notification and sent the pending commands
-		assertFalse(voiceCommandManager.waitingOnHMIUpdate);
-	}
-
-	@Test
-	public void testUpdatingCommands(){
-
-		// we have previously sent 2 VoiceCommand objects. we will now update it and have just one
-
-		// make sure the system returns us 2 delete commands
-		assertEquals(voiceCommandManager.deleteCommandsForVoiceCommands(commands).size(), 2);
-		// when we only send one command to update, we should only be returned one add command
-		assertEquals(voiceCommandManager.addCommandsForVoiceCommands(Collections.singletonList(command)).size(), 1);
-
-		// Send a new single command, and test that its listener works, as it gets called from the VCM
-		voiceCommandManager.setVoiceCommands(Collections.singletonList(command3));
-
-		// Fake onCommand - we want to make sure that we can pass back onCommand events to our VoiceCommand Objects
-		OnCommand onCommand = new OnCommand();
-		onCommand.setCmdID(command3.getCommandId());
-		onCommand.setTriggerSource(TriggerSource.TS_VR); // these are voice commands
-		commandListener.onNotified(onCommand); // send off the notification
-
-		// verify the mock listener has only been hit once
-		verify(command3.getVoiceCommandSelectionListener(), times(1)).onVoiceCommandSelected();
-	}
-
-	// Emulate what happens when Core sends OnHMIStatus notification
-	private void sendFakeCoreOnHMIFullNotifications() {
-		OnHMIStatus onHMIStatusFakeNotification = new OnHMIStatus();
-		onHMIStatusFakeNotification.setHmiLevel(HMILevel.HMI_FULL);
-		onHMIStatusListener.onNotified(onHMIStatusFakeNotification);
-	}
+    private VoiceCommand command, command3;
+    private List<VoiceCommand> commands;
+    private VoiceCommandManager voiceCommandManager;
+    private static final int voiceCommandIdMin = 1900000000;
+    private OnRPCNotificationListener onHMIStatusListener, commandListener;
+
+    // SETUP / HELPERS
+
+    @Before
+    public void setUp() throws Exception {
+
+        VoiceCommandSelectionListener mockListener = mock(VoiceCommandSelectionListener.class);
+        command = new VoiceCommand(Arrays.asList("Command one", "Command two"), null);
+        VoiceCommand command2 = new VoiceCommand(Arrays.asList("Command three", "Command four"), null);
+        command3 = new VoiceCommand(Arrays.asList("Command five", "Command six"), mockListener);
+        commands = Arrays.asList(command, command2);
+
+        ISdl internalInterface = mock(ISdl.class);
+
+        // When internalInterface.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, OnRPCNotificationListener) is called
+        // inside the VoiceCommandManager's constructor, then keep a reference to the OnRPCNotificationListener so we can trigger it later
+        // to emulate what Core does when it sends OnHMIStatus notification
+        Answer<Void> onHMIStatusAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                onHMIStatusListener = (OnRPCNotificationListener) args[1];
+                return null;
+            }
+        };
+        doAnswer(onHMIStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
+
+        Answer<Void> onCommandAnswer = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                commandListener = (OnRPCNotificationListener) args[1];
+                return null;
+            }
+        };
+        doAnswer(onCommandAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_COMMAND), any(OnRPCNotificationListener.class));
+
+        voiceCommandManager = new VoiceCommandManager(internalInterface);
+
+        // Check some stuff during setup
+        assertEquals(voiceCommandManager.currentHMILevel, HMILevel.HMI_NONE);
+        assertEquals(voiceCommandManager.getState(), BaseSubManager.SETTING_UP);
+        assertEquals(voiceCommandManager.lastVoiceCommandId, voiceCommandIdMin);
+        assertFalse(voiceCommandManager.hasQueuedUpdate);
+        assertFalse(voiceCommandManager.waitingOnHMIUpdate);
+        assertNotNull(voiceCommandManager.commandListener);
+        assertNotNull(voiceCommandManager.hmiListener);
+        assertNull(voiceCommandManager.voiceCommands);
+        assertNull(voiceCommandManager.oldVoiceCommands);
+        assertNull(voiceCommandManager.inProgressUpdate);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+
+        voiceCommandManager.dispose();
+
+        assertEquals(voiceCommandManager.lastVoiceCommandId, voiceCommandIdMin);
+        assertNull(voiceCommandManager.voiceCommands);
+        assertNull(voiceCommandManager.oldVoiceCommands);
+        assertNull(voiceCommandManager.currentHMILevel);
+        assertNull(voiceCommandManager.inProgressUpdate);
+        assertFalse(voiceCommandManager.hasQueuedUpdate);
+        assertFalse(voiceCommandManager.waitingOnHMIUpdate);
+        // after everything, make sure we are in the correct state
+        assertEquals(voiceCommandManager.getState(), BaseSubManager.SHUTDOWN);
+    }
+
+    @Test
+    public void testStartVoiceCommandManager() {
+
+        voiceCommandManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                // Make sure the state has changed, as the Screen Manager is dependant on it
+                assertEquals(voiceCommandManager.getState(), BaseSubManager.READY);
+            }
+        });
+    }
+
+    @Test
+    public void testHMINotReady() {
+
+        voiceCommandManager.currentHMILevel = HMILevel.HMI_NONE;
+        voiceCommandManager.setVoiceCommands(commands);
+
+        // updating voice commands before HMI is ready
+        assertNull(voiceCommandManager.inProgressUpdate);
+        assertTrue(voiceCommandManager.waitingOnHMIUpdate);
+        // these are the 2 commands we have waiting
+        assertEquals(voiceCommandManager.voiceCommands.size(), 2);
+        assertEquals(voiceCommandManager.currentHMILevel, HMILevel.HMI_NONE);
+
+        // The VCM should send the pending voice commands once HMI full occurs
+        sendFakeCoreOnHMIFullNotifications();
+        // Listener should be triggered - which sets new HMI level and should proceed to send our pending update
+        assertEquals(voiceCommandManager.currentHMILevel, HMILevel.HMI_FULL);
+        // This being false means it received the hmi notification and sent the pending commands
+        assertFalse(voiceCommandManager.waitingOnHMIUpdate);
+    }
+
+    @Test
+    public void testUpdatingCommands() {
+
+        // we have previously sent 2 VoiceCommand objects. we will now update it and have just one
+
+        // make sure the system returns us 2 delete commands
+        assertEquals(voiceCommandManager.deleteCommandsForVoiceCommands(commands).size(), 2);
+        // when we only send one command to update, we should only be returned one add command
+        assertEquals(voiceCommandManager.addCommandsForVoiceCommands(Collections.singletonList(command)).size(), 1);
+
+        // Send a new single command, and test that its listener works, as it gets called from the VCM
+        voiceCommandManager.setVoiceCommands(Collections.singletonList(command3));
+
+        // Fake onCommand - we want to make sure that we can pass back onCommand events to our VoiceCommand Objects
+        OnCommand onCommand = new OnCommand();
+        onCommand.setCmdID(command3.getCommandId());
+        onCommand.setTriggerSource(TriggerSource.TS_VR); // these are voice commands
+        commandListener.onNotified(onCommand); // send off the notification
+
+        // verify the mock listener has only been hit once
+        verify(command3.getVoiceCommandSelectionListener(), times(1)).onVoiceCommandSelected();
+    }
+
+    // Emulate what happens when Core sends OnHMIStatus notification
+    private void sendFakeCoreOnHMIFullNotifications() {
+        OnHMIStatus onHMIStatusFakeNotification = new OnHMIStatus();
+        onHMIStatusFakeNotification.setHmiLevel(HMILevel.HMI_FULL);
+        onHMIStatusListener.onNotified(onHMIStatusFakeNotification);
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandTests.java
index 00e198a91..0a7673c0c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/VoiceCommandTests.java
@@ -44,19 +44,19 @@ import static junit.framework.TestCase.assertEquals;
 @RunWith(AndroidJUnit4.class)
 public class VoiceCommandTests {
 
-	private VoiceCommandSelectionListener voiceCommandSelectionListener = new VoiceCommandSelectionListener() {
-		@Override
-		public void onVoiceCommandSelected() {
-			// Stuffs
-		}
-	};
-
-	@Test
-	public void testSettersAndGetters(){
-		VoiceCommand voiceCommand = new VoiceCommand(TestValues.GENERAL_STRING_LIST, voiceCommandSelectionListener);
-
-		assertEquals(voiceCommand.getVoiceCommands(), TestValues.GENERAL_STRING_LIST);
-		assertEquals(voiceCommand.getVoiceCommandSelectionListener(), voiceCommandSelectionListener);
-	}
+    private VoiceCommandSelectionListener voiceCommandSelectionListener = new VoiceCommandSelectionListener() {
+        @Override
+        public void onVoiceCommandSelected() {
+            // Stuffs
+        }
+    };
+
+    @Test
+    public void testSettersAndGetters() {
+        VoiceCommand voiceCommand = new VoiceCommand(TestValues.GENERAL_STRING_LIST, voiceCommandSelectionListener);
+
+        assertEquals(voiceCommand.getVoiceCommands(), TestValues.GENERAL_STRING_LIST);
+        assertEquals(voiceCommand.getVoiceCommandSelectionListener(), voiceCommandSelectionListener);
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java
index 9c01986a7..91690c5ff 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/HapticInterfaceManagerTest.java
@@ -24,8 +24,6 @@ package com.smartdevicelink.managers.video;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
@@ -47,7 +45,6 @@ import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
@@ -170,7 +167,6 @@ public class HapticInterfaceManagerTest extends TestCase {
     }
 
 
-
     @Test
     public void testRefreshHapticData_NullCapability() {
         final int buttonX = 60;
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
index c02ba30c4..54d90359d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
@@ -11,12 +11,12 @@ import androidx.annotation.NonNull;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.smartdevicelink.managers.CompletionListener;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
 import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
+import com.smartdevicelink.protocol.ISdlServiceListener;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
-import com.smartdevicelink.managers.ISdl;
-import com.smartdevicelink.protocol.ISdlServiceListener;
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.OnTouchEvent;
@@ -67,428 +67,418 @@ import static org.mockito.Mockito.when;
  */
 @RunWith(AndroidJUnit4.class)
 public class VideoStreamManagerTests {
-	public static final String TAG = "VideoStreamManagerTests";
-	private Context mTestContext;
-	private static boolean touchEventOccured = false;
-
-	// SETUP / HELPERS
-
-	@Before
-	public void setUp() throws Exception{
-		mTestContext = getInstrumentation().getContext();
-	}
-
-	// TEST CLASSES
-
-	public static class TestPresentation extends SdlRemoteDisplay {
-		View simulatedView = new View(this.getContext());
-
-		public TestPresentation(Context context, Display display) {
-			super(context, display);
-		}
-
-		@Override
-		protected void onCreate(Bundle savedInstanceState) {
-			super.onCreate(savedInstanceState);
-			setContentView(simulatedView);
-		}
-
-		@Override
-		public boolean onTouchEvent(@NonNull MotionEvent event) {
-			touchEventOccured = true;
-			return super.onTouchEvent(event);
-		}
-	}
-
-	// TESTS
-
-	@Test
-	public void testInitialization(){
-		ISdl internalInterface = mock(ISdl.class);
-		when(internalInterface.getProtocolVersion()).thenReturn(new Version(5,1,0));
-
-		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
-		VehicleType mockVehicleType = new VehicleType();
-		mockVehicleType.setMake("Ford");
-		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
-		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
-
-		Answer<Void> onAddServiceListener = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				SessionType sessionType = (SessionType) args[0];
-				ISdlServiceListener sdlServiceListener = (ISdlServiceListener) args[1];
-				assertEquals(sessionType, SessionType.NAV);
-				assertNotNull(sdlServiceListener);
-				return null;
-			}
-		};
-
-		doAnswer(onAddServiceListener).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));
-
-		VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
-		videoStreamManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-			}
-		});
-	}
-
-	@Test
-	public void testHMILevelNotFull(){
-		final ISdl internalInterface = mock(ISdl.class);
-
-		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
-		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
-
-		when(internalInterface.getProtocolVersion()).thenReturn((new Version(5,0,0)));
-
-		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
-		VehicleType mockVehicleType = new VehicleType();
-		mockVehicleType.setMake("Ford");
-		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
-		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
-
-		when(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
-
-		final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
-		videoStreamManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				VideoStreamingParameters params = new VideoStreamingParameters();
-				boolean encrypted = false;
-				videoStreamManager.startStreaming(params, encrypted);
-				verify(internalInterface, times(0)).startVideoService(params, encrypted);
-			}
-		});
-	}
-
-	@Test
-	public void testRemoteDisplayStream(){
-		ISdl internalInterface = mock(ISdl.class);
-
-		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
-		VehicleType mockVehicleType = new VehicleType();
-		mockVehicleType.setMake("Ford");
-		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
-		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
-
-		final Set<Object> listenerSet = new HashSet<>();
-
-		when(internalInterface.getProtocolVersion()).thenReturn(new Version(5,0,0));
-
-		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
-		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
-		when(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
-
-		Answer<Void> onGetCapability = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				OnSystemCapabilityListener systemCapabilityListener = (OnSystemCapabilityListener) args[1];
-				systemCapabilityListener.onCapabilityRetrieved(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
-				return null;
-			}
-		};
-
-		doAnswer(onGetCapability).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class), anyBoolean());
-
-		Answer<Void> onAddServiceListener = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				listenerSet.add(args[1]);
-				return null;
-			}
-		};
-
-		doAnswer(onAddServiceListener).when(internalInterface).addServiceListener(eq(SessionType.NAV), any(ISdlServiceListener.class));
-
-		final OnRPCNotificationListener[] hmiListener = {null};
-
-		Answer<Void> onAddHMIListener = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				hmiListener[0] = (OnRPCNotificationListener) args[1];
-				listenerSet.add(args[1]);
-				return null;
-			}
-		};
-
-		doAnswer(onAddHMIListener).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
-
-		Answer<Void> onAddTouchListener = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				listenerSet.add(args[1]);
-				return null;
-			}
-		};
-
-		doAnswer(onAddTouchListener).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_TOUCH_EVENT), any(OnRPCNotificationListener.class));
-
-		Answer<Void> onRemoveRPCNotificationListener = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				listenerSet.remove(args[1]);
-				return null;
-			}
-		};
-
-		doAnswer(onRemoveRPCNotificationListener).when(internalInterface).removeOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
-		doAnswer(onRemoveRPCNotificationListener).when(internalInterface).removeOnRPCNotificationListener(eq(FunctionID.ON_TOUCH_EVENT), any(OnRPCNotificationListener.class));
-
-		Answer<Void> onRemoveServiceListener = new Answer<Void>() {
-			@Override
-			public Void answer(InvocationOnMock invocation) {
-				Object[] args = invocation.getArguments();
-				listenerSet.remove(args[1]);
-				return null;
-			}
-		};
-
-		doAnswer(onRemoveServiceListener).when(internalInterface).removeServiceListener(eq(SessionType.NAV), any(ISdlServiceListener.class));
-
-		when(systemCapabilityManager.getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class), anyBoolean())).thenReturn(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
-
-		final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
-		videoStreamManager.start(new CompletionListener() {
-			@Override
-			public void onComplete(boolean success) {
-				assertTrue(success);
-				assertTrue(listenerSet.size() == 3);
-
-				OnHMIStatus fullNotification = new OnHMIStatus();
-				fullNotification.setHmiLevel(HMILevel.HMI_FULL);
-				hmiListener[0].onNotified(fullNotification);
-
-				videoStreamManager.startRemoteDisplayStream(mTestContext, TestPresentation.class, null, false);
-
-				//assertTrue(touchEventOccured);
-
-				videoStreamManager.dispose();
-				assertTrue(listenerSet.isEmpty());
-			}
-		});
-
-	}
-
-	@Test
-	public void testConvertTouchEvent() {
-		ISdl internalInterface = mock(ISdl.class);
-
-		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
-		VehicleType mockVehicleType = new VehicleType();
-		mockVehicleType.setMake("Ford");
-		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
-		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
-
-		VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
-		List<MotionEvent> motionEventList;
-		long e1TS = 1558124390L, e2TS = 1558125390L, e3TS = 1558126390L;
-		int e1x = 50, e1y = 100, e2x = 150, e2y = 200, e3x = 250, e3y = 300;
-		int e1Id = 100, e2Id = 101, e3Id = 102;
-		int movingStep = 10;
-		OnTouchEvent testOnTouchEvent;
-		MotionEvent motionEvent;
-		TouchEvent touchEvent1 = new TouchEvent(e1Id, Collections.singletonList(e1TS), Collections.singletonList(new TouchCoord(e1x, e1y)));
-		TouchEvent touchEvent2 = new TouchEvent(e2Id, Collections.singletonList(e2TS), Collections.singletonList(new TouchCoord(e2x, e2y)));
-		TouchEvent touchEvent2AfterMovingPointer = new TouchEvent(e2Id, Collections.singletonList(e2TS), Collections.singletonList(new TouchCoord(e2x + movingStep, e2y + movingStep)));
-		TouchEvent touchEvent3 = new TouchEvent(e3Id, Collections.singletonList(e3TS), Collections.singletonList(new TouchCoord(e3x, e3y)));
-
+    public static final String TAG = "VideoStreamManagerTests";
+    private Context mTestContext;
+    private static boolean touchEventOccured = false;
 
+    // SETUP / HELPERS
 
-		/////////////////////////////////////////////////// First OnTouchEvent Notification ///////////////////////////////////////////////////
-		testOnTouchEvent = new OnTouchEvent(TouchType.BEGIN, Arrays.asList(touchEvent1, touchEvent2));
-		motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
+    @Before
+    public void setUp() throws Exception {
+        mTestContext = getInstrumentation().getContext();
+    }
 
+    // TEST CLASSES
 
-		// First MotionEvent should be ACTION_DOWN and have 1 pointer
-		motionEvent = motionEventList.get(0);
-		assertEquals(1, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(MotionEvent.ACTION_DOWN, motionEvent.getActionMasked());
+    public static class TestPresentation extends SdlRemoteDisplay {
+        View simulatedView = new View(this.getContext());
 
+        public TestPresentation(Context context, Display display) {
+            super(context, display);
+        }
 
-		// Second MotionEvent should be ACTION_POINTER_DOWN and have 2 pointers
-		motionEvent = motionEventList.get(1);
-		assertEquals(2, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(e2x, Math.round(motionEvent.getX(1)));
-		assertEquals(e2y, Math.round(motionEvent.getY(1)));
-		assertEquals(MotionEvent.ACTION_POINTER_DOWN, motionEvent.getActionMasked());
-		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            setContentView(simulatedView);
+        }
 
+        @Override
+        public boolean onTouchEvent(@NonNull MotionEvent event) {
+            touchEventOccured = true;
+            return super.onTouchEvent(event);
+        }
+    }
 
+    // TESTS
 
-		/////////////////////////////////////////////////// Second OnTouchEvent Notification ///////////////////////////////////////////////////
-		testOnTouchEvent = new OnTouchEvent(TouchType.BEGIN, Arrays.asList(touchEvent3));
-		motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
+    @Test
+    public void testInitialization() {
+        ISdl internalInterface = mock(ISdl.class);
+        when(internalInterface.getProtocolVersion()).thenReturn(new Version(5, 1, 0));
+
+        RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
+        VehicleType mockVehicleType = new VehicleType();
+        mockVehicleType.setMake("Ford");
+        mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
+        when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
+
+        Answer<Void> onAddServiceListener = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                SessionType sessionType = (SessionType) args[0];
+                ISdlServiceListener sdlServiceListener = (ISdlServiceListener) args[1];
+                assertEquals(sessionType, SessionType.NAV);
+                assertNotNull(sdlServiceListener);
+                return null;
+            }
+        };
+
+        doAnswer(onAddServiceListener).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));
 
+        VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
+        videoStreamManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+            }
+        });
+    }
 
-		// First MotionEvent should be ACTION_POINTER_DOWN and have 3 pointers
-		motionEvent = motionEventList.get(0);
-		assertEquals(3, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(e2x, Math.round(motionEvent.getX(1)));
-		assertEquals(e2y, Math.round(motionEvent.getY(1)));
-		assertEquals(e3x, Math.round(motionEvent.getX(2)));
-		assertEquals(e3y, Math.round(motionEvent.getY(2)));
-		assertEquals(MotionEvent.ACTION_POINTER_DOWN, motionEvent.getActionMasked());
-		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    @Test
+    public void testHMILevelNotFull() {
+        final ISdl internalInterface = mock(ISdl.class);
+
+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
+
+        when(internalInterface.getProtocolVersion()).thenReturn((new Version(5, 0, 0)));
+
+        RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
+        VehicleType mockVehicleType = new VehicleType();
+        mockVehicleType.setMake("Ford");
+        mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
+        when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
+
+        when(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
+
+        final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
+        videoStreamManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                VideoStreamingParameters params = new VideoStreamingParameters();
+                boolean encrypted = false;
+                videoStreamManager.startStreaming(params, encrypted);
+                verify(internalInterface, times(0)).startVideoService(params, encrypted);
+            }
+        });
+    }
 
+    @Test
+    public void testRemoteDisplayStream() {
+        ISdl internalInterface = mock(ISdl.class);
 
+        RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
+        VehicleType mockVehicleType = new VehicleType();
+        mockVehicleType.setMake("Ford");
+        mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
+        when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
+
+        final Set<Object> listenerSet = new HashSet<>();
+
+        when(internalInterface.getProtocolVersion()).thenReturn(new Version(5, 0, 0));
+
+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
+        when(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
+
+        Answer<Void> onGetCapability = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                OnSystemCapabilityListener systemCapabilityListener = (OnSystemCapabilityListener) args[1];
+                systemCapabilityListener.onCapabilityRetrieved(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
+                return null;
+            }
+        };
+
+        doAnswer(onGetCapability).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class), anyBoolean());
+
+        Answer<Void> onAddServiceListener = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                listenerSet.add(args[1]);
+                return null;
+            }
+        };
+
+        doAnswer(onAddServiceListener).when(internalInterface).addServiceListener(eq(SessionType.NAV), any(ISdlServiceListener.class));
+
+        final OnRPCNotificationListener[] hmiListener = {null};
+
+        Answer<Void> onAddHMIListener = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                hmiListener[0] = (OnRPCNotificationListener) args[1];
+                listenerSet.add(args[1]);
+                return null;
+            }
+        };
+
+        doAnswer(onAddHMIListener).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
+
+        Answer<Void> onAddTouchListener = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                listenerSet.add(args[1]);
+                return null;
+            }
+        };
+
+        doAnswer(onAddTouchListener).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_TOUCH_EVENT), any(OnRPCNotificationListener.class));
+
+        Answer<Void> onRemoveRPCNotificationListener = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                listenerSet.remove(args[1]);
+                return null;
+            }
+        };
+
+        doAnswer(onRemoveRPCNotificationListener).when(internalInterface).removeOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
+        doAnswer(onRemoveRPCNotificationListener).when(internalInterface).removeOnRPCNotificationListener(eq(FunctionID.ON_TOUCH_EVENT), any(OnRPCNotificationListener.class));
+
+        Answer<Void> onRemoveServiceListener = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) {
+                Object[] args = invocation.getArguments();
+                listenerSet.remove(args[1]);
+                return null;
+            }
+        };
+
+        doAnswer(onRemoveServiceListener).when(internalInterface).removeServiceListener(eq(SessionType.NAV), any(ISdlServiceListener.class));
+
+        when(systemCapabilityManager.getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class), anyBoolean())).thenReturn(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
+
+        final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
+        videoStreamManager.start(new CompletionListener() {
+            @Override
+            public void onComplete(boolean success) {
+                assertTrue(success);
+                assertTrue(listenerSet.size() == 3);
+
+                OnHMIStatus fullNotification = new OnHMIStatus();
+                fullNotification.setHmiLevel(HMILevel.HMI_FULL);
+                hmiListener[0].onNotified(fullNotification);
+
+                videoStreamManager.startRemoteDisplayStream(mTestContext, TestPresentation.class, null, false);
+
+                //assertTrue(touchEventOccured);
+
+                videoStreamManager.dispose();
+                assertTrue(listenerSet.isEmpty());
+            }
+        });
 
-		/////////////////////////////////////////////////// Third OnTouchEvent Notification ///////////////////////////////////////////////////
-		testOnTouchEvent = new OnTouchEvent(TouchType.MOVE, Arrays.asList(touchEvent2AfterMovingPointer));
-		motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
+    }
 
+    @Test
+    public void testConvertTouchEvent() {
+        ISdl internalInterface = mock(ISdl.class);
 
-		// First MotionEvent should be ACTION_MOVE and have 3 pointers
-		motionEvent = motionEventList.get(0);
-		assertEquals(3, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(e2x + movingStep, Math.round(motionEvent.getX(1)));
-		assertEquals(e2y + movingStep, Math.round(motionEvent.getY(1)));
-		assertEquals(e3x, Math.round(motionEvent.getX(2)));
-		assertEquals(e3y, Math.round(motionEvent.getY(2)));
-		assertEquals(MotionEvent.ACTION_MOVE, motionEvent.getActionMasked());
-		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
+        VehicleType mockVehicleType = new VehicleType();
+        mockVehicleType.setMake("Ford");
+        mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
+        when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
 
+        VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
+        List<MotionEvent> motionEventList;
+        long e1TS = 1558124390L, e2TS = 1558125390L, e3TS = 1558126390L;
+        int e1x = 50, e1y = 100, e2x = 150, e2y = 200, e3x = 250, e3y = 300;
+        int e1Id = 100, e2Id = 101, e3Id = 102;
+        int movingStep = 10;
+        OnTouchEvent testOnTouchEvent;
+        MotionEvent motionEvent;
+        TouchEvent touchEvent1 = new TouchEvent(e1Id, Collections.singletonList(e1TS), Collections.singletonList(new TouchCoord(e1x, e1y)));
+        TouchEvent touchEvent2 = new TouchEvent(e2Id, Collections.singletonList(e2TS), Collections.singletonList(new TouchCoord(e2x, e2y)));
+        TouchEvent touchEvent2AfterMovingPointer = new TouchEvent(e2Id, Collections.singletonList(e2TS), Collections.singletonList(new TouchCoord(e2x + movingStep, e2y + movingStep)));
+        TouchEvent touchEvent3 = new TouchEvent(e3Id, Collections.singletonList(e3TS), Collections.singletonList(new TouchCoord(e3x, e3y)));
 
 
-		/////////////////////////////////////////////////// Fourth OnTouchEvent Notification ///////////////////////////////////////////////////
-		testOnTouchEvent = new OnTouchEvent(TouchType.END, Arrays.asList(touchEvent2AfterMovingPointer));
-		motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
+        /////////////////////////////////////////////////// First OnTouchEvent Notification ///////////////////////////////////////////////////
+        testOnTouchEvent = new OnTouchEvent(TouchType.BEGIN, Arrays.asList(touchEvent1, touchEvent2));
+        motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
 
-		// First MotionEvent should be ACTION_POINTER_UP and have 3 pointers
-		motionEvent = motionEventList.get(0);
-		assertEquals(3, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(e2x + movingStep, Math.round(motionEvent.getX(1)));
-		assertEquals(e2y + movingStep, Math.round(motionEvent.getY(1)));
-		assertEquals(e3x, Math.round(motionEvent.getX(2)));
-		assertEquals(e3y, Math.round(motionEvent.getY(2)));
-		assertEquals(MotionEvent.ACTION_POINTER_UP, motionEvent.getActionMasked());
-		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // First MotionEvent should be ACTION_DOWN and have 1 pointer
+        motionEvent = motionEventList.get(0);
+        assertEquals(1, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(MotionEvent.ACTION_DOWN, motionEvent.getActionMasked());
 
 
+        // Second MotionEvent should be ACTION_POINTER_DOWN and have 2 pointers
+        motionEvent = motionEventList.get(1);
+        assertEquals(2, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(e2x, Math.round(motionEvent.getX(1)));
+        assertEquals(e2y, Math.round(motionEvent.getY(1)));
+        assertEquals(MotionEvent.ACTION_POINTER_DOWN, motionEvent.getActionMasked());
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-		/////////////////////////////////////////////////// Fifth OnTouchEvent Notification ///////////////////////////////////////////////////
-		testOnTouchEvent = new OnTouchEvent(TouchType.END, Arrays.asList(touchEvent3));
-		motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
+        /////////////////////////////////////////////////// Second OnTouchEvent Notification ///////////////////////////////////////////////////
+        testOnTouchEvent = new OnTouchEvent(TouchType.BEGIN, Arrays.asList(touchEvent3));
+        motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
-		// First MotionEvent should be ACTION_POINTER_UP and have 2 pointers
-		motionEvent = motionEventList.get(0);
-		assertEquals(2, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(e3x, Math.round(motionEvent.getX(1)));
-		assertEquals(e3y, Math.round(motionEvent.getY(1)));
-		assertEquals(MotionEvent.ACTION_POINTER_UP, motionEvent.getActionMasked());
-		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+        // First MotionEvent should be ACTION_POINTER_DOWN and have 3 pointers
+        motionEvent = motionEventList.get(0);
+        assertEquals(3, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(e2x, Math.round(motionEvent.getX(1)));
+        assertEquals(e2y, Math.round(motionEvent.getY(1)));
+        assertEquals(e3x, Math.round(motionEvent.getX(2)));
+        assertEquals(e3y, Math.round(motionEvent.getY(2)));
+        assertEquals(MotionEvent.ACTION_POINTER_DOWN, motionEvent.getActionMasked());
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+        /////////////////////////////////////////////////// Third OnTouchEvent Notification ///////////////////////////////////////////////////
+        testOnTouchEvent = new OnTouchEvent(TouchType.MOVE, Arrays.asList(touchEvent2AfterMovingPointer));
+        motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
 
-		/////////////////////////////////////////////////// Sixth OnTouchEvent Notification ///////////////////////////////////////////////////
-		testOnTouchEvent = new OnTouchEvent(TouchType.END, Arrays.asList(touchEvent3));
-		motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
+        // First MotionEvent should be ACTION_MOVE and have 3 pointers
+        motionEvent = motionEventList.get(0);
+        assertEquals(3, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(e2x + movingStep, Math.round(motionEvent.getX(1)));
+        assertEquals(e2y + movingStep, Math.round(motionEvent.getY(1)));
+        assertEquals(e3x, Math.round(motionEvent.getX(2)));
+        assertEquals(e3y, Math.round(motionEvent.getY(2)));
+        assertEquals(MotionEvent.ACTION_MOVE, motionEvent.getActionMasked());
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+        /////////////////////////////////////////////////// Fourth OnTouchEvent Notification ///////////////////////////////////////////////////
+        testOnTouchEvent = new OnTouchEvent(TouchType.END, Arrays.asList(touchEvent2AfterMovingPointer));
+        motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
 
-		// First MotionEvent should be ACTION_UP and have 1 pointer
-		motionEvent = motionEventList.get(0);
-		assertEquals(1, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(MotionEvent.ACTION_UP, motionEvent.getActionMasked());
-		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // First MotionEvent should be ACTION_POINTER_UP and have 3 pointers
+        motionEvent = motionEventList.get(0);
+        assertEquals(3, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(e2x + movingStep, Math.round(motionEvent.getX(1)));
+        assertEquals(e2y + movingStep, Math.round(motionEvent.getY(1)));
+        assertEquals(e3x, Math.round(motionEvent.getX(2)));
+        assertEquals(e3y, Math.round(motionEvent.getY(2)));
+        assertEquals(MotionEvent.ACTION_POINTER_UP, motionEvent.getActionMasked());
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+        /////////////////////////////////////////////////// Fifth OnTouchEvent Notification ///////////////////////////////////////////////////
+        testOnTouchEvent = new OnTouchEvent(TouchType.END, Arrays.asList(touchEvent3));
+        motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
 
+        // First MotionEvent should be ACTION_POINTER_UP and have 2 pointers
+        motionEvent = motionEventList.get(0);
+        assertEquals(2, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(e3x, Math.round(motionEvent.getX(1)));
+        assertEquals(e3y, Math.round(motionEvent.getY(1)));
+        assertEquals(MotionEvent.ACTION_POINTER_UP, motionEvent.getActionMasked());
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-		/////////////////////////////////////////////////// Seventh OnTouchEvent Notification ///////////////////////////////////////////////////
-		testOnTouchEvent = new OnTouchEvent(TouchType.BEGIN, Arrays.asList(touchEvent1, touchEvent2));
-		motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
+        /////////////////////////////////////////////////// Sixth OnTouchEvent Notification ///////////////////////////////////////////////////
+        testOnTouchEvent = new OnTouchEvent(TouchType.END, Arrays.asList(touchEvent3));
+        motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
-		// First MotionEvent should be ACTION_DOWN and have 1 pointer
-		motionEvent = motionEventList.get(0);
-		assertEquals(1, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(MotionEvent.ACTION_DOWN, motionEvent.getActionMasked());
 
+        // First MotionEvent should be ACTION_UP and have 1 pointer
+        motionEvent = motionEventList.get(0);
+        assertEquals(1, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(MotionEvent.ACTION_UP, motionEvent.getActionMasked());
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-		// Second MotionEvent should be ACTION_POINTER_DOWN and have 2 pointers
-		motionEvent = motionEventList.get(1);
-		assertEquals(2, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(e2x, Math.round(motionEvent.getX(1)));
-		assertEquals(e2y, Math.round(motionEvent.getY(1)));
-		assertEquals(MotionEvent.ACTION_POINTER_DOWN, motionEvent.getActionMasked());
-		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+        /////////////////////////////////////////////////// Seventh OnTouchEvent Notification ///////////////////////////////////////////////////
+        testOnTouchEvent = new OnTouchEvent(TouchType.BEGIN, Arrays.asList(touchEvent1, touchEvent2));
+        motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
 
-		/////////////////////////////////////////////////// Eighth OnTouchEvent Notification ///////////////////////////////////////////////////
-		testOnTouchEvent = new OnTouchEvent(TouchType.CANCEL, Arrays.asList(touchEvent3));
-		motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
+        // First MotionEvent should be ACTION_DOWN and have 1 pointer
+        motionEvent = motionEventList.get(0);
+        assertEquals(1, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(MotionEvent.ACTION_DOWN, motionEvent.getActionMasked());
 
 
-		// First MotionEvent should be ACTION_CANCEL and have 2 pointers
-		motionEvent = motionEventList.get(0);
-		assertEquals(2, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(e2x, Math.round(motionEvent.getX(1)));
-		assertEquals(e2y, Math.round(motionEvent.getY(1)));
-		assertEquals(MotionEvent.ACTION_CANCEL, motionEvent.getActionMasked());
-		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Second MotionEvent should be ACTION_POINTER_DOWN and have 2 pointers
+        motionEvent = motionEventList.get(1);
+        assertEquals(2, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(e2x, Math.round(motionEvent.getX(1)));
+        assertEquals(e2y, Math.round(motionEvent.getY(1)));
+        assertEquals(MotionEvent.ACTION_POINTER_DOWN, motionEvent.getActionMasked());
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
+        /////////////////////////////////////////////////// Eighth OnTouchEvent Notification ///////////////////////////////////////////////////
+        testOnTouchEvent = new OnTouchEvent(TouchType.CANCEL, Arrays.asList(touchEvent3));
+        motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
-		/////////////////////////////////////////////////// Ninth OnTouchEvent Notification ///////////////////////////////////////////////////
-		testOnTouchEvent = new OnTouchEvent(TouchType.BEGIN, Arrays.asList(touchEvent1));
-		motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
+        // First MotionEvent should be ACTION_CANCEL and have 2 pointers
+        motionEvent = motionEventList.get(0);
+        assertEquals(2, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(e2x, Math.round(motionEvent.getX(1)));
+        assertEquals(e2y, Math.round(motionEvent.getY(1)));
+        assertEquals(MotionEvent.ACTION_CANCEL, motionEvent.getActionMasked());
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-		// First MotionEvent should be ACTION_DOWN and have 1 pointer
-		motionEvent = motionEventList.get(0);
-		assertEquals(1, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(MotionEvent.ACTION_DOWN, motionEvent.getActionMasked());
-		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+        /////////////////////////////////////////////////// Ninth OnTouchEvent Notification ///////////////////////////////////////////////////
+        testOnTouchEvent = new OnTouchEvent(TouchType.BEGIN, Arrays.asList(touchEvent1));
+        motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
 
-		/////////////////////////////////////////////////// Tenth OnTouchEvent Notification ///////////////////////////////////////////////////
-		testOnTouchEvent = new OnTouchEvent(TouchType.END, Arrays.asList(touchEvent1));
-		motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
+        // First MotionEvent should be ACTION_DOWN and have 1 pointer
+        motionEvent = motionEventList.get(0);
+        assertEquals(1, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(MotionEvent.ACTION_DOWN, motionEvent.getActionMasked());
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-		// First MotionEvent should be ACTION_UP and have 1 pointer
-		motionEvent = motionEventList.get(0);
-		assertEquals(1, motionEvent.getPointerCount());
-		assertEquals(e1x, Math.round(motionEvent.getX(0)));
-		assertEquals(e1y, Math.round(motionEvent.getY(0)));
-		assertEquals(MotionEvent.ACTION_UP, motionEvent.getActionMasked());
-		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	}
+        /////////////////////////////////////////////////// Tenth OnTouchEvent Notification ///////////////////////////////////////////////////
+        testOnTouchEvent = new OnTouchEvent(TouchType.END, Arrays.asList(touchEvent1));
+        motionEventList = videoStreamManager.convertTouchEvent(testOnTouchEvent);
 
-	@Test
+
+        // First MotionEvent should be ACTION_UP and have 1 pointer
+        motionEvent = motionEventList.get(0);
+        assertEquals(1, motionEvent.getPointerCount());
+        assertEquals(e1x, Math.round(motionEvent.getX(0)));
+        assertEquals(e1y, Math.round(motionEvent.getY(0)));
+        assertEquals(MotionEvent.ACTION_UP, motionEvent.getActionMasked());
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    }
+
+    @Test
     public void testConvertTouchEvent_Scale_1() {
         assertMotionEventWithScale(800, 480, 1.0f);
     }
@@ -506,11 +496,11 @@ public class VideoStreamManagerTests {
     private void assertMotionEventWithScale(int width, int height, float scale) {
         ISdl internalInterface = mock(ISdl.class);
 
-		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
-		VehicleType mockVehicleType = new VehicleType();
-		mockVehicleType.setMake("Ford");
-		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
-		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
+        RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
+        VehicleType mockVehicleType = new VehicleType();
+        mockVehicleType.setMake("Ford");
+        mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
+        when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
 
         // Preferred Resolution capability
         ImageResolution resolution = new ImageResolution(width, height);
@@ -543,38 +533,38 @@ public class VideoStreamManagerTests {
     }
 
     @Test
-	public void testIsHMIStateVideoStreamCapable() {
-		VideoStreamManager videoStreamManager = new VideoStreamManager(mock(ISdl.class));
-
-		// Case 1 (VideoStreamingState = STREAMABLE)
-		assertTrue(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_FULL, VideoStreamingState.STREAMABLE)));
-		assertTrue(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_LIMITED, VideoStreamingState.STREAMABLE)));
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_BACKGROUND, VideoStreamingState.STREAMABLE)));
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_NONE, VideoStreamingState.STREAMABLE)));
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(null, VideoStreamingState.STREAMABLE)));
-
-		// Case 2 (VideoStreamingState = NOT_STREAMABLE)
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_FULL, VideoStreamingState.NOT_STREAMABLE)));
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_LIMITED, VideoStreamingState.NOT_STREAMABLE)));
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_BACKGROUND, VideoStreamingState.NOT_STREAMABLE)));
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_NONE, VideoStreamingState.NOT_STREAMABLE)));
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(null, VideoStreamingState.NOT_STREAMABLE)));
-
-		// Case 3 (VideoStreamingState = NULL)
-		assertTrue(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_FULL, null)));
-		assertTrue(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_LIMITED, null)));
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_BACKGROUND, null)));
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_NONE, null)));
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(null, null)));
-
-		// Case 4 (onHMIStatus = NULL)
-		assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(null));
-	}
-
-	private OnHMIStatus createOnHMIStatus(HMILevel hmiLevel, VideoStreamingState videoStreamingState) {
-		OnHMIStatus onHMIStatus = new OnHMIStatus();
-		onHMIStatus.setHmiLevel(hmiLevel);
-		onHMIStatus.setVideoStreamingState(videoStreamingState);
-		return onHMIStatus;
-	}
+    public void testIsHMIStateVideoStreamCapable() {
+        VideoStreamManager videoStreamManager = new VideoStreamManager(mock(ISdl.class));
+
+        // Case 1 (VideoStreamingState = STREAMABLE)
+        assertTrue(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_FULL, VideoStreamingState.STREAMABLE)));
+        assertTrue(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_LIMITED, VideoStreamingState.STREAMABLE)));
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_BACKGROUND, VideoStreamingState.STREAMABLE)));
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_NONE, VideoStreamingState.STREAMABLE)));
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(null, VideoStreamingState.STREAMABLE)));
+
+        // Case 2 (VideoStreamingState = NOT_STREAMABLE)
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_FULL, VideoStreamingState.NOT_STREAMABLE)));
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_LIMITED, VideoStreamingState.NOT_STREAMABLE)));
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_BACKGROUND, VideoStreamingState.NOT_STREAMABLE)));
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_NONE, VideoStreamingState.NOT_STREAMABLE)));
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(null, VideoStreamingState.NOT_STREAMABLE)));
+
+        // Case 3 (VideoStreamingState = NULL)
+        assertTrue(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_FULL, null)));
+        assertTrue(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_LIMITED, null)));
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_BACKGROUND, null)));
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(HMILevel.HMI_NONE, null)));
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(createOnHMIStatus(null, null)));
+
+        // Case 4 (onHMIStatus = NULL)
+        assertFalse(videoStreamManager.isHMIStateVideoStreamCapable(null));
+    }
+
+    private OnHMIStatus createOnHMIStatus(HMILevel hmiLevel, VideoStreamingState videoStreamingState) {
+        OnHMIStatus onHMIStatus = new OnHMIStatus();
+        onHMIStatus.setHmiLevel(hmiLevel);
+        onHMIStatus.setVideoStreamingState(videoStreamingState);
+        return onHMIStatus;
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java
index bea2a3a46..03c91247a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlPacketTests.java
@@ -19,78 +19,78 @@ import static junit.framework.TestCase.assertNull;
 @RunWith(AndroidJUnit4.class)
 public class SdlPacketTests {
 
-	// Test variables
-	private final int TEST_HASH_ID = 65537;
-	private final String TEST_PROTOCOL_VERSION = "5.0.0";
-	private final Long TEST_MTU = (long) 131072;
-
-	// Test payload from core representing hashId and mtu size
-	private byte[] corePayload = hexStringToByteArray("39000000" +
-			"10" +
-			"68617368496400" +
-			"01000100" +
-			"126d747500" +
-			"000002" + "0000000000" + "02" +
-			"70726f746f636f6c56657273" +
-			"696f6e0006000000352e302e300000");
-
-	@Test
-	public void testNull(){
-		byte[] testPayload = hexStringToByteArray(
-				"16000000" +
-						"02" +
-						"68656c6c6f" +"00" + // hello
-						"06000000" + "776f726c64" + "00" + //world
-						"00");
-		String tag = "hello";
-
-		SdlPacket sdlPacket = new SdlPacket();
-
-		assertNull(sdlPacket.getTag(tag));
-		sdlPacket.setPayload(testPayload);
-		assertEquals(sdlPacket.getTag("hello"),"world");
-
-		assertEquals(1, sdlPacket.getVersion());
-
-		sdlPacket.setPriorityCoefficient(TestValues.GENERAL_INT);
-		assertEquals(TestValues.GENERAL_INT, sdlPacket.getPrioirtyCoefficient());
-
-		sdlPacket.setTransportRecord(new TransportRecord(TransportType.TCP, TestValues.GENERAL_STRING));
-		assertEquals(TransportType.TCP, sdlPacket.getTransportRecord().getType());
-		assertEquals(TestValues.GENERAL_STRING, sdlPacket.getTransportRecord().getAddress());
-	}
-
-	@Test
-	public void testBsonDecoding(){
-		SdlPacket sdlPacket = new SdlPacket();
-		sdlPacket.setPayload(corePayload);
-		assertEquals(sdlPacket.getTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID), TEST_HASH_ID);
-		assertEquals(sdlPacket.getTag(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION), TEST_PROTOCOL_VERSION);
-		assertEquals(sdlPacket.getTag(ControlFrameTags.RPC.StartServiceACK.MTU), TEST_MTU);
-	}
-
-	@Test
-	public void testBsonEncoding(){
-		HashMap<String, Object> testMap = new HashMap<>();
-		testMap.put(ControlFrameTags.RPC.StartServiceACK.HASH_ID, TEST_HASH_ID);
-		testMap.put(ControlFrameTags.RPC.StartServiceACK.MTU, TEST_MTU);
-		testMap.put(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION, TEST_PROTOCOL_VERSION);
-
-		byte[] observed = BsonEncoder.encodeToBytes(testMap);
-		assertEquals(observed.length, corePayload.length);
-		for(int i = 0; i < observed.length; i++){
-			assertEquals(observed[i], corePayload[i]);
-		}
-	}
-
-	// Helper method for converting String to Byte Array
-	private static byte[] hexStringToByteArray(String s) {
-		int len = s.length();
-		byte[] data = new byte[len / 2];
-		for (int i = 0; i < len; i += 2) {
-			data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
-					+ Character.digit(s.charAt(i+1), 16));
-		}
-		return data;
-	}
+    // Test variables
+    private final int TEST_HASH_ID = 65537;
+    private final String TEST_PROTOCOL_VERSION = "5.0.0";
+    private final Long TEST_MTU = (long) 131072;
+
+    // Test payload from core representing hashId and mtu size
+    private byte[] corePayload = hexStringToByteArray("39000000" +
+            "10" +
+            "68617368496400" +
+            "01000100" +
+            "126d747500" +
+            "000002" + "0000000000" + "02" +
+            "70726f746f636f6c56657273" +
+            "696f6e0006000000352e302e300000");
+
+    @Test
+    public void testNull() {
+        byte[] testPayload = hexStringToByteArray(
+                "16000000" +
+                        "02" +
+                        "68656c6c6f" + "00" + // hello
+                        "06000000" + "776f726c64" + "00" + //world
+                        "00");
+        String tag = "hello";
+
+        SdlPacket sdlPacket = new SdlPacket();
+
+        assertNull(sdlPacket.getTag(tag));
+        sdlPacket.setPayload(testPayload);
+        assertEquals(sdlPacket.getTag("hello"), "world");
+
+        assertEquals(1, sdlPacket.getVersion());
+
+        sdlPacket.setPriorityCoefficient(TestValues.GENERAL_INT);
+        assertEquals(TestValues.GENERAL_INT, sdlPacket.getPrioirtyCoefficient());
+
+        sdlPacket.setTransportRecord(new TransportRecord(TransportType.TCP, TestValues.GENERAL_STRING));
+        assertEquals(TransportType.TCP, sdlPacket.getTransportRecord().getType());
+        assertEquals(TestValues.GENERAL_STRING, sdlPacket.getTransportRecord().getAddress());
+    }
+
+    @Test
+    public void testBsonDecoding() {
+        SdlPacket sdlPacket = new SdlPacket();
+        sdlPacket.setPayload(corePayload);
+        assertEquals(sdlPacket.getTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID), TEST_HASH_ID);
+        assertEquals(sdlPacket.getTag(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION), TEST_PROTOCOL_VERSION);
+        assertEquals(sdlPacket.getTag(ControlFrameTags.RPC.StartServiceACK.MTU), TEST_MTU);
+    }
+
+    @Test
+    public void testBsonEncoding() {
+        HashMap<String, Object> testMap = new HashMap<>();
+        testMap.put(ControlFrameTags.RPC.StartServiceACK.HASH_ID, TEST_HASH_ID);
+        testMap.put(ControlFrameTags.RPC.StartServiceACK.MTU, TEST_MTU);
+        testMap.put(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION, TEST_PROTOCOL_VERSION);
+
+        byte[] observed = BsonEncoder.encodeToBytes(testMap);
+        assertEquals(observed.length, corePayload.length);
+        for (int i = 0; i < observed.length; i++) {
+            assertEquals(observed[i], corePayload[i]);
+        }
+    }
+
+    // Helper method for converting String to Byte Array
+    private static byte[] hexStringToByteArray(String s) {
+        int len = s.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                    + Character.digit(s.charAt(i + 1), 16));
+        }
+        return data;
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
index ba6249e40..fe2bd4c80 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/SdlProtocolTests.java
@@ -39,13 +39,14 @@ public class SdlProtocolTests {
 
     ISdlProtocol defaultListener = mock(ISdlProtocol.class);
 
-    public static class DidReceiveListener implements ISdlProtocol{
+    public static class DidReceiveListener implements ISdlProtocol {
         boolean didReceive = false;
 
-        public void reset(){
+        public void reset() {
             didReceive = false;
         }
-        public boolean didReceive(){
+
+        public boolean didReceive() {
             return didReceive;
         }
 
@@ -112,137 +113,138 @@ public class SdlProtocolTests {
 
         }
 
-    };
+    }
 
     DidReceiveListener onProtocolMessageReceivedListener = new DidReceiveListener();
 
 
     @Before
-    public void setUp(){
+    public void setUp() {
         config = new MultiplexTransportConfig(getInstrumentation().getContext(), SdlUnitTestContants.TEST_APP_ID);
-        protocol = new SdlProtocol(defaultListener,config);
+        protocol = new SdlProtocol(defaultListener, config);
     }
 
 
     @Test
-    public void testBase(){
-        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener,config);
+    public void testBase() {
+        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener, config);
 
     }
 
     @Test
-    public void testVersion(){
-        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener,config);
+    public void testVersion() {
+        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener, config);
 
-        sdlProtocol.setVersion((byte)0x01);
-        assertEquals((byte)0x01,sdlProtocol.getProtocolVersion().getMajor());
+        sdlProtocol.setVersion((byte) 0x01);
+        assertEquals((byte) 0x01, sdlProtocol.getProtocolVersion().getMajor());
 
-        sdlProtocol = new SdlProtocol(defaultListener,config);
-        sdlProtocol.setVersion((byte)0x02);
-        assertEquals((byte)0x02,sdlProtocol.getProtocolVersion().getMajor());
+        sdlProtocol = new SdlProtocol(defaultListener, config);
+        sdlProtocol.setVersion((byte) 0x02);
+        assertEquals((byte) 0x02, sdlProtocol.getProtocolVersion().getMajor());
 
-        sdlProtocol = new SdlProtocol(defaultListener,config);
-        sdlProtocol.setVersion((byte)0x03);
-        assertEquals((byte)0x03,sdlProtocol.getProtocolVersion().getMajor());
+        sdlProtocol = new SdlProtocol(defaultListener, config);
+        sdlProtocol.setVersion((byte) 0x03);
+        assertEquals((byte) 0x03, sdlProtocol.getProtocolVersion().getMajor());
 
-        sdlProtocol = new SdlProtocol(defaultListener,config);
-        sdlProtocol.setVersion((byte)0x04);
-        assertEquals((byte)0x04,sdlProtocol.getProtocolVersion().getMajor());
+        sdlProtocol = new SdlProtocol(defaultListener, config);
+        sdlProtocol.setVersion((byte) 0x04);
+        assertEquals((byte) 0x04, sdlProtocol.getProtocolVersion().getMajor());
 
-        sdlProtocol = new SdlProtocol(defaultListener,config);
-        sdlProtocol.setVersion((byte)0x05);
-        assertEquals((byte)0x05,sdlProtocol.getProtocolVersion().getMajor());
+        sdlProtocol = new SdlProtocol(defaultListener, config);
+        sdlProtocol.setVersion((byte) 0x05);
+        assertEquals((byte) 0x05, sdlProtocol.getProtocolVersion().getMajor());
 
         //If we get newer than 5, it should fall back to 5
-        sdlProtocol = new SdlProtocol(defaultListener,config);
-        sdlProtocol.setVersion((byte)0x06);
-        assertEquals((byte)0x05,sdlProtocol.getProtocolVersion().getMajor());
+        sdlProtocol = new SdlProtocol(defaultListener, config);
+        sdlProtocol.setVersion((byte) 0x06);
+        assertEquals((byte) 0x05, sdlProtocol.getProtocolVersion().getMajor());
 
         //Is this right?
-        sdlProtocol = new SdlProtocol(defaultListener,config);
-        sdlProtocol.setVersion((byte)0x00);
-        assertEquals((byte)0x01,sdlProtocol.getProtocolVersion().getMajor());
+        sdlProtocol = new SdlProtocol(defaultListener, config);
+        sdlProtocol.setVersion((byte) 0x00);
+        assertEquals((byte) 0x01, sdlProtocol.getProtocolVersion().getMajor());
     }
 
     @Test
-    public void testMtu(){
-        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener,config);
+    public void testMtu() {
+        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener, config);
 
-        sdlProtocol.setVersion((byte)0x01);
+        sdlProtocol.setVersion((byte) 0x01);
 
-        try{
-            assertEquals(sdlProtocol.getMtu(), 1500-8);
+        try {
+            assertEquals(sdlProtocol.getMtu(), 1500 - 8);
 
             //Version 2
-            sdlProtocol.setVersion((byte)0x02);
-            assertEquals(sdlProtocol.getMtu(), 1500-12);
+            sdlProtocol.setVersion((byte) 0x02);
+            assertEquals(sdlProtocol.getMtu(), 1500 - 12);
 
             //Version 3
-            sdlProtocol.setVersion((byte)0x03);
+            sdlProtocol.setVersion((byte) 0x03);
             assertEquals(sdlProtocol.getMtu(), 131072);
 
             //Version 4
-            sdlProtocol.setVersion((byte)0x04);
+            sdlProtocol.setVersion((byte) 0x04);
             assertEquals(sdlProtocol.getMtu(), 131072);
 
             //Version 5
-            sdlProtocol.setVersion((byte)0x05);
+            sdlProtocol.setVersion((byte) 0x05);
             assertEquals(sdlProtocol.getMtu(), 131072);
 
             //Version 5+
-            sdlProtocol.setVersion((byte)0x06);
+            sdlProtocol.setVersion((byte) 0x06);
             assertEquals(sdlProtocol.getMtu(), 131072);
 
-        }catch(Exception e){
+        } catch (Exception e) {
             Assert.fail("Exceptin during reflection");
         }
 
     }
 
     @Test
-    public void testHandleFrame(){
+    public void testHandleFrame() {
         SampleRpc sampleRpc = new SampleRpc(4);
-        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener,config);
+        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener, config);
         SdlProtocolBase.MessageFrameAssembler assembler = sdlProtocol.new MessageFrameAssembler();
-        try{
+        try {
             assembler.handleFrame(sampleRpc.toSdlPacket());
-        }catch(Exception e){
+        } catch (Exception e) {
             Assert.fail("Exceptin during handleFrame - " + e.toString());
         }
     }
+
     @Test
-    public void testHandleFrameCorrupt(){
+    public void testHandleFrameCorrupt() {
         SampleRpc sampleRpc = new SampleRpc(4);
         BinaryFrameHeader header = sampleRpc.getBinaryFrameHeader(true);
         header.setJsonSize(Integer.MAX_VALUE);
         sampleRpc.setBinaryFrameHeader(header);
-        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener,config);
+        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener, config);
         SdlProtocolBase.MessageFrameAssembler assembler = sdlProtocol.new MessageFrameAssembler();
-        try{
+        try {
             assembler.handleFrame(sampleRpc.toSdlPacket());
-        }catch(Exception e){
+        } catch (Exception e) {
             Assert.fail("Exceptin during handleFrame - " + e.toString());
         }
     }
 
     @Test
-    public void testHandleSingleFrameMessageFrame(){
+    public void testHandleSingleFrameMessageFrame() {
         SampleRpc sampleRpc = new SampleRpc(4);
-        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener,config);
+        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener, config);
         SdlProtocolBase.MessageFrameAssembler assembler = sdlProtocol.new MessageFrameAssembler();
 
 
-        try{
-            Method method = assembler.getClass().getDeclaredMethod ("handleSingleFrameMessageFrame", SdlPacket.class);
+        try {
+            Method method = assembler.getClass().getDeclaredMethod("handleSingleFrameMessageFrame", SdlPacket.class);
             method.setAccessible(true);
-            method.invoke (assembler, sampleRpc.toSdlPacket());
-        }catch(Exception e){
+            method.invoke(assembler, sampleRpc.toSdlPacket());
+        } catch (Exception e) {
             Assert.fail("Exceptin during handleSingleFrameMessageFrame - " + e.toString());
         }
     }
 
     @Test
-    public void testHandleSingleFrameMessageFrameCorruptBfh(){
+    public void testHandleSingleFrameMessageFrameCorruptBfh() {
         SampleRpc sampleRpc = new SampleRpc(4);
 
         //Create a corrupted header
@@ -257,34 +259,32 @@ public class SdlProtocolTests {
         BinaryFrameHeader binFrameHeader = BinaryFrameHeader.parseBinaryHeader(packet.payload);
         assertNull(binFrameHeader);
 
-        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener,config);
+        SdlProtocol sdlProtocol = new SdlProtocol(defaultListener, config);
 
 
         sdlProtocol.handlePacketReceived(packet);
         assertFalse(onProtocolMessageReceivedListener.didReceive());
 
         onProtocolMessageReceivedListener.reset();
-        SdlProtocol.MessageFrameAssembler assembler =sdlProtocol.getFrameAssemblerForFrame(packet);// sdlProtocol.new MessageFrameAssembler();
+        SdlProtocol.MessageFrameAssembler assembler = sdlProtocol.getFrameAssemblerForFrame(packet);// sdlProtocol.new MessageFrameAssembler();
         assertNotNull(assembler);
         assembler.handleFrame(packet);
         assertFalse(onProtocolMessageReceivedListener.didReceive());
 
-        try{
-            Method  method = assembler.getClass().getDeclaredMethod("handleSingleFrameMessageFrame", SdlPacket.class);
+        try {
+            Method method = assembler.getClass().getDeclaredMethod("handleSingleFrameMessageFrame", SdlPacket.class);
             method.setAccessible(true);
-            method.invoke (assembler, sampleRpc.toSdlPacket());
-        }catch(Exception e){
+            method.invoke(assembler, sampleRpc.toSdlPacket());
+        } catch (Exception e) {
             Assert.fail("Exceptin during handleSingleFrameMessageFrame - " + e.toString());
         }
     }
 
 
-
-
     @Test
-    public void testNormalCase(){
+    public void testNormalCase() {
         setUp();
-        payload = new byte[]{0x00,0x02,0x05,0x01,0x01,0x01,0x05,0x00};
+        payload = new byte[]{0x00, 0x02, 0x05, 0x01, 0x01, 0x01, 0x05, 0x00};
         byte sessionID = 1, version = 1;
         int messageID = 1;
         boolean encrypted = false;
@@ -295,13 +295,13 @@ public class SdlProtocolTests {
 
         OutOfMemoryError oom_error = null;
         NullPointerException np_exception = null;
-        try{
+        try {
             assembler.handleMultiFrameMessageFrame(sdlPacket);
-        }catch(OutOfMemoryError e){
+        } catch (OutOfMemoryError e) {
             oom_error = e;
-        }catch(NullPointerException z){
+        } catch (NullPointerException z) {
             np_exception = z;
-        }catch(Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             assertNotNull(null);
         }
@@ -312,13 +312,13 @@ public class SdlProtocolTests {
         payload = new byte[23534];
         sdlPacket = SdlPacketFactory.createMultiSendDataRest(SessionType.RPC, sessionID, payload.length, (byte) 3, messageID, version, payload, 0, 1500, encrypted);
         assembler = protocol.getFrameAssemblerForFrame(sdlPacket);
-        try{
+        try {
             assembler.handleMultiFrameMessageFrame(sdlPacket);
-        }catch(OutOfMemoryError e){
+        } catch (OutOfMemoryError e) {
             oom_error = e;
-        }catch(NullPointerException z){
+        } catch (NullPointerException z) {
             np_exception = z;
-        }catch(Exception e){
+        } catch (Exception e) {
             assertNotNull(null);
         }
 
@@ -327,10 +327,10 @@ public class SdlProtocolTests {
     }
 
     @Test
-    public void testOverallocatingAccumulator(){
+    public void testOverallocatingAccumulator() {
         setUp();
         ByteArrayOutputStream builder = new ByteArrayOutputStream();
-        for(int i = 0; i < 8; i++){
+        for (int i = 0; i < 8; i++) {
             builder.write(0x0F);
         }
         payload = builder.toByteArray();
@@ -342,13 +342,13 @@ public class SdlProtocolTests {
 
         OutOfMemoryError oom_error = null;
         NullPointerException np_exception = null;
-        try{
+        try {
             assembler.handleMultiFrameMessageFrame(sdlPacket);
-        }catch(OutOfMemoryError e){
+        } catch (OutOfMemoryError e) {
             oom_error = e;
-        }catch(NullPointerException z){
+        } catch (NullPointerException z) {
             np_exception = z;
-        }catch(Exception e){
+        } catch (Exception e) {
             assertNotNull(null);
         }
 
@@ -359,13 +359,13 @@ public class SdlProtocolTests {
         sdlPacket = SdlPacketFactory.createMultiSendDataRest(SessionType.RPC, sessionID, payload.length, (byte) 3, messageID, version, payload, 0, 1500, encrypted);
         assembler = protocol.getFrameAssemblerForFrame(sdlPacket);
 
-        try{
+        try {
             assembler.handleMultiFrameMessageFrame(sdlPacket);
-        }catch(OutOfMemoryError e){
+        } catch (OutOfMemoryError e) {
             oom_error = e;
-        }catch(NullPointerException z){
+        } catch (NullPointerException z) {
             np_exception = z;
-        }catch(Exception e){
+        } catch (Exception e) {
             assertNotNull(null);
         }
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
index a8aec30ac..48497b0a6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
@@ -23,73 +23,71 @@ import static junit.framework.TestCase.assertTrue;
 @RunWith(AndroidJUnit4.class)
 public abstract class BaseRpcTests {
 
-    public static final int  SDL_VERSION_UNDER_TEST = Config.SDL_VERSION_UNDER_TEST;
+    public static final int SDL_VERSION_UNDER_TEST = Config.SDL_VERSION_UNDER_TEST;
 
     private static final int CORR_ID = 402;
 
     protected RPCMessage msg;
 
     /**
-	 * Sets up the specific RPC message under testing.
-	 */
+     * Sets up the specific RPC message under testing.
+     */
     protected abstract RPCMessage createMessage();
 
     /**
-	 * Retrieves the RPC message type under testing.
-	 */
+     * Retrieves the RPC message type under testing.
+     */
     protected abstract String getMessageType();
 
     /**
-	 * Retrieves the RPC command type under testing.
-	 */
+     * Retrieves the RPC command type under testing.
+     */
     protected abstract String getCommandType();
 
     /**
-	 * Retrieves the JSON translated RPC message under testing.
-	 */
+     * Retrieves the JSON translated RPC message under testing.
+     */
     protected abstract JSONObject getExpectedParameters(int sdlVersion);
 
     @Before
-    public void setUp(){
+    public void setUp() {
         this.msg = createMessage();
         if (msg instanceof RPCRequest) {
-        	((RPCRequest) msg).setCorrelationID(CORR_ID);
+            ((RPCRequest) msg).setCorrelationID(CORR_ID);
+        } else if (msg instanceof RPCResponse) {
+            ((RPCResponse) msg).setCorrelationID(CORR_ID);
         }
-        else if (msg instanceof RPCResponse) {
-        	((RPCResponse) msg).setCorrelationID(CORR_ID);
-        }
-        
+
     }
 
     @Test
-    public void testCreation(){
+    public void testCreation() {
         assertNotNull("Object creation failed.", msg);
     }
 
     @Test
-    public void testCorrelationId(){
-    	int correlationId;
-    	if (msg instanceof RPCRequest) {
-            correlationId = ((RPCRequest) msg).getCorrelationID();  
+    public void testCorrelationId() {
+        int correlationId;
+        if (msg instanceof RPCRequest) {
+            correlationId = ((RPCRequest) msg).getCorrelationID();
             assertEquals("Correlation ID doesn't match expected ID.", CORR_ID, correlationId);
-    	}
-    	else if (msg instanceof RPCResponse) {
+        } else if (msg instanceof RPCResponse) {
             correlationId = ((RPCResponse) msg).getCorrelationID();
             assertEquals("Correlation ID doesn't match expected ID.", CORR_ID, correlationId);
-    	}
-    
+        }
+
     }
 
     @Test
-    public void testMessageType(){
+    public void testMessageType() {
         String messageType = msg.getMessageType();
-        
+
         assertNotNull("Message type was null.", messageType);
         assertEquals("Message type was not REQUEST.", getMessageType(), messageType);
     }
 
     @Test
-    public void testCommandType(){
+    public void testCommandType() {
         String command = msg.getFunctionName();
 
         assertNotNull("Command was null.", command);
@@ -98,7 +96,7 @@ public abstract class BaseRpcTests {
 
 
     @Test
-    public void testFunctionName(){
+    public void testFunctionName() {
         String funcName = msg.getFunctionName();
 
         assertNotNull("Function name was null.", funcName);
@@ -106,30 +104,30 @@ public abstract class BaseRpcTests {
     }
 
     @Test
-    public void testJson(){
-        try{
+    public void testJson() {
+        try {
             JSONObject reference = buildJsonStore();
-            JSONObject underTest = msg.serializeJSON();  
-            
+            JSONObject underTest = msg.serializeJSON();
+
             assertEquals("Size of JSON under test didn't match expected size.", reference.length(), underTest.length());
 
             // loop through all values and verifies they match the RPCMessage parameters
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 Object referenceValue = JsonUtils.readObjectFromJsonObject(reference, key);
                 testJsonParameters((JSONObject) referenceValue, (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
+        } catch (JSONException e) {
             // do nothing 
         }
     }
-    
-    private JSONObject buildJsonStore() throws JSONException{
+
+    private JSONObject buildJsonStore() throws JSONException {
         JSONObject result = new JSONObject(), command = new JSONObject();
 
         if (!getMessageType().equals(RPCMessage.KEY_NOTIFICATION)) {
-        	command.put(RPCMessage.KEY_CORRELATION_ID, CORR_ID);
+            command.put(RPCMessage.KEY_CORRELATION_ID, CORR_ID);
         }
         command.put(RPCMessage.KEY_FUNCTION_NAME, msg.getFunctionName());
         command.put(RPCMessage.KEY_PARAMETERS, getExpectedParameters(SDL_VERSION_UNDER_TEST));
@@ -138,73 +136,68 @@ public abstract class BaseRpcTests {
 
         return result;
     }
-    
-    private void testJsonParameters(JSONObject reference, JSONObject underTest) throws JSONException{
+
+    private void testJsonParameters(JSONObject reference, JSONObject underTest) throws JSONException {
         assertEquals("Size of JSON under test didn't match expected size.", reference.length(), underTest.length());
 
         Iterator<?> iterator = reference.keys();
-        while(iterator.hasNext()){
+        while (iterator.hasNext()) {
             String key = (String) iterator.next();
             Object referenceValue = JsonUtils.readObjectFromJsonObject(reference, key);
-            if(referenceValue instanceof JSONObject){
+            if (referenceValue instanceof JSONObject) {
                 testJsonParameters((JSONObject) referenceValue, (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key));
-            }
-            else if(referenceValue instanceof JSONArray){
+            } else if (referenceValue instanceof JSONArray) {
                 JSONArray array1 = (JSONArray) referenceValue, array2 = (JSONArray) JsonUtils.readObjectFromJsonObject(underTest, key);
                 testJsonArray(array1, array2, key);
-            }
-            else{
+            } else {
                 assertTrue("JSON object didn't match reference object for key \"" + key + "\".", referenceValue.equals(JsonUtils.readObjectFromJsonObject(underTest, key)));
             }
         }
     }
-    
-    private void testJsonArray(JSONArray reference, JSONArray underTest, String key) throws JSONException{
+
+    private void testJsonArray(JSONArray reference, JSONArray underTest, String key) throws JSONException {
         assertEquals("Size of JSON array didn't match expected size.", reference.length(), underTest.length());
         int len = reference.length();
-        for(int i=0; i<len; i++){
+        for (int i = 0; i < len; i++) {
             Object array1Obj = reference.get(i), array2Obj = underTest.get(i);
-            if(array1Obj instanceof JSONObject){
+            if (array1Obj instanceof JSONObject) {
                 testJsonParameters((JSONObject) array1Obj, (JSONObject) array2Obj);
-            }
-            else if(array1Obj instanceof JSONArray){
+            } else if (array1Obj instanceof JSONArray) {
                 testJsonArray((JSONArray) array1Obj, (JSONArray) array2Obj, key);
-            }
-            else{
+            } else {
                 assertTrue("JSONArray object didn't match reference object for key \"" + key + "\".", array1Obj.equals(array2Obj));
             }
         }
     }
 
     // this method must be manually called from the subclass
-    protected void testNullBase(RPCMessage msg){
+    protected void testNullBase(RPCMessage msg) {
         assertNotNull("RPCMessage was null.", msg);
-    	
-    	Integer correlationId;
-    	if (msg instanceof RPCRequest) {
-            correlationId = ((RPCRequest) msg).getCorrelationID();  
+
+        Integer correlationId;
+        if (msg instanceof RPCRequest) {
+            correlationId = ((RPCRequest) msg).getCorrelationID();
             assertNotNull("Correlation ID of the RPC message was null.", correlationId);
             //assertEquals("Correlation ID didn't match expected correlation ID.", CORR_ID, (int) correlationId);
-    	}
-    	else if (msg instanceof RPCResponse) {
+        } else if (msg instanceof RPCResponse) {
             correlationId = ((RPCResponse) msg).getCorrelationID();
             assertNull("Correlation ID of the RPC message was not null.", correlationId);
             //assertEquals("Correlation ID didn't match expected correlation ID.", CORR_ID, (int) correlationId);
-    	}
+        }
 
         assertNotNull("Message type of the RPC message was null.", msg.getMessageType());
-        
+
         assertEquals("Message type didn't match expected message type.", getMessageType(), msg.getMessageType());
 
         assertNotNull("Command type of the RPC message was null.", msg.getMessageType());
         assertEquals("Command type didn't match expected command type.", getCommandType(), msg.getFunctionName());
 
 
-        try{
+        try {
             assertTrue("Parameters weren't initialized, but the JSON contained 2 or more objects.", (msg.serializeJSON().length() == 1));
-        } catch(JSONException e) {
+        } catch (JSONException e) {
             //do nothing
         }
 
-    }  
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java
index 7f424bda9..7655dfe31 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java
@@ -1,10 +1,11 @@
 package com.smartdevicelink.test;
 
 
-public class Config{
+public class Config {
+
+    private Config() {
+    }
 
-    private Config(){}
-    
     public static final int SDL_VERSION_UNDER_TEST = 3;
     public static final boolean DEBUG = true;
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java
index 5cb0cf719..716022b75 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java
@@ -13,257 +13,266 @@ import java.util.List;
 
 
 public final class JsonUtils {
-	
-	private JsonUtils(){}
-	
-	public static JSONObject createJsonObject(byte[] data){
-		JSONObject result = null;
-		try {
-			String jsonStr = new String(data);
-			result = new JSONObject(jsonStr);
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-		return result;
-	}
-	
-	public static JSONArray createJsonArrayOfJsonObjects(List<? extends RPCStruct> parameterList, int sdlVersion) throws JSONException{
-		JSONArray result = new JSONArray();
-		
-		for(RPCStruct parameter : parameterList){
-			//result.put(parameter.getJsonParameters(sdlVersion));
-			result.put(parameter.serializeJSON());
-		}
-		
-		return result;
-	}
-	
-	public static JSONArray createJsonArrayOfJsonNames(List<? extends Enum<?>> parameterList, int sdlVersion) throws JSONException{
-		JSONArray result = new JSONArray();
-		
-		for(Enum<?> name : parameterList){
-			result.put(name);
-		}
-		
-		return result;
-	}
-	
-	public static <T> JSONArray createJsonArray(List<T> list) throws JSONException{
-		JSONArray result = new JSONArray();
-		
-		for(T str : list){
-			result.put(str);
-		}
-		
-		return result;
-	}
-	
-	// this method is basically to get around the annoying JSONException that is thrown when a key doesn't exist
-	// in the JSON object.  this method returns null instead of throwing an exception.
-	public static Object readObjectFromJsonObject(JSONObject json, String key){
-		try {
-			return json.get(key);
-		} catch (JSONException e) {
-			return null;
-		}
-	}
-	
-	public static Boolean readBooleanFromJsonObject(JSONObject json, String key){
-		try {
-			return json.getBoolean(key);
-		} catch (JSONException e) {
-			return null;
-		}
-	}
-	
-	public static Double readDoubleFromJsonObject(JSONObject json, String key){
-		try {
-			return json.getDouble(key);
-		} catch (JSONException e) {
-			return null;
-		}
-	}
-	
-	public static Integer readIntegerFromJsonObject(JSONObject json, String key){
-		try {
-			return json.getInt(key);
-		} catch (JSONException e) {
-			return null;
-		}
-	}
-
-	public static JSONArray readJsonArrayFromJsonObject(JSONObject json, String key){
-		try {
-			return json.getJSONArray(key);
-		} catch (JSONException e) {
-			return null;
-		}
-	}
-	
-	public static List<String> readStringListFromJsonObject(JSONObject json, String key){
-		JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
-		
-		if(jsonArray != null){
-			int len = jsonArray.length();
-			List<String> result = new ArrayList<String>(len);
-			for(int i=0; i<len; i++){
-				try {
-					String str = jsonArray.getString(i);
-					result.add(str);
-				} catch (JSONException e) {}
-			}
-			return result;
-		}
-		
-		return null;
-	}
-
-	public static List<AppServiceType> readAppServiceTypeListFromJsonObject(JSONObject json, String key){
-		JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
-
-		if(jsonArray != null){
-			int len = jsonArray.length();
-			List<AppServiceType> result = new ArrayList<>(len);
-			for(int i=0; i<len; i++){
-				try {
-					AppServiceType serviceType = (AppServiceType) jsonArray.get(i);
-					result.add(serviceType);
-				} catch (JSONException e) {}
-			}
-			return result;
-		}
-
-		return null;
-	}
-
-	public static List<AppServiceCapability> readAppServiceCapabilityListFromJsonObject(JSONObject json, String key){
-		JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
-		if(jsonArray != null){
-			int len = jsonArray.length();
-			List<AppServiceCapability> result = new ArrayList<>(len);
-			for(int i=0; i<len; i++){
-				try {
-					AppServiceCapability serviceCapability = (AppServiceCapability) jsonArray.getJSONArray(0).get(i);
-					result.add(serviceCapability);
-				} catch (JSONException e) {}
-			}
-			return result;
-		}
-
-		return null;
-	}
-	
-	public static List<Integer> readIntegerListFromJsonObject(JSONObject json, String key){
-		JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
-		
-		if(jsonArray != null){
-			int len = jsonArray.length();
-			List<Integer> result = new ArrayList<Integer>(len);
-			for(int i=0; i<len; i++){
-				try {
-					Integer str = jsonArray.getInt(i);
-					result.add(str);
-				} catch (JSONException e) {}
-			}
-			return result;
-		}
-		
-		return null;
-	}
-
-	public static List<Boolean> readBooleanListFromJsonObject(JSONObject json, String key){
-		JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
-
-		if(jsonArray != null){
-			int len = jsonArray.length();
-			List<Boolean> result = new ArrayList<>(len);
-			for(int i=0; i<len; i++){
-				try {
-					Boolean bool = jsonArray.getBoolean(i);
-					result.add(bool);
-				} catch (JSONException e) {}
-			}
-			return result;
-		}
-
-		return null;
-	}
-	
-	public static List<Double> readDoubleListFromJsonObject(JSONObject json, String key){
-		JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
-		
-		if(jsonArray != null){
-			int len = jsonArray.length();
-			List<Double> result = new ArrayList<Double>(len);
-			for(int i=0; i<len; i++){
-				try {
-					Double str = jsonArray.getDouble(i);
-					result.add(str);
-				} catch (JSONException e) {}
-			}
-			return result;
-		}
-		
-		return null;
-	}
-	
-	public static List<Long> readLongListFromJsonObject(JSONObject json, String key){
-		JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
-		
-		if(jsonArray != null){
-			int len = jsonArray.length();
-			List<Long> result = new ArrayList<Long>(len);
-			for(int i=0; i<len; i++){
-				try {
-					Long str = jsonArray.getLong(i);
-					result.add(str);
-				} catch (JSONException e) {}
-			}
-			return result;
-		}
-		
-		return null;
-	}
-
-	public static List<JSONObject> readJsonObjectListFromJsonObject(JSONObject json, String key){
-		JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
-		
-		if(jsonArray != null){
-			int len = jsonArray.length();
-			List<JSONObject> result = new ArrayList<JSONObject>(len);
-			for(int i=0; i<len; i++){
-				try{
-					JSONObject jsonObject = jsonArray.getJSONObject(i);
-					result.add(jsonObject);
-				} catch(JSONException e) {}
-			}
-			return result;
-		}
-		
-		return null;
-	}
-	
-	public static JSONObject readJsonObjectFromJsonObject(JSONObject json, String key){
-		try {
-			return json.getJSONObject(key);
-		} catch (JSONException e) {
-			return null;
-		}
-	}
-	
-	public static Long readLongFromJsonObject(JSONObject json, String key){
-		try {
-			return json.getLong(key);
-		} catch (JSONException e) {
-			return null;
-		}
-	}
-	
-	public static String readStringFromJsonObject(JSONObject json, String key){
-		try {
-			return json.getString(key);
-		} catch (JSONException e) {
-			return null;
-		}
-	}
+
+    private JsonUtils() {
+    }
+
+    public static JSONObject createJsonObject(byte[] data) {
+        JSONObject result = null;
+        try {
+            String jsonStr = new String(data);
+            result = new JSONObject(jsonStr);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    public static JSONArray createJsonArrayOfJsonObjects(List<? extends RPCStruct> parameterList, int sdlVersion) throws JSONException {
+        JSONArray result = new JSONArray();
+
+        for (RPCStruct parameter : parameterList) {
+            //result.put(parameter.getJsonParameters(sdlVersion));
+            result.put(parameter.serializeJSON());
+        }
+
+        return result;
+    }
+
+    public static JSONArray createJsonArrayOfJsonNames(List<? extends Enum<?>> parameterList, int sdlVersion) throws JSONException {
+        JSONArray result = new JSONArray();
+
+        for (Enum<?> name : parameterList) {
+            result.put(name);
+        }
+
+        return result;
+    }
+
+    public static <T> JSONArray createJsonArray(List<T> list) throws JSONException {
+        JSONArray result = new JSONArray();
+
+        for (T str : list) {
+            result.put(str);
+        }
+
+        return result;
+    }
+
+    // this method is basically to get around the annoying JSONException that is thrown when a key doesn't exist
+    // in the JSON object.  this method returns null instead of throwing an exception.
+    public static Object readObjectFromJsonObject(JSONObject json, String key) {
+        try {
+            return json.get(key);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    public static Boolean readBooleanFromJsonObject(JSONObject json, String key) {
+        try {
+            return json.getBoolean(key);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    public static Double readDoubleFromJsonObject(JSONObject json, String key) {
+        try {
+            return json.getDouble(key);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    public static Integer readIntegerFromJsonObject(JSONObject json, String key) {
+        try {
+            return json.getInt(key);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    public static JSONArray readJsonArrayFromJsonObject(JSONObject json, String key) {
+        try {
+            return json.getJSONArray(key);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    public static List<String> readStringListFromJsonObject(JSONObject json, String key) {
+        JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
+
+        if (jsonArray != null) {
+            int len = jsonArray.length();
+            List<String> result = new ArrayList<String>(len);
+            for (int i = 0; i < len; i++) {
+                try {
+                    String str = jsonArray.getString(i);
+                    result.add(str);
+                } catch (JSONException e) {
+                }
+            }
+            return result;
+        }
+
+        return null;
+    }
+
+    public static List<AppServiceType> readAppServiceTypeListFromJsonObject(JSONObject json, String key) {
+        JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
+
+        if (jsonArray != null) {
+            int len = jsonArray.length();
+            List<AppServiceType> result = new ArrayList<>(len);
+            for (int i = 0; i < len; i++) {
+                try {
+                    AppServiceType serviceType = (AppServiceType) jsonArray.get(i);
+                    result.add(serviceType);
+                } catch (JSONException e) {
+                }
+            }
+            return result;
+        }
+
+        return null;
+    }
+
+    public static List<AppServiceCapability> readAppServiceCapabilityListFromJsonObject(JSONObject json, String key) {
+        JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
+        if (jsonArray != null) {
+            int len = jsonArray.length();
+            List<AppServiceCapability> result = new ArrayList<>(len);
+            for (int i = 0; i < len; i++) {
+                try {
+                    AppServiceCapability serviceCapability = (AppServiceCapability) jsonArray.getJSONArray(0).get(i);
+                    result.add(serviceCapability);
+                } catch (JSONException e) {
+                }
+            }
+            return result;
+        }
+
+        return null;
+    }
+
+    public static List<Integer> readIntegerListFromJsonObject(JSONObject json, String key) {
+        JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
+
+        if (jsonArray != null) {
+            int len = jsonArray.length();
+            List<Integer> result = new ArrayList<Integer>(len);
+            for (int i = 0; i < len; i++) {
+                try {
+                    Integer str = jsonArray.getInt(i);
+                    result.add(str);
+                } catch (JSONException e) {
+                }
+            }
+            return result;
+        }
+
+        return null;
+    }
+
+    public static List<Boolean> readBooleanListFromJsonObject(JSONObject json, String key) {
+        JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
+
+        if (jsonArray != null) {
+            int len = jsonArray.length();
+            List<Boolean> result = new ArrayList<>(len);
+            for (int i = 0; i < len; i++) {
+                try {
+                    Boolean bool = jsonArray.getBoolean(i);
+                    result.add(bool);
+                } catch (JSONException e) {
+                }
+            }
+            return result;
+        }
+
+        return null;
+    }
+
+    public static List<Double> readDoubleListFromJsonObject(JSONObject json, String key) {
+        JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
+
+        if (jsonArray != null) {
+            int len = jsonArray.length();
+            List<Double> result = new ArrayList<Double>(len);
+            for (int i = 0; i < len; i++) {
+                try {
+                    Double str = jsonArray.getDouble(i);
+                    result.add(str);
+                } catch (JSONException e) {
+                }
+            }
+            return result;
+        }
+
+        return null;
+    }
+
+    public static List<Long> readLongListFromJsonObject(JSONObject json, String key) {
+        JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
+
+        if (jsonArray != null) {
+            int len = jsonArray.length();
+            List<Long> result = new ArrayList<Long>(len);
+            for (int i = 0; i < len; i++) {
+                try {
+                    Long str = jsonArray.getLong(i);
+                    result.add(str);
+                } catch (JSONException e) {
+                }
+            }
+            return result;
+        }
+
+        return null;
+    }
+
+    public static List<JSONObject> readJsonObjectListFromJsonObject(JSONObject json, String key) {
+        JSONArray jsonArray = readJsonArrayFromJsonObject(json, key);
+
+        if (jsonArray != null) {
+            int len = jsonArray.length();
+            List<JSONObject> result = new ArrayList<JSONObject>(len);
+            for (int i = 0; i < len; i++) {
+                try {
+                    JSONObject jsonObject = jsonArray.getJSONObject(i);
+                    result.add(jsonObject);
+                } catch (JSONException e) {
+                }
+            }
+            return result;
+        }
+
+        return null;
+    }
+
+    public static JSONObject readJsonObjectFromJsonObject(JSONObject json, String key) {
+        try {
+            return json.getJSONObject(key);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    public static Long readLongFromJsonObject(JSONObject json, String key) {
+        try {
+            return json.getLong(key);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    public static String readStringFromJsonObject(JSONObject json, String key) {
+        try {
+            return json.getString(key);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java
index ab922fd7a..f5caeb6f5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java
@@ -1,16 +1,16 @@
 package com.smartdevicelink.test;
 
 
+public class Logger {
 
-public class Logger{
+    private Logger() {
+    }
 
-    private Logger(){}
-    
-    public static void log(String tag, String msg){
-        if(Config.DEBUG){
+    public static void log(String tag, String msg) {
+        if (Config.DEBUG) {
             System.out.print(tag + ": ");
             System.out.println(msg);
         }
     }
-    
+
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java
index ce5972887..b01019460 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java
@@ -2,14 +2,14 @@ package com.smartdevicelink.test;
 
 /**
  * This class is to help with ambiguous method signatures.
- * @author Joey Grover
  *
+ * @author Joey Grover
  */
 public class NullValues {
 
-	public static final String STRING = null;
-	public static final Integer INTEGER = null;
-	public static final Boolean BOOLEAN = null;
-	public static final Double DOUBLE = null;
-	
+    public static final String STRING = null;
+    public static final Integer INTEGER = null;
+    public static final Boolean BOOLEAN = null;
+    public static final Double DOUBLE = null;
+
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java
index 67c15706c..4965b89c5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java
@@ -12,79 +12,82 @@ import com.smartdevicelink.proxy.rpc.GetVehicleData;
 
 public class SampleRpc {
 
-	
+
     private final int SAMPLE_RPC_CORRELATION_ID = 630;
 
     int version = 1;
-    int sessionId =1;
+    int sessionId = 1;
     ProtocolMessage pm = null;
     BinaryFrameHeader binFrameHeader = null;
-    
+
     /**
      * Currently builds a GetVehicleData Request
      */
-	public SampleRpc(int version){
-		this.version = version;
-		createBase();
-		
-	}
-	public void createBase(){
-		GetVehicleData request = new GetVehicleData();
-		request.setAirbagStatus(true);
-		request.setBeltStatus(true);
-		request.setBeltStatus(true);
-		request.setCorrelationID(SAMPLE_RPC_CORRELATION_ID);
-		
-		byte[] msgBytes = JsonRPCMarshaller.marshall(request, (byte)version);
-		pm = new ProtocolMessage();
-		pm.setData(msgBytes);
-		pm.setSessionID((byte)sessionId);
-		pm.setMessageType(MessageType.RPC);
-		pm.setSessionType(SessionType.RPC);
-		pm.setFunctionID(FunctionID.getFunctionId(request.getFunctionName()));
-		pm.setCorrID(request.getCorrelationID());
-		
-		if (request.getBulkData() != null) {
-			pm.setBulkData(request.getBulkData());
-		}
-		
-	}
-	public ProtocolMessage getProtocolMessage(){
-		return pm;
-	}
-	public BinaryFrameHeader getBinaryFrameHeader(boolean refresh){
-		if(version>1 && (refresh || binFrameHeader == null)){
-			binFrameHeader = SdlPacketFactory.createBinaryFrameHeader(pm.getRPCType(), pm.getFunctionID(), pm.getCorrID(), pm.getJsonSize());
-		}
-		return binFrameHeader;
-	}
-	
-	/**
-	 * To manually set the bfh. Useful for trying to corrupt data
-	 */
-	public void setBinaryFrameHeader(BinaryFrameHeader binFrameHeader){
-		this.binFrameHeader = binFrameHeader;
-	}
-
-	
-	public SdlPacket toSdlPacket(){
-		byte[] data = null;
-		if(version > 1) { //If greater than v1 we need to include a binary frame header in the data before all the JSON starts
-			data = new byte[12 + pm.getJsonSize()];
-			if(binFrameHeader == null){
-				getBinaryFrameHeader(false);
-			}
-			System.arraycopy(binFrameHeader.assembleHeaderBytes(), 0, data, 0, 12);
-			System.arraycopy(pm.getData(), 0, data, 12, pm.getJsonSize());
-		}else{
-			data = pm.getData();
-		}
-		
-		return  new SdlPacket(version,false,SdlPacket.FRAME_TYPE_SINGLE,SdlPacket.SERVICE_TYPE_RPC,0,sessionId,data.length,123,data);
-		
-	}
-	
-	public byte[] toByteArray(){
-		return toSdlPacket().constructPacket();
-	}
+    public SampleRpc(int version) {
+        this.version = version;
+        createBase();
+
+    }
+
+    public void createBase() {
+        GetVehicleData request = new GetVehicleData();
+        request.setAirbagStatus(true);
+        request.setBeltStatus(true);
+        request.setBeltStatus(true);
+        request.setCorrelationID(SAMPLE_RPC_CORRELATION_ID);
+
+        byte[] msgBytes = JsonRPCMarshaller.marshall(request, (byte) version);
+        pm = new ProtocolMessage();
+        pm.setData(msgBytes);
+        pm.setSessionID((byte) sessionId);
+        pm.setMessageType(MessageType.RPC);
+        pm.setSessionType(SessionType.RPC);
+        pm.setFunctionID(FunctionID.getFunctionId(request.getFunctionName()));
+        pm.setCorrID(request.getCorrelationID());
+
+        if (request.getBulkData() != null) {
+            pm.setBulkData(request.getBulkData());
+        }
+
+    }
+
+    public ProtocolMessage getProtocolMessage() {
+        return pm;
+    }
+
+    public BinaryFrameHeader getBinaryFrameHeader(boolean refresh) {
+        if (version > 1 && (refresh || binFrameHeader == null)) {
+            binFrameHeader = SdlPacketFactory.createBinaryFrameHeader(pm.getRPCType(), pm.getFunctionID(), pm.getCorrID(), pm.getJsonSize());
+        }
+        return binFrameHeader;
+    }
+
+    /**
+     * To manually set the bfh. Useful for trying to corrupt data
+     */
+    public void setBinaryFrameHeader(BinaryFrameHeader binFrameHeader) {
+        this.binFrameHeader = binFrameHeader;
+    }
+
+
+    public SdlPacket toSdlPacket() {
+        byte[] data = null;
+        if (version > 1) { //If greater than v1 we need to include a binary frame header in the data before all the JSON starts
+            data = new byte[12 + pm.getJsonSize()];
+            if (binFrameHeader == null) {
+                getBinaryFrameHeader(false);
+            }
+            System.arraycopy(binFrameHeader.assembleHeaderBytes(), 0, data, 0, 12);
+            System.arraycopy(pm.getData(), 0, data, 12, pm.getJsonSize());
+        } else {
+            data = pm.getData();
+        }
+
+        return new SdlPacket(version, false, SdlPacket.FRAME_TYPE_SINGLE, SdlPacket.SERVICE_TYPE_RPC, 0, sessionId, data.length, 123, data);
+
+    }
+
+    public byte[] toByteArray() {
+        return toSdlPacket().constructPacket();
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java
index ac575dfbc..0255dd839 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlConnection/SdlSessionTests.java
@@ -1,8 +1,8 @@
 package com.smartdevicelink.test.SdlConnection;
 
-import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.protocol.ISdlServiceListener;
 import com.smartdevicelink.protocol.enums.SessionType;
+import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.test.streaming.MockInterfaceBroker;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
 
@@ -11,38 +11,38 @@ import junit.framework.TestCase;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.session.SdlSession}
  */
 public class SdlSessionTests extends TestCase {
 
-	public void testServiceListeners(){
-		SdlSession session = new SdlSession(new MockInterfaceBroker(),  new MultiplexTransportConfig(getInstrumentation().getTargetContext(),"19216801"));
-		ISdlServiceListener test = new ISdlServiceListener() {
-			@Override
-			public void onServiceStarted(SdlSession session, SessionType type, boolean isEncrypted) {
+    public void testServiceListeners() {
+        SdlSession session = new SdlSession(new MockInterfaceBroker(), new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "19216801"));
+        ISdlServiceListener test = new ISdlServiceListener() {
+            @Override
+            public void onServiceStarted(SdlSession session, SessionType type, boolean isEncrypted) {
 
-			}
+            }
 
-			@Override
-			public void onServiceEnded(SdlSession session, SessionType type) {
+            @Override
+            public void onServiceEnded(SdlSession session, SessionType type) {
 
-			}
+            }
 
-			@Override
-			public void onServiceError(SdlSession session, SessionType type, String reason) {
+            @Override
+            public void onServiceError(SdlSession session, SessionType type, String reason) {
 
-			}
-		};
+            }
+        };
 
-		session.addServiceListener(SessionType.RPC, test);
-		assertNotNull(session.getServiceListeners());
+        session.addServiceListener(SessionType.RPC, test);
+        assertNotNull(session.getServiceListeners());
 
-		assertTrue(session.removeServiceListener(SessionType.RPC, test));
+        assertTrue(session.removeServiceListener(SessionType.RPC, test));
 
-		assertFalse(session.removeServiceListener(SessionType.RPC, test));
+        assertFalse(session.removeServiceListener(SessionType.RPC, test));
 
-	}
+    }
 
 
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java
index 3b38b94f3..d1b7ea30e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java
@@ -1,6 +1,6 @@
 package com.smartdevicelink.test;
 
 public class SdlUnitTestContants {
-	public static final String TEST_APP_ID = "123456";
+    public static final String TEST_APP_ID = "123456";
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
index 16c1c9613..b9e1a5403 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
@@ -224,587 +224,588 @@ import java.util.Vector;
 
 public class TestValues {
 
-	//Versions
-	public static final Version MAX_RPC_VERSION_SUPPORTED		= LifecycleManager.MAX_SUPPORTED_RPC_VERSION;
-	/**
-	 * @see SdlProtocol
-	 */
-	public static final Version MAX_PROTOCOL_VERSION_SUPPORTED 	= new Version(5, 2, 0);
-
-
-	// Test Failure Messages
-	public static final String NULL      = "Value should be null.";
-	public static final String MATCH     = "Values should match.";
-	public static final String ARRAY     = "Array values should match.";
-	public static final String TRUE      = "Value should be true.";
-	public static final String FALSE     = "Value should be false.";
-	public static final String NOT_NULL  = "Value should not be null.";
-	public static final String JSON_FAIL = "Json testing failed.";
-
-	// RPC Request/Response/Notification/Datatype Test Values
-	public static final int                            GENERAL_INT                            = 100;
-	public static final Integer                        GENERAL_INTEGER                        = 100;
-	public static final Long                           GENERAL_LONG                           = 100L;
-	public static final Turn                           GENERAL_TURN                           = new Turn();
-	public static final Float                          GENERAL_FLOAT                          = 100f;
-	public static final Image                          GENERAL_IMAGE                          = new Image();
-	public static final Choice                         GENERAL_CHOICE                         = new Choice();
-	public static final String                         GENERAL_STRING                         = "test";
-	public static final Double                         GENERAL_DOUBLE                         = 10.01;
-	public static final boolean                        GENERAL_BOOLEAN                        = true;
-	public static final byte[]                         GENERAL_BYTE_ARRAY                     = new byte[0];
-	public static final TPMS                           GENERAL_TPMS                           = TPMS.UNKNOWN;
-	public static final TBTState                       GENERAL_TBTSTATE                       = TBTState.NEXT_TURN_REQUEST;
-	public static final FileType                       GENERAL_FILETYPE                       = FileType.BINARY;
-	public static final Language                       GENERAL_LANGUAGE                       = Language.EN_US;
-	public static final HMILevel                       GENERAL_HMILEVEL                       = HMILevel.HMI_FULL;
-	public static final DIDResult                      GENERAL_DIDRESULT                      = new DIDResult();
-	public static final TextField                      GENERAL_TEXTFIELD                      = new TextField();
-	public static final OasisAddress                   GENERAL_OASISADDRESS                   = new OasisAddress();
-	public static final Coordinate                     GENERAL_COORDINATE                     = new Coordinate();
-	public static final LocationDetails                GENERAL_LOCATIONDETAILS                = new LocationDetails();
-	public static final Dimension                      GENERAL_DIMENSION                      = Dimension._2D;
-	public static final ImageType                      GENERAL_IMAGETYPE                      = ImageType.DYNAMIC;
-	public static final AudioType                      GENERAL_AUDIOTYPE                      = AudioType.PCM;
-	public static final StartTime                      GENERAL_STARTTIME                      = new StartTime();
-	public static final TouchType                      GENERAL_TOUCHTYPE                      = TouchType.BEGIN;
-	public static final TouchEvent                     GENERAL_TOUCHEVENT                     = new TouchEvent();
-	public static final VrHelpItem                     GENERAL_VRHELPITEM                     = new VrHelpItem();
-	public static final ImageField                     GENERAL_IMAGEFIELD                     = new ImageField();
-	public static final DeviceInfo	                   GENERAL_DEVICEINFO	                  = new DeviceInfo();
-	public static final AppInfo                        GENERAL_APPINFO	                      = new AppInfo();
-	public static final Uri                            GENERAL_URI   	                      = Uri.parse("http://www.google.com");;
-	public static final LayoutMode                     GENERAL_LAYOUTMODE                     = LayoutMode.LIST_ONLY;
-	public static final MenuParams                     GENERAL_MENUPARAMS                     = new MenuParams();
-	public static final SoftButton                     GENERAL_SOFTBUTTON                     = new SoftButton();
-	public static final ButtonName                     GENERAL_BUTTONNAME                     = ButtonName.OK;
-	public static final UpdateMode                     GENERAL_UPDATEMODE                     = UpdateMode.RESUME;
-	public static final TouchCoord                     GENERAL_TOUCHCOORD                     = new TouchCoord();
-	public static final MassageModeData                GENERAL_MASSAGEMODEDATA                = new MassageModeData();
-	public static final MassageCushionFirmness         GENERAL_MASSAGECUSHIONFIRMNESS         = new MassageCushionFirmness();
-	public static final DisplayType                    GENERAL_DISPLAYTYPE                    = DisplayType.CID;
-	public static final VehicleType                    GENERAL_VEHICLETYPE                    = new VehicleType();
-	public static final RequestType                    GENERAL_REQUESTTYPE                    = RequestType.AUTH_REQUEST;
-	public static final SystemAction                   GENERAL_SYSTEMACTION                   = SystemAction.DEFAULT_ACTION;
-	public static final CharacterSet                   GENERAL_CHARACTERSET                   = CharacterSet.CID1SET;
-	public static final SamplingRate                   GENERAL_SAMPLINGRATE                	  = SamplingRate._8KHZ;
-	public static final ScreenParams                   GENERAL_SCREENPARAMS		        	  = new ScreenParams();
-	public static final KeypressMode                   GENERAL_KEYPRESSMODE                   = KeypressMode.QUEUE_KEYPRESSES;
-	public static final SystemContext                  GENERAL_SYSTEMCONTEXT                  = SystemContext.SYSCTXT_MAIN;
-	public static final KeyboardEvent                  GENERAL_KEYBOARDEVENT                  = KeyboardEvent.ENTRY_SUBMITTED;
-	public static final CarModeStatus                  GENERAL_CARMODESTATUS                  = CarModeStatus.NORMAL;
-	public static final TextFieldName                  GENERAL_TEXTFIELDNAME                  = TextFieldName.ETA;
-	public static final TriggerSource                  GENERAL_TRIGGERSOURCE              	  = TriggerSource.TS_VR;
-	public static final BitsPerSample                  GENERAL_BITSPERSAMPLE                  = BitsPerSample._8_BIT;
-	public static final TextAlignment                  GENERAL_TEXTALIGNMENT                  = TextAlignment.CENTERED;
-	public static final SdlMsgVersion                  GENERAL_SDLMSGVERSION                  = new SdlMsgVersion();
-	public static final PermissionItem                 GENERAL_PERMISSIONITEM                 = new PermissionItem();
-	public static final SoftButtonType                 GENERAL_SOFTBUTTONTYPE                 = SoftButtonType.SBT_BOTH;
-	public static final MassageZone                    GENERAL_MASSAGEZONE                    = MassageZone.LUMBAR;
-	public static final MassageMode                    GENERAL_MASSAGEMODE                    = MassageMode.HIGH;
-	public static final WindowStatus				   GENERAL_WINDOW_STATUS                  = new WindowStatus();
-	public static final MassageCushion                 GENERAL_MASSAGECUSHION                 = MassageCushion.BACK_BOLSTERS;
-	public static final SeatMemoryActionType           GENERAL_SEATMEMORYACTIONTYPE           = SeatMemoryActionType.SAVE;
-	public static final SupportedSeat           	   GENERAL_SUPPORTEDSEAT                  = SupportedSeat.DRIVER;
-	public static final KeyboardLayout                 GENERAL_KEYBOARDLAYOUT                 = KeyboardLayout.QWERTY;
-	public static final ImageFieldName                 GENERAL_IMAGEFIELDNAME                 = ImageFieldName.graphic;
-	public static final HMIPermissions                 GENERAL_HMIPERMISSIONS                 = new HMIPermissions();
-	public static final IgnitionStatus                 GENERAL_IGNITIONSTATUS                 = IgnitionStatus.RUN;
-	public static final ButtonEventMode                GENERAL_BUTTONEVENTMODE                = ButtonEventMode.BUTTONUP;
-    public static final ButtonPressMode                GENERAL_BUTTONPRESSMODE                = ButtonPressMode.SHORT;
-	public static final PowerModeStatus                GENERAL_POWERMODESTATUS                = PowerModeStatus.RUNNING_2;
-	public static final VehicleDataType                GENERAL_VEHICLEDATATYPE                = VehicleDataType.VEHICLEDATA_BRAKING;
-	public static final InteractionMode                GENERAL_INTERACTIONMODE                = InteractionMode.BOTH;
-	public static final ImageResolution                GENERAL_IMAGERESOLUTION                = new ImageResolution();
-	public static final FuelCutoffStatus               GENERAL_FUELCUTOFFSTATUS               = FuelCutoffStatus.NORMAL_OPERATION;
-	public static final CompassDirection               GENERAL_COMPASSDIRECTION               = CompassDirection.EAST;
-	public static final LockScreenStatus               GENERAL_LOCKSCREENSTATUS               = LockScreenStatus.REQUIRED;
-	public static final VehicleDataStatus              GENERAL_VEHICLEDATASTATUS              = VehicleDataStatus.ON;
-	public static final DeviceLevelStatus              GENERAL_DEVICELEVELSTATUS              = DeviceLevelStatus.FOUR_LEVEL_BARS;
-	public static final ButtonCapabilities             GENERAL_BUTTONCAPABILITIES             = new ButtonCapabilities();
-	public static final EmergencyEventType             GENERAL_EMERGENCYEVENTTYPE             = EmergencyEventType.FAULT;
-	public static final AmbientLightStatus             GENERAL_AMBIENTLIGHTSTATUS             = AmbientLightStatus.NIGHT;
-	public static final SpeechCapabilities             GENERAL_SPEECHCAPABILITIES             = SpeechCapabilities.TEXT;
-	public static final WarningLightStatus        	   GENERAL_WARNINGLIGHTSTATUS        	  = WarningLightStatus.OFF;
-	public static final KeyboardProperties             GENERAL_KEYBOARDPROPERTIES             = new KeyboardProperties();
-	public static final PrimaryAudioSource             GENERAL_PRIMARYAUDIOSOURCE             = PrimaryAudioSource.BLUETOOTH_STEREO_BTST;
-	public static final AudioStreamingState            GENERAL_AUDIOSTREAMINGSTATE            = AudioStreamingState.AUDIBLE;
-	public static final VideoStreamingState            GENERAL_VIDEOSTREAMINGSTATE            = VideoStreamingState.STREAMABLE;
-	public static final DisplayCapabilities            GENERAL_DISPLAYCAPABILITIES            = new DisplayCapabilities();
-	public static final ParameterPermissions           GENERAL_PARAMETERPERMISSIONS           = new ParameterPermissions();
-	public static final IgnitionStableStatus           GENERAL_IGNITIONSTABLESTATUS           = IgnitionStableStatus.IGNITION_SWITCH_STABLE;
-	public static final VehicleDataResultCode          GENERAL_VEHICLEDATARESULTCODE          = VehicleDataResultCode.IGNORED;
-	public static final ComponentVolumeStatus          GENERAL_COMPONENTVOLUMESTATUS          = ComponentVolumeStatus.LOW;
-	public static final PresetBankCapabilities         GENERAL_PRESETBANKCAPABILITIES         = new PresetBankCapabilities();
-	public static final CapacityUnit         		   GENERAL_CAPACITYUNIT			          = CapacityUnit.KILOGRAMS;
-	public static final VehicleDataEventStatus         GENERAL_VEHCILEDATAEVENTSTATUS         = VehicleDataEventStatus.YES;
-	public static final VehicleDataEventStatus         GENERAL_VEHICLEDATAEVENTSTATUS         = VehicleDataEventStatus.YES;
-	public static final TouchEventCapabilities         GENERAL_TOUCHEVENTCAPABILITIES         = new TouchEventCapabilities();
-	public static final SeatMemoryAction               GENERAL_SEATMEMORYACTION               = new SeatMemoryAction();
-	public static final SoftButtonCapabilities         GENERAL_SOFTBUTTONCAPABILITIES         = new SoftButtonCapabilities();
-	public static final ECallConfirmationStatus        GENERAL_ECALLCONFIRMATIONSTATUS        = ECallConfirmationStatus.CALL_IN_PROGRESS;
-	public static final AudioPassThruCapabilities      GENERAL_AUDIOPASSTHRUCAPABILITIES      = new AudioPassThruCapabilities();
-	public static final PowerModeQualificationStatus   GENERAL_POWERMODEQUALIFICATIONSTATUS   = PowerModeQualificationStatus.POWER_MODE_OK;
-	public static final VehicleDataNotificationStatus  GENERAL_VEHICLEDATANOTIFICATIONSTATUS  = VehicleDataNotificationStatus.NORMAL;
-	public static final AppInterfaceUnregisteredReason GENERAL_APPINTERFACEUNREGISTEREDREASON = AppInterfaceUnregisteredReason.BLUETOOTH_OFF;
-	public static final SystemCapabilityType           GENERAL_SYSTEMCAPABILITYTYPE           = SystemCapabilityType.NAVIGATION;
-	public static final NavigationCapability           GENERAL_NAVIGATIONCAPABILITY           = new NavigationCapability();
-	public static final DriverDistractionCapability	   GENERAL_DRIVERDISTRACTIONCAPABILITY    = new DriverDistractionCapability();
-	public static final PhoneCapability                GENERAL_PHONECAPABILITY                = new PhoneCapability();
-	public static final RemoteControlCapabilities      GENERAL_REMOTECONTROLCAPABILITIES      = new RemoteControlCapabilities();
-	public static final SystemCapability               GENERAL_SYSTEMCAPABILITY               = new SystemCapability();
-	public static final VideoStreamingProtocol         GENERAL_VIDEOSTREAMINGPROTOCOL         = VideoStreamingProtocol.RAW;
-	public static final VideoStreamingCodec            GENERAL_VIDEOSTREAMINGCODEC            = VideoStreamingCodec.H264;
-	public static final VideoStreamingCapability       GENERAL_VIDEOSTREAMINGCAPABILITY       = new VideoStreamingCapability();
-	public static final VideoStreamingFormat           GENERAL_VIDEOSTREAMINGFORMAT           = new VideoStreamingFormat();
-	public static final RGBColor                       GENERAL_RGBCOLOR                       = new RGBColor();
-	public static final TemplateColorScheme            GENERAL_DAYCOLORSCHEME                 = new TemplateColorScheme();
-	public static final TemplateColorScheme            GENERAL_NIGHTCOLORSCHEME               = new TemplateColorScheme();
-	public static final Result                         GENERAL_RESULT                         = Result.SUCCESS;
-	public static final WayPointType                   GENERAL_WAYPOINTTYPE                   = WayPointType.DESTINATION;
-	public static final SingleTireStatus               GENERAL_SINGLETIRESTATUS               = new SingleTireStatus();
-	public static final DriverDistractionState         GENERAL_DRIVERDISTRACTIONSTATE         = DriverDistractionState.DD_ON;
-	public static final List<LocationDetails>          GENERAL_LOCATIONDETAILS_LIST           = Arrays.asList(new LocationDetails[] { TestValues.GENERAL_LOCATIONDETAILS, TestValues.GENERAL_LOCATIONDETAILS});
-	public static final AudioStreamingIndicator        GENERAL_AUDIO_STREAMING_INDICATOR      = AudioStreamingIndicator.PLAY;
-	public static final String                         GENERAL_APP_ID                         = "123e4567e8";
-	public static final String                         GENERAL_FULL_APP_ID                    = "123e4567-e89b-12d3-a456-426655440000";
-	public static final String                         GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME   = "oemCustomVehicleDataName";
-	public static final HybridAppPreference 		   GENERAL_HYBRID_APP_PREFERENCE          = HybridAppPreference.CLOUD;
-	public static final CloudAppProperties             GENERAL_CLOUDAPPPROPERTIES             = new CloudAppProperties();
-	public static final AppServiceType                 GENERAL_APP_SERVICE_TYPE               = AppServiceType.MEDIA;
-	public static final List<Integer>                  GENERAL_FUNCTION_ID_LIST               = Arrays.asList(FunctionID.GET_VEHICLE_DATA.getId(), FunctionID.SEND_HAPTIC_DATA.getId());
-	public static final AppServiceManifest             GENERAL_APPSERVICEMANIFEST             = new AppServiceManifest(AppServiceType.MEDIA.name());
-	public static final MediaServiceManifest           GENERAL_MEDIA_SERVICE_MANIFEST         = new MediaServiceManifest();
-	public static final WeatherServiceManifest         GENERAL_WEATHER_SERVICE_MANIFEST       = new WeatherServiceManifest();
-	public static final NavigationServiceManifest      GENERAL_NAVIGATION_SERVICE_MANIFEST    = new NavigationServiceManifest();
-	public static final AppServiceRecord               GENERAL_APPSERVICERECORD               = new AppServiceRecord();
-	public static final AppServiceCapability           GENERAL_APP_SERVICE_CAPABILITY         = new AppServiceCapability();
-	public static final AppServicesCapabilities        GENERAL_APP_SERVICE_CAPABILITIES       = new AppServicesCapabilities();
-	public static final ServiceUpdateReason            GENERAL_SERVICE_UPDATE_REASON          = ServiceUpdateReason.MANIFEST_UPDATE;
-	public static final DateTime					   GENERAL_DATETIME                       = new DateTime();
-	public static final WeatherData 				   GENERAL_WEATHERDATA                    = new WeatherData();
-	public static final WeatherAlert                   GENERAL_WEATHERALERT                   = new WeatherAlert();
-	public static final MediaType                      GENERAL_MEDIATYPE                      = MediaType.MUSIC;
-	public static final MediaServiceData               GENERAL_MEDIASERVICEDATA               = new MediaServiceData();
-	public static final WeatherServiceData             GENERAL_WEATHERSERVICEDATA             = new WeatherServiceData();
-	public static final NavigationServiceData          GENERAL_NAVIGATIONSERVICEDATA          = new NavigationServiceData();
-	public static final AppServiceData                 GENERAL_APPSERVICEDATA                 = new AppServiceData();
-	public static final NavigationAction               GENERAL_NAVIGATIONACTION               = NavigationAction.STAY;
-	public static final NavigationJunction             GENERAL_NAVIGATION_JUNCTION            = NavigationJunction.BIFURCATION;
-	public static final Direction                      GENERAL_DIRECTION                      = Direction.RIGHT;
-	public static final NavigationInstruction          GENERAL_NAVIGATION_INSTRUCTION         = new NavigationInstruction();
-	public static final Version                        GENERAL_VERSION                        = new Version("4.0.0");
-	public static final ModuleType 					   GENERAL_MODULETYPE           		  = ModuleType.CLIMATE;
-	public static final Temperature 				   GENERAL_TEMPERATURE                	  = new Temperature();
-	public static final TemperatureUnit 			   GENERAL_TEMPERATUREUNIT                = TemperatureUnit.CELSIUS;
-	public static final DefrostZone 				   GENERAL_DEFROSTZONE               	  = DefrostZone.ALL;
-	public static final VentilationMode 			   GENERAL_VENTILATIONMODE                = VentilationMode.BOTH;
-	public static final LightName                      GENERAL_LIGHTNAME            		  = LightName.AMBIENT_LIGHTS;
-	public static final DisplayMode                    GENERAL_DISPLAYMODE            		  = DisplayMode.AUTO;
-	public static final DistanceUnit                   GENERAL_DISTANCEUNIT           		  = DistanceUnit.KILOMETERS;
-	public static final LightStatus                    GENERAL_LIGHTSTATUS           		  = LightStatus.OFF;
-	public static final RadioBand 				       GENERAL_RADIOBAND               	      = RadioBand.AM;
-	public static final ClimateControlData             GENERAL_CLIMATECONTROLDATA             = new ClimateControlData();
-	public static final SeatControlData                GENERAL_SEATCONTROLDATA                = new SeatControlData();
-	public static final RdsData                        GENERAL_RDSDATA                        = new RdsData();
-	public static final StationIDNumber                GENERAL_STATIONIDNUMBER                = new StationIDNumber();
-	public static final SisData                        GENERAL_SISDATA                        = new SisData();
-	public static final RadioState                     GENERAL_RADIOSTATE              	      = RadioState.ACQUIRED;
-	public static final RadioControlData               GENERAL_RADIOCONTROLDATA               = new RadioControlData();
-	public static final ModuleData 					   GENERAL_MODULEDATA                     = new ModuleData();
-	public static final ClimateControlCapabilities     GENERAL_CLIMATECONTROLCAPABILITIES     = new ClimateControlCapabilities();
-	public static final RadioControlCapabilities       GENERAL_RADIOCONTROLCAPABILITIES       = new RadioControlCapabilities();
-	public static final SeatControlCapabilities        GENERAL_SEATCONTROLCAPABILITIES        = new SeatControlCapabilities();
-	public static final EqualizerSettings              GENERAL_EQUALIZERSETTINGS              = new EqualizerSettings();
-	public static final LightCapabilities              GENERAL_LIGHTCAPABILITIES              = new LightCapabilities();
-	public static final LightState                     GENERAL_LIGHTSTATE                     = new LightState();
-	public static final AudioControlCapabilities       GENERAL_AUDIOCONTROLCAPABILITIES       = new AudioControlCapabilities();
-	public static final HMISettingsControlCapabilities GENERAL_HMISETTINGSCONTROLCAPABILITIES = new HMISettingsControlCapabilities();
-	public static final LightControlCapabilities       GENERAL_LIGHTCONTROLCAPABILITIES       = new LightControlCapabilities();
-	public static final AudioControlData               GENERAL_AUDIOCONTROLDATA               = new AudioControlData();
-	public static final LightControlData               GENERAL_LIGHTCONTROLDATA               = new LightControlData();
-	public static final HMISettingsControlData         GENERAL_HMISETTINGSCONTROLDATA         = new HMISettingsControlData();
-	public static final DynamicUpdateCapabilities	   GENERAL_DYNAMICUPDATECAPABILITIES	  = new DynamicUpdateCapabilities();
-
-	public static final VehicleDataResult              GENERAL_OEM_CUSTOM_VEHICLE_DATA        = new VehicleDataResult();
-	public static final TemplateConfiguration          GENERAL_TEMPLATE_CONFIGURATION         = new TemplateConfiguration();
-	public static final WindowTypeCapabilities         GENERAL_WINDOW_TYPE_CAPABILITIES       = new WindowTypeCapabilities();
-	public static final WindowCapability               GENERAL_WINDOW_CAPABILITY              = new WindowCapability();
-	public static final DisplayCapability              GENERAL_DISPLAY_CAPABILITY             = new DisplayCapability();
-
-	public static final SdlArtwork                     GENERAL_ARTWORK                        = new SdlArtwork("sdl", FileType.GRAPHIC_PNG, R.drawable.ic_sdl, false);
-	public static final MenuLayout                     GENERAL_MENU_LAYOUT                    = MenuLayout.LIST;
-	public static final MenuConfiguration              GENERAL_MENU_CONFIGURATION             = new MenuConfiguration(GENERAL_MENU_LAYOUT, GENERAL_MENU_LAYOUT);
-
-	public static final HMICapabilities                GENERAL_HMICAPABILITIES                = new HMICapabilities();
-
-	public static final MetadataTags                   GENERAL_METADATASTRUCT                 = new MetadataTags();
-	public static final Rectangle                      GENERAL_RECTANGLE                      = new Rectangle();
-	public static final HapticRect                     GENERAL_HAPTIC_RECT                    = new HapticRect();
-	public static final FuelType                       GENERAL_FUELTYPE                       = FuelType.GASOLINE;
-	public static final LockScreenConfig               GENERAL_LOCKSCREENCONFIG               = new LockScreenConfig();
-	public static final Grid                           GENERAL_GRID                           = new Grid();
-	public static final SeatLocation                   GENERAL_SEAT_LOCATION                  = new SeatLocation();
-	public static final ModuleInfo                     GENERAL_MODULE_INFO                    = new ModuleInfo();
-	public static final StabilityControlsStatus		   GENERAL_STABILITY_CONTROL_STATUS       = new StabilityControlsStatus();
-	public static final VehicleDataStatus		   	   GENERAL_ESC_SYSTEM      				  = VehicleDataStatus.ON;
-	public static final VehicleDataStatus		   	   GENERAL_S_WAY_CONTROL      			  = VehicleDataStatus.OFF;
-	public static final WindowType                     GENERAL_WINDOWTYPE                     = WindowType.MAIN;
-	public static final GearStatus                     GENERAL_GEAR_STATUS                    = new GearStatus();
-	public static final PRNDL                    	 	GENERAL_USER_SELECTED_GEAR             = PRNDL.NEUTRAL;
-	public static final PRNDL                    	 	GENERAL_ACTUAL_GEAR             	   = PRNDL.DRIVE;
-	public static final TransmissionType                GENERAL_TRANSMISSION_TYPE              = TransmissionType.AUTOMATIC;
-	public static final Grid 						   GENERAL_LOCATION_GRID 				  = new Grid(2, 3);
-	public static final WindowState 				   GENERAL_WINDOW_STATE 				  = new WindowState(2, 3);
-	public static final Integer 				   	   GENERAL_APPROX_POSITION 				  = new Integer(3);
-	public static final Integer 				   	   GENERAL_DEVIATION 				  	  = new Integer(2);
-	public static final List<Long>                      GENERAL_LONG_LIST                      = Arrays.asList(new Long[]{ 1L, 2L });
-	public static final List<Turn>                      GENERAL_TURN_LIST                      = new ArrayList<Turn>();
-	public static final List<Choice>                    GENERAL_CHOICE_LIST                    = new ArrayList<Choice>();
-	public static final List<String>                    GENERAL_STRING_LIST                    = Arrays.asList(new String[] { "a", "b"});
-	public static final List<Integer>                   GENERAL_INTEGER_LIST                   = Arrays.asList(new Integer[]{ -1, -2});
-	public static final List<TTSChunk>                  GENERAL_TTSCHUNK_LIST                  = new ArrayList<TTSChunk>(2);
-	public static final List<HMILevel>                  GENERAL_HMILEVEL_LIST                  = Arrays.asList(new HMILevel[]{HMILevel.HMI_FULL, HMILevel.HMI_BACKGROUND});
-	public static final List<FileType>                  GENERAL_FILETYPE_LIST                  = new ArrayList<FileType>(1);
-	public static final List<TextField>                 GENERAL_TEXTFIELD_LIST                 = new ArrayList<TextField>(1);
-	public static final List<DIDResult>                 GENERAL_DIDRESULT_LIST                 = new ArrayList<DIDResult>(1);
-	public static final List<TouchCoord>                GENERAL_TOUCHCOORD_LIST                = new ArrayList<TouchCoord>(1);
-	public static final List<MassageModeData>           GENERAL_MASSAGEMODEDATA_LIST           = new ArrayList<MassageModeData>(1);
-	public static final List<MassageCushionFirmness>    GENERAL_MASSAGECUSHIONFIRMNESS_LIST    = new ArrayList<MassageCushionFirmness>(1);
-	public static final List<AppHMIType>                GENERAL_APPHMITYPE_LIST                = new ArrayList<AppHMIType>(2);
-	public static final List<VrHelpItem>                GENERAL_VRHELPITEM_LIST                = new ArrayList<VrHelpItem>(2);
-	public static final List<SoftButton>                GENERAL_SOFTBUTTON_LIST                = new ArrayList<SoftButton>(1);
-	public static final List<ImageField> 			    GENERAL_IMAGEFIELD_LIST				   = new ArrayList<ImageField>(1);
-	public static final List<TouchEvent>			    GENERAL_TOUCHEVENT_LIST                = new ArrayList<TouchEvent>(1);
-	public static final List<PermissionItem>            GENERAL_PERMISSIONITEM_LIST            = new ArrayList<PermissionItem>(1);
-	public static final List<GlobalProperty>            GENERAL_GLOBALPROPERTY_LIST            = new ArrayList<GlobalProperty>(2);
-	public static final List<VrCapabilities>		    GENERAL_VRCAPABILITIES_LIST            = new ArrayList<VrCapabilities>(1);
-	public static final List<MediaClockFormat>          GENERAL_MEDIACLOCKFORMAT_LIST		   = new ArrayList<MediaClockFormat>(2);
-	public static final List<VehicleDataResult>         GENERAL_VEHICLEDATARESULT_LIST         = new ArrayList<VehicleDataResult>(VehicleDataType.values().length);
-	public static final List<PrerecordedSpeech>         GENERAL_PRERECORDEDSPEECH_LIST		   = new ArrayList<PrerecordedSpeech>(2);
-	public static final List<SpeechCapabilities>        GENERAL_SPEECHCAPABILITIES_LIST        = new ArrayList<SpeechCapabilities>(2);
-	public static final List<ButtonCapabilities>        GENERAL_BUTTONCAPABILITIES_LIST        = new ArrayList<ButtonCapabilities>(2);
-	public static final List<HmiZoneCapabilities>       GENERAL_HMIZONECAPABILITIES_LIST       = new ArrayList<HmiZoneCapabilities>(2);
-	public static final List<SoftButtonCapabilities>    GENERAL_SOFTBUTTONCAPABILITIES_LIST    = new ArrayList<SoftButtonCapabilities>(1);
-	public static final List<AudioPassThruCapabilities> GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST = new ArrayList<AudioPassThruCapabilities>(1);
-	public static final List<VideoStreamingFormat>      GENERAL_VIDEOSTREAMINGFORMAT_LIST      = new ArrayList<VideoStreamingFormat>(2);
-	public static final List<DefrostZone>               GENERAL_DEFROSTZONE_LIST               = Arrays.asList(new DefrostZone[]{DefrostZone.FRONT, DefrostZone.REAR});
-	public static final List<VentilationMode>           GENERAL_VENTILATIONMODE_LIST           = Arrays.asList(new VentilationMode[]{VentilationMode.LOWER, VentilationMode.UPPER});
-	public static final List<ClimateControlCapabilities> GENERAL_CLIMATECONTROLCAPABILITIES_LIST = new ArrayList<ClimateControlCapabilities>(1);
-	public static final List<RadioControlCapabilities>   GENERAL_RADIOCONTROLCAPABILITIES_LIST   = new ArrayList<RadioControlCapabilities>(1);
-	public static final Vector<String>                   GENERAL_VECTOR_STRING                   = new Vector<>(Arrays.asList(new String[] { "a", "b"}));
-	public static final Vector<TTSChunk>                 GENERAL_VECTOR_TTS_CHUNKS               = new Vector<>(Arrays.asList(new TTSChunk("Welcome to the jungle", SpeechCapabilities.TEXT)));
-	public static final List<SeatControlCapabilities>   GENERAL_SEATCONTROLCAPABILITIES_LIST   = new ArrayList<SeatControlCapabilities>(1);
-	public static final List<EqualizerSettings>         GENERAL_EQUALIZERSETTINGS_LIST         = new ArrayList<EqualizerSettings>(1);
-	public static final List<LightCapabilities>         GENERAL_LIGHTCAPABILITIES_LIST         = new ArrayList<LightCapabilities>(1);
-	public static final List<LightState>                GENERAL_LIGHTSTATE_LIST                = new ArrayList<LightState>(1);
-	public static final List<AudioControlCapabilities>  GENERAL_AUDIOCONTROLCAPABILITIES_LIST  = new ArrayList<AudioControlCapabilities>(1);
-	public static final List<ModuleData>                GENERAL_MODULEDATA_LIST  = Collections.singletonList(GENERAL_MODULEDATA);
-	public static final List<AppServiceType>            GENERAL_APPSERVICETYPE_LIST            = Arrays.asList(AppServiceType.MEDIA, AppServiceType.NAVIGATION);
-	public static final List<AppServiceCapability>      GENERAL_APPSERVICECAPABILITY_LIST      = Arrays.asList(GENERAL_APP_SERVICE_CAPABILITY);
-	public static final List<WeatherData>               GENERAL_WEATHERDATA_LIST               = Arrays.asList(GENERAL_WEATHERDATA);
-	public static final List<WeatherAlert>              GENERAL_WEATHERALERT_LIST              = Arrays.asList(GENERAL_WEATHERALERT);
-	public static final List<NavigationInstruction>     GENERAL_NAVIGATION_INSTRUCTION_LIST    = Arrays.asList(GENERAL_NAVIGATION_INSTRUCTION);
-	public static final List<SeatLocation>              GENERAL_SEAT_LIST                      = new ArrayList<>(1);
-	public static final List<Boolean>                   GENERAL_BOOLEAN_LIST                   = Arrays.asList(new Boolean[]{Boolean.TRUE, Boolean.TRUE});
-	public static final List<Integer>                   GENERAL_AVAILABLE_HD_CHANNELS_LIST     = Arrays.asList(new Integer[]{ 1, 2});
-	public static final List<ImageType>                 GENERAL_IMAGE_TYPE_LIST                = Arrays.asList(new ImageType[]{ImageType.DYNAMIC, ImageType.STATIC});
-	public static final List<WindowTypeCapabilities>    GENERAL_WINDOW_TYPE_CAPABILITIES_LIST  = new ArrayList<WindowTypeCapabilities>(1);
-	public static final List<WindowCapability>          GENERAL_WINDOW_CAPABILITY_LIST         = new ArrayList<WindowCapability>(1);
-	public static final List<DisplayCapability>         GENERAL_DISPLAYCAPABILITY_LIST         = new ArrayList<DisplayCapability>(1);
-	public static final List<MenuLayout>                GENERAL_MENU_LAYOUT_LIST               = Arrays.asList(MenuLayout.LIST, MenuLayout.TILES);
-	public static final int                             GENERAL_MENU_MAX_ID                    = 2000000000;
-	public static final MenuCell                        GENERAL_MENUCELL                       = new MenuCell(GENERAL_STRING,null, null, new MenuSelectionListener() {
-		@Override
-		public void onTriggered(TriggerSource trigger) {
-			//
-		}
-	});
-	public static final ChoiceCell                      GENERAL_CHOICECELL                     = new ChoiceCell(GENERAL_STRING);
-	public static final List<ChoiceCell>                GENERAL_CHOICECELL_LIST                = Arrays.asList(GENERAL_CHOICECELL);
-	public static final List<MenuCell>                  GENERAL_MENUCELL_LIST                  = Arrays.asList(GENERAL_MENUCELL);
-	public static final VoiceCommand					GENERAL_VOICE_COMMAND                  = new VoiceCommand(GENERAL_STRING_LIST, new VoiceCommandSelectionListener() {
-		@Override
-		public void onVoiceCommandSelected() {
-
-		}
-	});
-	public static final List<VoiceCommand>              GENERAL_VOICE_COMMAND_LIST             = Arrays.asList(GENERAL_VOICE_COMMAND);
-
-	public static final JSONArray  JSON_TURNS                     = new JSONArray();
-	public static final JSONArray  JSON_CHOICES                   = new JSONArray();
-	public static final JSONArray  JSON_HMILEVELS                 = new JSONArray();
-	public static final JSONArray  JSON_TTSCHUNKS                 = new JSONArray();
-	public static final JSONArray  JSON_DIDRESULTS                = new JSONArray();
-	public static final JSONArray  JSON_TEXTFIELDS                = new JSONArray();
-	public static final JSONArray  JSON_TOUCHCOORDS               = new JSONArray();
-	public static final JSONArray  JSON_VRHELPITEMS               = new JSONArray();
-	public static final JSONArray  JSON_SOFTBUTTONS               = new JSONArray();
-	public static final JSONArray  JSON_IMAGEFIELDS				  = new JSONArray();
-	public static final JSONArray  JSON_TOUCHEVENTS               = new JSONArray();
-	public static final JSONArray  JSON_PERMISSIONITEMS           = new JSONArray();
-	public static final JSONArray  JSON_BUTTONCAPABILITIES        = new JSONArray();
-	public static final JSONArray  JSON_SOFTBUTTONCAPABILITIES    = new JSONArray();
-	public static final JSONArray  JSON_AUDIOPASSTHRUCAPABILITIES = new JSONArray();
-	public static final JSONArray JSON_RADIOCONTROLCAPABILITIES   = new JSONArray();
-	public static final JSONArray JSON_CLIMATECONTROLCAPABILITIES = new JSONArray();
-	public static final JSONArray  JSON_TEXTFIELDTYPES            = new JSONArray();
-	public static final JSONArray  JSON_SEAT_LOCATIONS            = new JSONArray();
-	public static final JSONObject JSON_TURN                      = new JSONObject();
-	public static final JSONObject JSON_IMAGE                     = new JSONObject();
-	public static final JSONObject JSON_CHOICE                    = new JSONObject();
-	public static final JSONObject JSON_DIDRESULT                 = new JSONObject();
-	public static final JSONObject JSON_STARTTIME                 = new JSONObject();
-	public static final JSONObject JSON_TEXTFIELD                 = new JSONObject();
-	public static final JSONObject JSON_TOUCHCOORD                = new JSONObject();
-	public static final JSONObject JSON_TOUCHEVENT                = new JSONObject();
-	public static final JSONObject JSON_IMAGEFIELD                = new JSONObject();
-	public static final JSONObject JSON_SOFTBUTTON                = new JSONObject();
-	public static final JSONObject JSON_MENUPARAMS                = new JSONObject();
-	public static final JSONObject JSON_DEVICEINFO                = new JSONObject();
-	public static final JSONObject JSON_APPINFO                   = new JSONObject();
-	public static final JSONObject JSON_VRHELPITEM                = new JSONObject();
-	public static final JSONObject JSON_SCREENPARAMS              = new JSONObject();
-	public static final JSONObject JSON_SDLMSGVERSION             = new JSONObject();
-	public static final JSONObject JSON_PERMISSIONITEM            = new JSONObject();
-	public static final JSONObject JSON_HMIPERMISSIONS            = new JSONObject();
-	public static final JSONObject JSON_IMAGERESOLUTION           = new JSONObject();
-	public static final JSONObject JSON_KEYBOARDPROPERTIES        = new JSONObject();
-	public static final JSONObject JSON_DISPLAYCAPABILITIES       = new JSONObject();
-	public static final JSONObject JSON_PARAMETERPERMISSIONS      = new JSONObject();
-	public static final JSONObject JSON_PRESETBANKCAPABILITIES    = new JSONObject();
-	public static final JSONObject JSON_TOUCHEVENTCAPABILITIES    = new JSONObject();
-	public static final JSONObject JSON_PCMSTREAMCAPABILITIES     = new JSONObject();
-	public static final JSONObject JSON_RGBCOLOR                  = new JSONObject();
-	public static final JSONObject JSON_DAYCOLORSCHEME            = new JSONObject();
-	public static final JSONObject JSON_NIGHTCOLORSCHEME          = new JSONObject();
-	public static final JSONObject JSON_GRID                      = new JSONObject();
-	public static final JSONObject JSON_MODULE_INFO               = new JSONObject();
-	public static final JSONArray  JSON_IMAGE_TYPE_SUPPORTED      = new JSONArray();
-	public static final JSONObject JSON_WINDOW_TYPE_CAPABILITIES  = new JSONObject();
-	public static final JSONArray  JSON_WINDOW_TYPE_CAPABILITIES_LIST  = new JSONArray();
-	public static final JSONObject JSON_WINDOW_CAPABILITY         = new JSONObject();
-	public static final JSONArray  JSON_WINDOW_CAPABILITIES       = new JSONArray();
-	public static final JSONArray  JSON_IMAGE_TYPES               = new JSONArray();
-	public static final JSONObject JSON_DISPLAYCAPABILITY         = new JSONObject();
-	public static final JSONArray  JSON_DISPLAYCAPABILITY_LIST    = new JSONArray();
-	public static final JSONObject JSON_DYNAMICUPDATECAPABILITIES = new JSONObject();
-	static {
-		GENERAL_TOUCHEVENTCAPABILITIES.setDoublePressAvailable(GENERAL_BOOLEAN);
-		GENERAL_TOUCHEVENTCAPABILITIES.setMultiTouchAvailable(GENERAL_BOOLEAN);
-		GENERAL_TOUCHEVENTCAPABILITIES.setPressAvailable(GENERAL_BOOLEAN);
-
-		GENERAL_SEATMEMORYACTION.setAction(GENERAL_SEATMEMORYACTIONTYPE);
-		GENERAL_SEATMEMORYACTION.setLabel(GENERAL_STRING);
-		GENERAL_SEATMEMORYACTION.setId(GENERAL_INT);
-
-		GENERAL_IMAGERESOLUTION.setResolutionHeight(GENERAL_INT);
-		GENERAL_IMAGERESOLUTION.setResolutionWidth(GENERAL_INT);
-
-		GENERAL_TEMPERATURE.setUnit(GENERAL_TEMPERATUREUNIT);
-		GENERAL_TEMPERATURE.setValue(GENERAL_FLOAT);
-
-		GENERAL_CLIMATECONTROLDATA.setFanSpeed(GENERAL_INT);
-		GENERAL_CLIMATECONTROLDATA.setCurrentTemperature(GENERAL_TEMPERATURE);
-		GENERAL_CLIMATECONTROLDATA.setDesiredTemperature(GENERAL_TEMPERATURE);
-		GENERAL_CLIMATECONTROLDATA.setAcEnable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLDATA.setCirculateAirEnable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLDATA.setAutoModeEnable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLDATA.setDualModeEnable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLDATA.setAcMaxEnable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLDATA.setDefrostZone(GENERAL_DEFROSTZONE);
-		GENERAL_CLIMATECONTROLDATA.setVentilationMode(GENERAL_VENTILATIONMODE);
-
-		GENERAL_SEATCONTROLDATA.setMemory(GENERAL_SEATMEMORYACTION);
-		GENERAL_SEATCONTROLDATA.setMassageCushionFirmness(GENERAL_MASSAGECUSHIONFIRMNESS_LIST);
-		GENERAL_SEATCONTROLDATA.setMassageMode(GENERAL_MASSAGEMODEDATA_LIST);
-		GENERAL_SEATCONTROLDATA.setMassageEnabled(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLDATA.setHeadSupportHorizontalPosition(GENERAL_INT);
-		GENERAL_SEATCONTROLDATA.setHeadSupportVerticalPosition(GENERAL_INT);
-		GENERAL_SEATCONTROLDATA.setBackTiltAngle(GENERAL_INT);
-		GENERAL_SEATCONTROLDATA.setBackVerticalPosition(GENERAL_INT);
-		GENERAL_SEATCONTROLDATA.setFrontVerticalPosition(GENERAL_INT);
-		GENERAL_SEATCONTROLDATA.setVerticalPosition(GENERAL_INT);
-		GENERAL_SEATCONTROLDATA.setHorizontalPosition(GENERAL_INT);
-		GENERAL_SEATCONTROLDATA.setCoolingLevel(GENERAL_INT);
-		GENERAL_SEATCONTROLDATA.setHeatingLevel(GENERAL_INT);
-		GENERAL_SEATCONTROLDATA.setHeatingEnabled(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLDATA.setCoolingEnabled(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLDATA.setId(GENERAL_SUPPORTEDSEAT);
-
-		GENERAL_AUDIOCONTROLDATA.setSource(GENERAL_PRIMARYAUDIOSOURCE);
-		GENERAL_AUDIOCONTROLDATA.setVolume(GENERAL_INT);
-		GENERAL_AUDIOCONTROLDATA.setKeepContext(GENERAL_BOOLEAN);
-		GENERAL_AUDIOCONTROLDATA.setEqualizerSettings(GENERAL_EQUALIZERSETTINGS_LIST);
-
-		GENERAL_HMISETTINGSCONTROLDATA.setDistanceUnit(GENERAL_DISTANCEUNIT);
-		GENERAL_HMISETTINGSCONTROLDATA.setTemperatureUnit(GENERAL_TEMPERATUREUNIT);
-		GENERAL_HMISETTINGSCONTROLDATA.setDisplayMode(GENERAL_DISPLAYMODE);
-
-		GENERAL_DYNAMICUPDATECAPABILITIES.setSupportsDynamicSubMenus(GENERAL_BOOLEAN);
-		GENERAL_DYNAMICUPDATECAPABILITIES.setSupportedDynamicImageFieldNames(Collections.singletonList(GENERAL_IMAGEFIELDNAME));
-
-		GENERAL_LIGHTCONTROLDATA.setLightState(GENERAL_LIGHTSTATE_LIST);
-
-		GENERAL_STATIONIDNUMBER.setCountryCode(GENERAL_INT);
-		GENERAL_STATIONIDNUMBER.setFccFacilityId(GENERAL_INT);
-
-		GENERAL_SISDATA.setStationMessage(GENERAL_STRING);
-		GENERAL_SISDATA.setStationLocation(VehicleDataHelper.GPS);
-
-		GENERAL_SISDATA.setStationLongName(GENERAL_STRING);
-		GENERAL_SISDATA.setStationIDNumber(GENERAL_STATIONIDNUMBER);
-		GENERAL_SISDATA.setStationShortName(GENERAL_STRING);
-
-		GENERAL_RDSDATA.setProgramService(GENERAL_STRING);
-		GENERAL_RDSDATA.setRadioText(GENERAL_STRING);
-		GENERAL_RDSDATA.setClockText(GENERAL_STRING);
-		GENERAL_RDSDATA.setProgramIdentification(GENERAL_STRING);
-		GENERAL_RDSDATA.setRegion(GENERAL_STRING);
-		GENERAL_RDSDATA.setTrafficProgram(GENERAL_BOOLEAN);
-		GENERAL_RDSDATA.setTrafficAnnouncement(GENERAL_BOOLEAN);
-		GENERAL_RDSDATA.setProgramType(GENERAL_INT);
-
-		GENERAL_RADIOCONTROLDATA.setFrequencyInteger(GENERAL_INT);
-		GENERAL_RADIOCONTROLDATA.setFrequencyFraction(GENERAL_INT);
-		GENERAL_RADIOCONTROLDATA.setBand(GENERAL_RADIOBAND);
-		GENERAL_RADIOCONTROLDATA.setRdsData(GENERAL_RDSDATA);
-		GENERAL_RADIOCONTROLDATA.setAvailableHDs(GENERAL_INT);
-		GENERAL_RADIOCONTROLDATA.setHdChannel(GENERAL_INT);
-		GENERAL_RADIOCONTROLDATA.setSignalStrength(GENERAL_INT);
-		GENERAL_RADIOCONTROLDATA.setSignalChangeThreshold(GENERAL_INT);
-		GENERAL_RADIOCONTROLDATA.setRadioEnable(GENERAL_BOOLEAN);
-		GENERAL_RADIOCONTROLDATA.setState(GENERAL_RADIOSTATE);
-
-		GENERAL_MODULEDATA.setModuleType(GENERAL_MODULETYPE);
-		GENERAL_MODULEDATA.setClimateControlData(GENERAL_CLIMATECONTROLDATA);
-
-		GENERAL_CHOICE.setMenuName(GENERAL_STRING);
-		GENERAL_CHOICE.setSecondaryText(GENERAL_STRING);
-		GENERAL_CHOICE.setTertiaryText(GENERAL_STRING);
-		GENERAL_CHOICE.setChoiceID(GENERAL_INT);
-		GENERAL_CHOICE.setImage(GENERAL_IMAGE);
-		GENERAL_CHOICE.setSecondaryImage(GENERAL_IMAGE);
-		GENERAL_CHOICE.setVrCommands(GENERAL_STRING_LIST);
-
-		GENERAL_MASSAGEMODEDATA.setMassageMode(GENERAL_MASSAGEMODE);
-		GENERAL_MASSAGEMODEDATA.setMassageZone(GENERAL_MASSAGEZONE);
-		GENERAL_MASSAGEMODEDATA_LIST.add(GENERAL_MASSAGEMODEDATA);
-
-		GENERAL_MASSAGECUSHIONFIRMNESS.setCushion(GENERAL_MASSAGECUSHION);
-		GENERAL_MASSAGECUSHIONFIRMNESS.setFirmness(GENERAL_INT);
-		GENERAL_MASSAGECUSHIONFIRMNESS_LIST.add(GENERAL_MASSAGECUSHIONFIRMNESS);
-
-		GENERAL_TOUCHCOORD.setX(GENERAL_INT);
-		GENERAL_TOUCHCOORD.setY(GENERAL_INT);
-		GENERAL_TOUCHCOORD_LIST.add(GENERAL_TOUCHCOORD);
-
-		GENERAL_TOUCHEVENT.setId(GENERAL_INT);
-		GENERAL_TOUCHEVENT.setTs(GENERAL_LONG_LIST);
-		GENERAL_TOUCHEVENT.setC(GENERAL_TOUCHCOORD_LIST);
-		GENERAL_TOUCHEVENT_LIST.add(GENERAL_TOUCHEVENT);
-
-		GENERAL_TEXTFIELD.setName(GENERAL_TEXTFIELDNAME);
-		GENERAL_TEXTFIELD.setRows(GENERAL_INT);
-		GENERAL_TEXTFIELD.setWidth(GENERAL_INT);
-		GENERAL_TEXTFIELD.setCharacterSet(GENERAL_CHARACTERSET);
-		GENERAL_TEXTFIELD_LIST.add(GENERAL_TEXTFIELD);
-
-		GENERAL_COORDINATE.setLongitudeDegrees(GENERAL_FLOAT);
-		GENERAL_COORDINATE.setLatitudeDegrees(GENERAL_FLOAT);
-
-		GENERAL_OASISADDRESS.setCountryName(GENERAL_STRING);
-		GENERAL_OASISADDRESS.setThoroughfare(GENERAL_STRING);
-		GENERAL_OASISADDRESS.setSubThoroughfare(GENERAL_STRING);
-		GENERAL_OASISADDRESS.setCountryCode(GENERAL_STRING);
-		GENERAL_OASISADDRESS.setPostalCode(GENERAL_STRING);
-		GENERAL_OASISADDRESS.setLocality(GENERAL_STRING);
-		GENERAL_OASISADDRESS.setSubLocality(GENERAL_STRING);
-		GENERAL_OASISADDRESS.setAdministrativeArea(GENERAL_STRING);
-		GENERAL_OASISADDRESS.setSubAdministrativeArea(GENERAL_STRING);
-
-		GENERAL_LOCATIONDETAILS.setAddressLines(GENERAL_STRING_LIST);
-		GENERAL_LOCATIONDETAILS.setCoordinate(GENERAL_COORDINATE);
-		GENERAL_LOCATIONDETAILS.setLocationDescription(GENERAL_STRING);
-		GENERAL_LOCATIONDETAILS.setLocationImage(GENERAL_IMAGE);
-		GENERAL_LOCATIONDETAILS.setLocationName(GENERAL_STRING);
-		GENERAL_LOCATIONDETAILS.setSearchAddress(GENERAL_OASISADDRESS);
-		GENERAL_LOCATIONDETAILS.setPhoneNumber(GENERAL_STRING);
-
-		GENERAL_FILETYPE_LIST.add(GENERAL_FILETYPE);
-
-		GENERAL_IMAGEFIELD.setImageResolution(GENERAL_IMAGERESOLUTION);
-		GENERAL_IMAGEFIELD.setName(GENERAL_IMAGEFIELDNAME);
-		GENERAL_IMAGEFIELD.setImageTypeSupported(GENERAL_FILETYPE_LIST);
-		GENERAL_IMAGEFIELD_LIST.add(GENERAL_IMAGEFIELD);
-
-		GENERAL_WINDOW_TYPE_CAPABILITIES.setType(GENERAL_WINDOWTYPE);
-		GENERAL_WINDOW_TYPE_CAPABILITIES.setMaximumNumberOfWindows(GENERAL_INT);
-		GENERAL_WINDOW_TYPE_CAPABILITIES_LIST.add(GENERAL_WINDOW_TYPE_CAPABILITIES);
-
-		GENERAL_WINDOW_CAPABILITY.setWindowID(GENERAL_INT);
-		GENERAL_WINDOW_CAPABILITY.setTextFields(GENERAL_TEXTFIELD_LIST);
-		GENERAL_WINDOW_CAPABILITY.setImageFields(GENERAL_IMAGEFIELD_LIST);
-		GENERAL_WINDOW_CAPABILITY.setImageTypeSupported(GENERAL_IMAGE_TYPE_LIST);
-		GENERAL_WINDOW_CAPABILITY.setTemplatesAvailable(GENERAL_STRING_LIST);
-		GENERAL_WINDOW_CAPABILITY.setNumCustomPresetsAvailable(GENERAL_INT);
-		GENERAL_WINDOW_CAPABILITY.setButtonCapabilities(GENERAL_BUTTONCAPABILITIES_LIST);
-		GENERAL_WINDOW_CAPABILITY.setSoftButtonCapabilities(GENERAL_SOFTBUTTONCAPABILITIES_LIST);
-		GENERAL_WINDOW_CAPABILITY_LIST.add(GENERAL_WINDOW_CAPABILITY);
-
-		GENERAL_DISPLAY_CAPABILITY.setDisplayName(GENERAL_STRING);
-		GENERAL_DISPLAY_CAPABILITY.setWindowTypeSupported(GENERAL_WINDOW_TYPE_CAPABILITIES_LIST);
-		GENERAL_DISPLAY_CAPABILITY.setWindowCapabilities(GENERAL_WINDOW_CAPABILITY_LIST);
-		GENERAL_DISPLAYCAPABILITY_LIST.add(GENERAL_DISPLAY_CAPABILITY);
-
-		GENERAL_SCREENPARAMS.setImageResolution(GENERAL_IMAGERESOLUTION);
-		GENERAL_SCREENPARAMS.setTouchEventAvailable(GENERAL_TOUCHEVENTCAPABILITIES);
-
-		GENERAL_MEDIACLOCKFORMAT_LIST.add(MediaClockFormat.CLOCK1);
-		GENERAL_MEDIACLOCKFORMAT_LIST.add(MediaClockFormat.CLOCK2);
-		GENERAL_SEAT_LIST.add(GENERAL_SEAT_LOCATION);
-
-		GENERAL_IMAGE.setValue(GENERAL_STRING);
-		GENERAL_IMAGE.setImageType(GENERAL_IMAGETYPE);
-		GENERAL_IMAGE.setIsTemplate(GENERAL_BOOLEAN);
-
-		GENERAL_TEMPLATE_CONFIGURATION.setTemplate(GENERAL_STRING);
-		GENERAL_TEMPLATE_CONFIGURATION.setDayColorScheme(TestValues.GENERAL_DAYCOLORSCHEME);
-		GENERAL_TEMPLATE_CONFIGURATION.setNightColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME);
-
-		GENERAL_SOFTBUTTON.setIsHighlighted(GENERAL_BOOLEAN);
-		GENERAL_SOFTBUTTON.setSoftButtonID(GENERAL_INT);
-		GENERAL_SOFTBUTTON.setSystemAction(SystemAction.STEAL_FOCUS);
-		GENERAL_SOFTBUTTON.setText(GENERAL_STRING);
-		GENERAL_SOFTBUTTON.setType(SoftButtonType.SBT_TEXT);
-		GENERAL_SOFTBUTTON.setImage(GENERAL_IMAGE);
-		GENERAL_SOFTBUTTON_LIST.add(GENERAL_SOFTBUTTON);
-
-		GENERAL_TURN.setNavigationText(GENERAL_STRING);
-		GENERAL_TURN.setTurnIcon(GENERAL_IMAGE);
-		GENERAL_TURN_LIST.add(GENERAL_TURN);
-
-		GENERAL_MENUPARAMS.setMenuName(GENERAL_STRING);
-		GENERAL_MENUPARAMS.setParentID(GENERAL_INT);
-		GENERAL_MENUPARAMS.setPosition(GENERAL_INT);
-
-		GENERAL_VRHELPITEM.setText(GENERAL_STRING);
-		GENERAL_VRHELPITEM.setImage(GENERAL_IMAGE);
-		GENERAL_VRHELPITEM.setPosition(100);
-    	GENERAL_VRHELPITEM_LIST.add(GENERAL_VRHELPITEM);
-
-    	GENERAL_TTSCHUNK_LIST.add(new TTSChunk("Welcome to the jungle", SpeechCapabilities.TEXT));
-    	GENERAL_TTSCHUNK_LIST.add(new TTSChunk("Say a command", SpeechCapabilities.TEXT));
-
-    	GENERAL_KEYBOARDPROPERTIES.setAutoCompleteText(GENERAL_STRING);
-    	GENERAL_KEYBOARDPROPERTIES.setKeypressMode(KeypressMode.SINGLE_KEYPRESS);
-    	GENERAL_KEYBOARDPROPERTIES.setKeyboardLayout(KeyboardLayout.QWERTY);
-    	GENERAL_KEYBOARDPROPERTIES.setLanguage(Language.EN_US);
-    	GENERAL_KEYBOARDPROPERTIES.setLimitedCharacterList(TestValues.GENERAL_STRING_LIST);
-
-    	GENERAL_STARTTIME.setHours(GENERAL_INT);
-		GENERAL_STARTTIME.setMinutes(GENERAL_INT);
-		GENERAL_STARTTIME.setSeconds(GENERAL_INT);
+    //Versions
+    public static final Version MAX_RPC_VERSION_SUPPORTED = LifecycleManager.MAX_SUPPORTED_RPC_VERSION;
+    /**
+     * @see SdlProtocol
+     */
+    public static final Version MAX_PROTOCOL_VERSION_SUPPORTED = new Version(5, 2, 0);
+
+
+    // Test Failure Messages
+    public static final String NULL = "Value should be null.";
+    public static final String MATCH = "Values should match.";
+    public static final String ARRAY = "Array values should match.";
+    public static final String TRUE = "Value should be true.";
+    public static final String FALSE = "Value should be false.";
+    public static final String NOT_NULL = "Value should not be null.";
+    public static final String JSON_FAIL = "Json testing failed.";
+
+    // RPC Request/Response/Notification/Datatype Test Values
+    public static final int GENERAL_INT = 100;
+    public static final Integer GENERAL_INTEGER = 100;
+    public static final Long GENERAL_LONG = 100L;
+    public static final Turn GENERAL_TURN = new Turn();
+    public static final Float GENERAL_FLOAT = 100f;
+    public static final Image GENERAL_IMAGE = new Image();
+    public static final Choice GENERAL_CHOICE = new Choice();
+    public static final String GENERAL_STRING = "test";
+    public static final Double GENERAL_DOUBLE = 10.01;
+    public static final boolean GENERAL_BOOLEAN = true;
+    public static final byte[] GENERAL_BYTE_ARRAY = new byte[0];
+    public static final TPMS GENERAL_TPMS = TPMS.UNKNOWN;
+    public static final TBTState GENERAL_TBTSTATE = TBTState.NEXT_TURN_REQUEST;
+    public static final FileType GENERAL_FILETYPE = FileType.BINARY;
+    public static final Language GENERAL_LANGUAGE = Language.EN_US;
+    public static final HMILevel GENERAL_HMILEVEL = HMILevel.HMI_FULL;
+    public static final DIDResult GENERAL_DIDRESULT = new DIDResult();
+    public static final TextField GENERAL_TEXTFIELD = new TextField();
+    public static final OasisAddress GENERAL_OASISADDRESS = new OasisAddress();
+    public static final Coordinate GENERAL_COORDINATE = new Coordinate();
+    public static final LocationDetails GENERAL_LOCATIONDETAILS = new LocationDetails();
+    public static final Dimension GENERAL_DIMENSION = Dimension._2D;
+    public static final ImageType GENERAL_IMAGETYPE = ImageType.DYNAMIC;
+    public static final AudioType GENERAL_AUDIOTYPE = AudioType.PCM;
+    public static final StartTime GENERAL_STARTTIME = new StartTime();
+    public static final TouchType GENERAL_TOUCHTYPE = TouchType.BEGIN;
+    public static final TouchEvent GENERAL_TOUCHEVENT = new TouchEvent();
+    public static final VrHelpItem GENERAL_VRHELPITEM = new VrHelpItem();
+    public static final ImageField GENERAL_IMAGEFIELD = new ImageField();
+    public static final DeviceInfo GENERAL_DEVICEINFO = new DeviceInfo();
+    public static final AppInfo GENERAL_APPINFO = new AppInfo();
+    public static final Uri GENERAL_URI = Uri.parse("http://www.google.com");
+    public static final LayoutMode GENERAL_LAYOUTMODE = LayoutMode.LIST_ONLY;
+    public static final MenuParams GENERAL_MENUPARAMS = new MenuParams();
+    public static final SoftButton GENERAL_SOFTBUTTON = new SoftButton();
+    public static final ButtonName GENERAL_BUTTONNAME = ButtonName.OK;
+    public static final UpdateMode GENERAL_UPDATEMODE = UpdateMode.RESUME;
+    public static final TouchCoord GENERAL_TOUCHCOORD = new TouchCoord();
+    public static final MassageModeData GENERAL_MASSAGEMODEDATA = new MassageModeData();
+    public static final MassageCushionFirmness GENERAL_MASSAGECUSHIONFIRMNESS = new MassageCushionFirmness();
+    public static final DisplayType GENERAL_DISPLAYTYPE = DisplayType.CID;
+    public static final VehicleType GENERAL_VEHICLETYPE = new VehicleType();
+    public static final RequestType GENERAL_REQUESTTYPE = RequestType.AUTH_REQUEST;
+    public static final SystemAction GENERAL_SYSTEMACTION = SystemAction.DEFAULT_ACTION;
+    public static final CharacterSet GENERAL_CHARACTERSET = CharacterSet.CID1SET;
+    public static final SamplingRate GENERAL_SAMPLINGRATE = SamplingRate._8KHZ;
+    public static final ScreenParams GENERAL_SCREENPARAMS = new ScreenParams();
+    public static final KeypressMode GENERAL_KEYPRESSMODE = KeypressMode.QUEUE_KEYPRESSES;
+    public static final SystemContext GENERAL_SYSTEMCONTEXT = SystemContext.SYSCTXT_MAIN;
+    public static final KeyboardEvent GENERAL_KEYBOARDEVENT = KeyboardEvent.ENTRY_SUBMITTED;
+    public static final CarModeStatus GENERAL_CARMODESTATUS = CarModeStatus.NORMAL;
+    public static final TextFieldName GENERAL_TEXTFIELDNAME = TextFieldName.ETA;
+    public static final TriggerSource GENERAL_TRIGGERSOURCE = TriggerSource.TS_VR;
+    public static final BitsPerSample GENERAL_BITSPERSAMPLE = BitsPerSample._8_BIT;
+    public static final TextAlignment GENERAL_TEXTALIGNMENT = TextAlignment.CENTERED;
+    public static final SdlMsgVersion GENERAL_SDLMSGVERSION = new SdlMsgVersion();
+    public static final PermissionItem GENERAL_PERMISSIONITEM = new PermissionItem();
+    public static final SoftButtonType GENERAL_SOFTBUTTONTYPE = SoftButtonType.SBT_BOTH;
+    public static final MassageZone GENERAL_MASSAGEZONE = MassageZone.LUMBAR;
+    public static final MassageMode GENERAL_MASSAGEMODE = MassageMode.HIGH;
+    public static final WindowStatus GENERAL_WINDOW_STATUS = new WindowStatus();
+    public static final MassageCushion GENERAL_MASSAGECUSHION = MassageCushion.BACK_BOLSTERS;
+    public static final SeatMemoryActionType GENERAL_SEATMEMORYACTIONTYPE = SeatMemoryActionType.SAVE;
+    public static final SupportedSeat GENERAL_SUPPORTEDSEAT = SupportedSeat.DRIVER;
+    public static final KeyboardLayout GENERAL_KEYBOARDLAYOUT = KeyboardLayout.QWERTY;
+    public static final ImageFieldName GENERAL_IMAGEFIELDNAME = ImageFieldName.graphic;
+    public static final HMIPermissions GENERAL_HMIPERMISSIONS = new HMIPermissions();
+    public static final IgnitionStatus GENERAL_IGNITIONSTATUS = IgnitionStatus.RUN;
+    public static final ButtonEventMode GENERAL_BUTTONEVENTMODE = ButtonEventMode.BUTTONUP;
+    public static final ButtonPressMode GENERAL_BUTTONPRESSMODE = ButtonPressMode.SHORT;
+    public static final PowerModeStatus GENERAL_POWERMODESTATUS = PowerModeStatus.RUNNING_2;
+    public static final VehicleDataType GENERAL_VEHICLEDATATYPE = VehicleDataType.VEHICLEDATA_BRAKING;
+    public static final InteractionMode GENERAL_INTERACTIONMODE = InteractionMode.BOTH;
+    public static final ImageResolution GENERAL_IMAGERESOLUTION = new ImageResolution();
+    public static final FuelCutoffStatus GENERAL_FUELCUTOFFSTATUS = FuelCutoffStatus.NORMAL_OPERATION;
+    public static final CompassDirection GENERAL_COMPASSDIRECTION = CompassDirection.EAST;
+    public static final LockScreenStatus GENERAL_LOCKSCREENSTATUS = LockScreenStatus.REQUIRED;
+    public static final VehicleDataStatus GENERAL_VEHICLEDATASTATUS = VehicleDataStatus.ON;
+    public static final DeviceLevelStatus GENERAL_DEVICELEVELSTATUS = DeviceLevelStatus.FOUR_LEVEL_BARS;
+    public static final ButtonCapabilities GENERAL_BUTTONCAPABILITIES = new ButtonCapabilities();
+    public static final EmergencyEventType GENERAL_EMERGENCYEVENTTYPE = EmergencyEventType.FAULT;
+    public static final AmbientLightStatus GENERAL_AMBIENTLIGHTSTATUS = AmbientLightStatus.NIGHT;
+    public static final SpeechCapabilities GENERAL_SPEECHCAPABILITIES = SpeechCapabilities.TEXT;
+    public static final WarningLightStatus GENERAL_WARNINGLIGHTSTATUS = WarningLightStatus.OFF;
+    public static final KeyboardProperties GENERAL_KEYBOARDPROPERTIES = new KeyboardProperties();
+    public static final PrimaryAudioSource GENERAL_PRIMARYAUDIOSOURCE = PrimaryAudioSource.BLUETOOTH_STEREO_BTST;
+    public static final AudioStreamingState GENERAL_AUDIOSTREAMINGSTATE = AudioStreamingState.AUDIBLE;
+    public static final VideoStreamingState GENERAL_VIDEOSTREAMINGSTATE = VideoStreamingState.STREAMABLE;
+    public static final DisplayCapabilities GENERAL_DISPLAYCAPABILITIES = new DisplayCapabilities();
+    public static final ParameterPermissions GENERAL_PARAMETERPERMISSIONS = new ParameterPermissions();
+    public static final IgnitionStableStatus GENERAL_IGNITIONSTABLESTATUS = IgnitionStableStatus.IGNITION_SWITCH_STABLE;
+    public static final VehicleDataResultCode GENERAL_VEHICLEDATARESULTCODE = VehicleDataResultCode.IGNORED;
+    public static final ComponentVolumeStatus GENERAL_COMPONENTVOLUMESTATUS = ComponentVolumeStatus.LOW;
+    public static final PresetBankCapabilities GENERAL_PRESETBANKCAPABILITIES = new PresetBankCapabilities();
+    public static final CapacityUnit GENERAL_CAPACITYUNIT = CapacityUnit.KILOGRAMS;
+    public static final VehicleDataEventStatus GENERAL_VEHCILEDATAEVENTSTATUS = VehicleDataEventStatus.YES;
+    public static final VehicleDataEventStatus GENERAL_VEHICLEDATAEVENTSTATUS = VehicleDataEventStatus.YES;
+    public static final TouchEventCapabilities GENERAL_TOUCHEVENTCAPABILITIES = new TouchEventCapabilities();
+    public static final SeatMemoryAction GENERAL_SEATMEMORYACTION = new SeatMemoryAction();
+    public static final SoftButtonCapabilities GENERAL_SOFTBUTTONCAPABILITIES = new SoftButtonCapabilities();
+    public static final ECallConfirmationStatus GENERAL_ECALLCONFIRMATIONSTATUS = ECallConfirmationStatus.CALL_IN_PROGRESS;
+    public static final AudioPassThruCapabilities GENERAL_AUDIOPASSTHRUCAPABILITIES = new AudioPassThruCapabilities();
+    public static final PowerModeQualificationStatus GENERAL_POWERMODEQUALIFICATIONSTATUS = PowerModeQualificationStatus.POWER_MODE_OK;
+    public static final VehicleDataNotificationStatus GENERAL_VEHICLEDATANOTIFICATIONSTATUS = VehicleDataNotificationStatus.NORMAL;
+    public static final AppInterfaceUnregisteredReason GENERAL_APPINTERFACEUNREGISTEREDREASON = AppInterfaceUnregisteredReason.BLUETOOTH_OFF;
+    public static final SystemCapabilityType GENERAL_SYSTEMCAPABILITYTYPE = SystemCapabilityType.NAVIGATION;
+    public static final NavigationCapability GENERAL_NAVIGATIONCAPABILITY = new NavigationCapability();
+    public static final DriverDistractionCapability GENERAL_DRIVERDISTRACTIONCAPABILITY = new DriverDistractionCapability();
+    public static final PhoneCapability GENERAL_PHONECAPABILITY = new PhoneCapability();
+    public static final RemoteControlCapabilities GENERAL_REMOTECONTROLCAPABILITIES = new RemoteControlCapabilities();
+    public static final SystemCapability GENERAL_SYSTEMCAPABILITY = new SystemCapability();
+    public static final VideoStreamingProtocol GENERAL_VIDEOSTREAMINGPROTOCOL = VideoStreamingProtocol.RAW;
+    public static final VideoStreamingCodec GENERAL_VIDEOSTREAMINGCODEC = VideoStreamingCodec.H264;
+    public static final VideoStreamingCapability GENERAL_VIDEOSTREAMINGCAPABILITY = new VideoStreamingCapability();
+    public static final VideoStreamingFormat GENERAL_VIDEOSTREAMINGFORMAT = new VideoStreamingFormat();
+    public static final RGBColor GENERAL_RGBCOLOR = new RGBColor();
+    public static final TemplateColorScheme GENERAL_DAYCOLORSCHEME = new TemplateColorScheme();
+    public static final TemplateColorScheme GENERAL_NIGHTCOLORSCHEME = new TemplateColorScheme();
+    public static final Result GENERAL_RESULT = Result.SUCCESS;
+    public static final WayPointType GENERAL_WAYPOINTTYPE = WayPointType.DESTINATION;
+    public static final SingleTireStatus GENERAL_SINGLETIRESTATUS = new SingleTireStatus();
+    public static final DriverDistractionState GENERAL_DRIVERDISTRACTIONSTATE = DriverDistractionState.DD_ON;
+    public static final List<LocationDetails> GENERAL_LOCATIONDETAILS_LIST = Arrays.asList(new LocationDetails[]{TestValues.GENERAL_LOCATIONDETAILS, TestValues.GENERAL_LOCATIONDETAILS});
+    public static final AudioStreamingIndicator GENERAL_AUDIO_STREAMING_INDICATOR = AudioStreamingIndicator.PLAY;
+    public static final String GENERAL_APP_ID = "123e4567e8";
+    public static final String GENERAL_FULL_APP_ID = "123e4567-e89b-12d3-a456-426655440000";
+    public static final String GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME = "oemCustomVehicleDataName";
+    public static final HybridAppPreference GENERAL_HYBRID_APP_PREFERENCE = HybridAppPreference.CLOUD;
+    public static final CloudAppProperties GENERAL_CLOUDAPPPROPERTIES = new CloudAppProperties();
+    public static final AppServiceType GENERAL_APP_SERVICE_TYPE = AppServiceType.MEDIA;
+    public static final List<Integer> GENERAL_FUNCTION_ID_LIST = Arrays.asList(FunctionID.GET_VEHICLE_DATA.getId(), FunctionID.SEND_HAPTIC_DATA.getId());
+    public static final AppServiceManifest GENERAL_APPSERVICEMANIFEST = new AppServiceManifest(AppServiceType.MEDIA.name());
+    public static final MediaServiceManifest GENERAL_MEDIA_SERVICE_MANIFEST = new MediaServiceManifest();
+    public static final WeatherServiceManifest GENERAL_WEATHER_SERVICE_MANIFEST = new WeatherServiceManifest();
+    public static final NavigationServiceManifest GENERAL_NAVIGATION_SERVICE_MANIFEST = new NavigationServiceManifest();
+    public static final AppServiceRecord GENERAL_APPSERVICERECORD = new AppServiceRecord();
+    public static final AppServiceCapability GENERAL_APP_SERVICE_CAPABILITY = new AppServiceCapability();
+    public static final AppServicesCapabilities GENERAL_APP_SERVICE_CAPABILITIES = new AppServicesCapabilities();
+    public static final ServiceUpdateReason GENERAL_SERVICE_UPDATE_REASON = ServiceUpdateReason.MANIFEST_UPDATE;
+    public static final DateTime GENERAL_DATETIME = new DateTime();
+    public static final WeatherData GENERAL_WEATHERDATA = new WeatherData();
+    public static final WeatherAlert GENERAL_WEATHERALERT = new WeatherAlert();
+    public static final MediaType GENERAL_MEDIATYPE = MediaType.MUSIC;
+    public static final MediaServiceData GENERAL_MEDIASERVICEDATA = new MediaServiceData();
+    public static final WeatherServiceData GENERAL_WEATHERSERVICEDATA = new WeatherServiceData();
+    public static final NavigationServiceData GENERAL_NAVIGATIONSERVICEDATA = new NavigationServiceData();
+    public static final AppServiceData GENERAL_APPSERVICEDATA = new AppServiceData();
+    public static final NavigationAction GENERAL_NAVIGATIONACTION = NavigationAction.STAY;
+    public static final NavigationJunction GENERAL_NAVIGATION_JUNCTION = NavigationJunction.BIFURCATION;
+    public static final Direction GENERAL_DIRECTION = Direction.RIGHT;
+    public static final NavigationInstruction GENERAL_NAVIGATION_INSTRUCTION = new NavigationInstruction();
+    public static final Version GENERAL_VERSION = new Version("4.0.0");
+    public static final ModuleType GENERAL_MODULETYPE = ModuleType.CLIMATE;
+    public static final Temperature GENERAL_TEMPERATURE = new Temperature();
+    public static final TemperatureUnit GENERAL_TEMPERATUREUNIT = TemperatureUnit.CELSIUS;
+    public static final DefrostZone GENERAL_DEFROSTZONE = DefrostZone.ALL;
+    public static final VentilationMode GENERAL_VENTILATIONMODE = VentilationMode.BOTH;
+    public static final LightName GENERAL_LIGHTNAME = LightName.AMBIENT_LIGHTS;
+    public static final DisplayMode GENERAL_DISPLAYMODE = DisplayMode.AUTO;
+    public static final DistanceUnit GENERAL_DISTANCEUNIT = DistanceUnit.KILOMETERS;
+    public static final LightStatus GENERAL_LIGHTSTATUS = LightStatus.OFF;
+    public static final RadioBand GENERAL_RADIOBAND = RadioBand.AM;
+    public static final ClimateControlData GENERAL_CLIMATECONTROLDATA = new ClimateControlData();
+    public static final SeatControlData GENERAL_SEATCONTROLDATA = new SeatControlData();
+    public static final RdsData GENERAL_RDSDATA = new RdsData();
+    public static final StationIDNumber GENERAL_STATIONIDNUMBER = new StationIDNumber();
+    public static final SisData GENERAL_SISDATA = new SisData();
+    public static final RadioState GENERAL_RADIOSTATE = RadioState.ACQUIRED;
+    public static final RadioControlData GENERAL_RADIOCONTROLDATA = new RadioControlData();
+    public static final ModuleData GENERAL_MODULEDATA = new ModuleData();
+    public static final ClimateControlCapabilities GENERAL_CLIMATECONTROLCAPABILITIES = new ClimateControlCapabilities();
+    public static final RadioControlCapabilities GENERAL_RADIOCONTROLCAPABILITIES = new RadioControlCapabilities();
+    public static final SeatControlCapabilities GENERAL_SEATCONTROLCAPABILITIES = new SeatControlCapabilities();
+    public static final EqualizerSettings GENERAL_EQUALIZERSETTINGS = new EqualizerSettings();
+    public static final LightCapabilities GENERAL_LIGHTCAPABILITIES = new LightCapabilities();
+    public static final LightState GENERAL_LIGHTSTATE = new LightState();
+    public static final AudioControlCapabilities GENERAL_AUDIOCONTROLCAPABILITIES = new AudioControlCapabilities();
+    public static final HMISettingsControlCapabilities GENERAL_HMISETTINGSCONTROLCAPABILITIES = new HMISettingsControlCapabilities();
+    public static final LightControlCapabilities GENERAL_LIGHTCONTROLCAPABILITIES = new LightControlCapabilities();
+    public static final AudioControlData GENERAL_AUDIOCONTROLDATA = new AudioControlData();
+    public static final LightControlData GENERAL_LIGHTCONTROLDATA = new LightControlData();
+    public static final HMISettingsControlData GENERAL_HMISETTINGSCONTROLDATA = new HMISettingsControlData();
+    public static final DynamicUpdateCapabilities GENERAL_DYNAMICUPDATECAPABILITIES = new DynamicUpdateCapabilities();
+
+    public static final VehicleDataResult GENERAL_OEM_CUSTOM_VEHICLE_DATA = new VehicleDataResult();
+    public static final TemplateConfiguration GENERAL_TEMPLATE_CONFIGURATION = new TemplateConfiguration();
+    public static final WindowTypeCapabilities GENERAL_WINDOW_TYPE_CAPABILITIES = new WindowTypeCapabilities();
+    public static final WindowCapability GENERAL_WINDOW_CAPABILITY = new WindowCapability();
+    public static final DisplayCapability GENERAL_DISPLAY_CAPABILITY = new DisplayCapability();
+
+    public static final SdlArtwork GENERAL_ARTWORK = new SdlArtwork("sdl", FileType.GRAPHIC_PNG, R.drawable.ic_sdl, false);
+    public static final MenuLayout GENERAL_MENU_LAYOUT = MenuLayout.LIST;
+    public static final MenuConfiguration GENERAL_MENU_CONFIGURATION = new MenuConfiguration(GENERAL_MENU_LAYOUT, GENERAL_MENU_LAYOUT);
+
+    public static final HMICapabilities GENERAL_HMICAPABILITIES = new HMICapabilities();
+
+    public static final MetadataTags GENERAL_METADATASTRUCT = new MetadataTags();
+    public static final Rectangle GENERAL_RECTANGLE = new Rectangle();
+    public static final HapticRect GENERAL_HAPTIC_RECT = new HapticRect();
+    public static final FuelType GENERAL_FUELTYPE = FuelType.GASOLINE;
+    public static final LockScreenConfig GENERAL_LOCKSCREENCONFIG = new LockScreenConfig();
+    public static final Grid GENERAL_GRID = new Grid();
+    public static final SeatLocation GENERAL_SEAT_LOCATION = new SeatLocation();
+    public static final ModuleInfo GENERAL_MODULE_INFO = new ModuleInfo();
+    public static final StabilityControlsStatus GENERAL_STABILITY_CONTROL_STATUS = new StabilityControlsStatus();
+    public static final VehicleDataStatus GENERAL_ESC_SYSTEM = VehicleDataStatus.ON;
+    public static final VehicleDataStatus GENERAL_S_WAY_CONTROL = VehicleDataStatus.OFF;
+    public static final WindowType GENERAL_WINDOWTYPE = WindowType.MAIN;
+    public static final GearStatus GENERAL_GEAR_STATUS = new GearStatus();
+    public static final PRNDL GENERAL_USER_SELECTED_GEAR = PRNDL.NEUTRAL;
+    public static final PRNDL GENERAL_ACTUAL_GEAR = PRNDL.DRIVE;
+    public static final TransmissionType GENERAL_TRANSMISSION_TYPE = TransmissionType.AUTOMATIC;
+    public static final Grid GENERAL_LOCATION_GRID = new Grid(2, 3);
+    public static final WindowState GENERAL_WINDOW_STATE = new WindowState(2, 3);
+    public static final Integer GENERAL_APPROX_POSITION = new Integer(3);
+    public static final Integer GENERAL_DEVIATION = new Integer(2);
+    public static final List<Long> GENERAL_LONG_LIST = Arrays.asList(new Long[]{1L, 2L});
+    public static final List<Turn> GENERAL_TURN_LIST = new ArrayList<Turn>();
+    public static final List<Choice> GENERAL_CHOICE_LIST = new ArrayList<Choice>();
+    public static final List<String> GENERAL_STRING_LIST = Arrays.asList(new String[]{"a", "b"});
+    public static final List<Integer> GENERAL_INTEGER_LIST = Arrays.asList(new Integer[]{-1, -2});
+    public static final List<TTSChunk> GENERAL_TTSCHUNK_LIST = new ArrayList<TTSChunk>(2);
+    public static final List<HMILevel> GENERAL_HMILEVEL_LIST = Arrays.asList(new HMILevel[]{HMILevel.HMI_FULL, HMILevel.HMI_BACKGROUND});
+    public static final List<FileType> GENERAL_FILETYPE_LIST = new ArrayList<FileType>(1);
+    public static final List<TextField> GENERAL_TEXTFIELD_LIST = new ArrayList<TextField>(1);
+    public static final List<DIDResult> GENERAL_DIDRESULT_LIST = new ArrayList<DIDResult>(1);
+    public static final List<TouchCoord> GENERAL_TOUCHCOORD_LIST = new ArrayList<TouchCoord>(1);
+    public static final List<MassageModeData> GENERAL_MASSAGEMODEDATA_LIST = new ArrayList<MassageModeData>(1);
+    public static final List<MassageCushionFirmness> GENERAL_MASSAGECUSHIONFIRMNESS_LIST = new ArrayList<MassageCushionFirmness>(1);
+    public static final List<AppHMIType> GENERAL_APPHMITYPE_LIST = new ArrayList<AppHMIType>(2);
+    public static final List<VrHelpItem> GENERAL_VRHELPITEM_LIST = new ArrayList<VrHelpItem>(2);
+    public static final List<SoftButton> GENERAL_SOFTBUTTON_LIST = new ArrayList<SoftButton>(1);
+    public static final List<ImageField> GENERAL_IMAGEFIELD_LIST = new ArrayList<ImageField>(1);
+    public static final List<TouchEvent> GENERAL_TOUCHEVENT_LIST = new ArrayList<TouchEvent>(1);
+    public static final List<PermissionItem> GENERAL_PERMISSIONITEM_LIST = new ArrayList<PermissionItem>(1);
+    public static final List<GlobalProperty> GENERAL_GLOBALPROPERTY_LIST = new ArrayList<GlobalProperty>(2);
+    public static final List<VrCapabilities> GENERAL_VRCAPABILITIES_LIST = new ArrayList<VrCapabilities>(1);
+    public static final List<MediaClockFormat> GENERAL_MEDIACLOCKFORMAT_LIST = new ArrayList<MediaClockFormat>(2);
+    public static final List<VehicleDataResult> GENERAL_VEHICLEDATARESULT_LIST = new ArrayList<VehicleDataResult>(VehicleDataType.values().length);
+    public static final List<PrerecordedSpeech> GENERAL_PRERECORDEDSPEECH_LIST = new ArrayList<PrerecordedSpeech>(2);
+    public static final List<SpeechCapabilities> GENERAL_SPEECHCAPABILITIES_LIST = new ArrayList<SpeechCapabilities>(2);
+    public static final List<ButtonCapabilities> GENERAL_BUTTONCAPABILITIES_LIST = new ArrayList<ButtonCapabilities>(2);
+    public static final List<HmiZoneCapabilities> GENERAL_HMIZONECAPABILITIES_LIST = new ArrayList<HmiZoneCapabilities>(2);
+    public static final List<SoftButtonCapabilities> GENERAL_SOFTBUTTONCAPABILITIES_LIST = new ArrayList<SoftButtonCapabilities>(1);
+    public static final List<AudioPassThruCapabilities> GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST = new ArrayList<AudioPassThruCapabilities>(1);
+    public static final List<VideoStreamingFormat> GENERAL_VIDEOSTREAMINGFORMAT_LIST = new ArrayList<VideoStreamingFormat>(2);
+    public static final List<DefrostZone> GENERAL_DEFROSTZONE_LIST = Arrays.asList(new DefrostZone[]{DefrostZone.FRONT, DefrostZone.REAR});
+    public static final List<VentilationMode> GENERAL_VENTILATIONMODE_LIST = Arrays.asList(new VentilationMode[]{VentilationMode.LOWER, VentilationMode.UPPER});
+    public static final List<ClimateControlCapabilities> GENERAL_CLIMATECONTROLCAPABILITIES_LIST = new ArrayList<ClimateControlCapabilities>(1);
+    public static final List<RadioControlCapabilities> GENERAL_RADIOCONTROLCAPABILITIES_LIST = new ArrayList<RadioControlCapabilities>(1);
+    public static final Vector<String> GENERAL_VECTOR_STRING = new Vector<>(Arrays.asList(new String[]{"a", "b"}));
+    public static final Vector<TTSChunk> GENERAL_VECTOR_TTS_CHUNKS = new Vector<>(Arrays.asList(new TTSChunk("Welcome to the jungle", SpeechCapabilities.TEXT)));
+    public static final List<SeatControlCapabilities> GENERAL_SEATCONTROLCAPABILITIES_LIST = new ArrayList<SeatControlCapabilities>(1);
+    public static final List<EqualizerSettings> GENERAL_EQUALIZERSETTINGS_LIST = new ArrayList<EqualizerSettings>(1);
+    public static final List<LightCapabilities> GENERAL_LIGHTCAPABILITIES_LIST = new ArrayList<LightCapabilities>(1);
+    public static final List<LightState> GENERAL_LIGHTSTATE_LIST = new ArrayList<LightState>(1);
+    public static final List<AudioControlCapabilities> GENERAL_AUDIOCONTROLCAPABILITIES_LIST = new ArrayList<AudioControlCapabilities>(1);
+    public static final List<ModuleData> GENERAL_MODULEDATA_LIST = Collections.singletonList(GENERAL_MODULEDATA);
+    public static final List<AppServiceType> GENERAL_APPSERVICETYPE_LIST = Arrays.asList(AppServiceType.MEDIA, AppServiceType.NAVIGATION);
+    public static final List<AppServiceCapability> GENERAL_APPSERVICECAPABILITY_LIST = Arrays.asList(GENERAL_APP_SERVICE_CAPABILITY);
+    public static final List<WeatherData> GENERAL_WEATHERDATA_LIST = Arrays.asList(GENERAL_WEATHERDATA);
+    public static final List<WeatherAlert> GENERAL_WEATHERALERT_LIST = Arrays.asList(GENERAL_WEATHERALERT);
+    public static final List<NavigationInstruction> GENERAL_NAVIGATION_INSTRUCTION_LIST = Arrays.asList(GENERAL_NAVIGATION_INSTRUCTION);
+    public static final List<SeatLocation> GENERAL_SEAT_LIST = new ArrayList<>(1);
+    public static final List<Boolean> GENERAL_BOOLEAN_LIST = Arrays.asList(new Boolean[]{Boolean.TRUE, Boolean.TRUE});
+    public static final List<Integer> GENERAL_AVAILABLE_HD_CHANNELS_LIST = Arrays.asList(new Integer[]{1, 2});
+    public static final List<ImageType> GENERAL_IMAGE_TYPE_LIST = Arrays.asList(new ImageType[]{ImageType.DYNAMIC, ImageType.STATIC});
+    public static final List<WindowTypeCapabilities> GENERAL_WINDOW_TYPE_CAPABILITIES_LIST = new ArrayList<WindowTypeCapabilities>(1);
+    public static final List<WindowCapability> GENERAL_WINDOW_CAPABILITY_LIST = new ArrayList<WindowCapability>(1);
+    public static final List<DisplayCapability> GENERAL_DISPLAYCAPABILITY_LIST = new ArrayList<DisplayCapability>(1);
+    public static final List<MenuLayout> GENERAL_MENU_LAYOUT_LIST = Arrays.asList(MenuLayout.LIST, MenuLayout.TILES);
+    public static final int GENERAL_MENU_MAX_ID = 2000000000;
+    public static final MenuCell GENERAL_MENUCELL = new MenuCell(GENERAL_STRING, null, null, new MenuSelectionListener() {
+        @Override
+        public void onTriggered(TriggerSource trigger) {
+            //
+        }
+    });
+    public static final ChoiceCell GENERAL_CHOICECELL = new ChoiceCell(GENERAL_STRING);
+    public static final List<ChoiceCell> GENERAL_CHOICECELL_LIST = Arrays.asList(GENERAL_CHOICECELL);
+    public static final List<MenuCell> GENERAL_MENUCELL_LIST = Arrays.asList(GENERAL_MENUCELL);
+    public static final VoiceCommand GENERAL_VOICE_COMMAND = new VoiceCommand(GENERAL_STRING_LIST, new VoiceCommandSelectionListener() {
+        @Override
+        public void onVoiceCommandSelected() {
+
+        }
+    });
+    public static final List<VoiceCommand> GENERAL_VOICE_COMMAND_LIST = Arrays.asList(GENERAL_VOICE_COMMAND);
+
+    public static final JSONArray JSON_TURNS = new JSONArray();
+    public static final JSONArray JSON_CHOICES = new JSONArray();
+    public static final JSONArray JSON_HMILEVELS = new JSONArray();
+    public static final JSONArray JSON_TTSCHUNKS = new JSONArray();
+    public static final JSONArray JSON_DIDRESULTS = new JSONArray();
+    public static final JSONArray JSON_TEXTFIELDS = new JSONArray();
+    public static final JSONArray JSON_TOUCHCOORDS = new JSONArray();
+    public static final JSONArray JSON_VRHELPITEMS = new JSONArray();
+    public static final JSONArray JSON_SOFTBUTTONS = new JSONArray();
+    public static final JSONArray JSON_IMAGEFIELDS = new JSONArray();
+    public static final JSONArray JSON_TOUCHEVENTS = new JSONArray();
+    public static final JSONArray JSON_PERMISSIONITEMS = new JSONArray();
+    public static final JSONArray JSON_BUTTONCAPABILITIES = new JSONArray();
+    public static final JSONArray JSON_SOFTBUTTONCAPABILITIES = new JSONArray();
+    public static final JSONArray JSON_AUDIOPASSTHRUCAPABILITIES = new JSONArray();
+    public static final JSONArray JSON_RADIOCONTROLCAPABILITIES = new JSONArray();
+    public static final JSONArray JSON_CLIMATECONTROLCAPABILITIES = new JSONArray();
+    public static final JSONArray JSON_TEXTFIELDTYPES = new JSONArray();
+    public static final JSONArray JSON_SEAT_LOCATIONS = new JSONArray();
+    public static final JSONObject JSON_TURN = new JSONObject();
+    public static final JSONObject JSON_IMAGE = new JSONObject();
+    public static final JSONObject JSON_CHOICE = new JSONObject();
+    public static final JSONObject JSON_DIDRESULT = new JSONObject();
+    public static final JSONObject JSON_STARTTIME = new JSONObject();
+    public static final JSONObject JSON_TEXTFIELD = new JSONObject();
+    public static final JSONObject JSON_TOUCHCOORD = new JSONObject();
+    public static final JSONObject JSON_TOUCHEVENT = new JSONObject();
+    public static final JSONObject JSON_IMAGEFIELD = new JSONObject();
+    public static final JSONObject JSON_SOFTBUTTON = new JSONObject();
+    public static final JSONObject JSON_MENUPARAMS = new JSONObject();
+    public static final JSONObject JSON_DEVICEINFO = new JSONObject();
+    public static final JSONObject JSON_APPINFO = new JSONObject();
+    public static final JSONObject JSON_VRHELPITEM = new JSONObject();
+    public static final JSONObject JSON_SCREENPARAMS = new JSONObject();
+    public static final JSONObject JSON_SDLMSGVERSION = new JSONObject();
+    public static final JSONObject JSON_PERMISSIONITEM = new JSONObject();
+    public static final JSONObject JSON_HMIPERMISSIONS = new JSONObject();
+    public static final JSONObject JSON_IMAGERESOLUTION = new JSONObject();
+    public static final JSONObject JSON_KEYBOARDPROPERTIES = new JSONObject();
+    public static final JSONObject JSON_DISPLAYCAPABILITIES = new JSONObject();
+    public static final JSONObject JSON_PARAMETERPERMISSIONS = new JSONObject();
+    public static final JSONObject JSON_PRESETBANKCAPABILITIES = new JSONObject();
+    public static final JSONObject JSON_TOUCHEVENTCAPABILITIES = new JSONObject();
+    public static final JSONObject JSON_PCMSTREAMCAPABILITIES = new JSONObject();
+    public static final JSONObject JSON_RGBCOLOR = new JSONObject();
+    public static final JSONObject JSON_DAYCOLORSCHEME = new JSONObject();
+    public static final JSONObject JSON_NIGHTCOLORSCHEME = new JSONObject();
+    public static final JSONObject JSON_GRID = new JSONObject();
+    public static final JSONObject JSON_MODULE_INFO = new JSONObject();
+    public static final JSONArray JSON_IMAGE_TYPE_SUPPORTED = new JSONArray();
+    public static final JSONObject JSON_WINDOW_TYPE_CAPABILITIES = new JSONObject();
+    public static final JSONArray JSON_WINDOW_TYPE_CAPABILITIES_LIST = new JSONArray();
+    public static final JSONObject JSON_WINDOW_CAPABILITY = new JSONObject();
+    public static final JSONArray JSON_WINDOW_CAPABILITIES = new JSONArray();
+    public static final JSONArray JSON_IMAGE_TYPES = new JSONArray();
+    public static final JSONObject JSON_DISPLAYCAPABILITY = new JSONObject();
+    public static final JSONArray JSON_DISPLAYCAPABILITY_LIST = new JSONArray();
+    public static final JSONObject JSON_DYNAMICUPDATECAPABILITIES = new JSONObject();
+
+    static {
+        GENERAL_TOUCHEVENTCAPABILITIES.setDoublePressAvailable(GENERAL_BOOLEAN);
+        GENERAL_TOUCHEVENTCAPABILITIES.setMultiTouchAvailable(GENERAL_BOOLEAN);
+        GENERAL_TOUCHEVENTCAPABILITIES.setPressAvailable(GENERAL_BOOLEAN);
+
+        GENERAL_SEATMEMORYACTION.setAction(GENERAL_SEATMEMORYACTIONTYPE);
+        GENERAL_SEATMEMORYACTION.setLabel(GENERAL_STRING);
+        GENERAL_SEATMEMORYACTION.setId(GENERAL_INT);
+
+        GENERAL_IMAGERESOLUTION.setResolutionHeight(GENERAL_INT);
+        GENERAL_IMAGERESOLUTION.setResolutionWidth(GENERAL_INT);
+
+        GENERAL_TEMPERATURE.setUnit(GENERAL_TEMPERATUREUNIT);
+        GENERAL_TEMPERATURE.setValue(GENERAL_FLOAT);
+
+        GENERAL_CLIMATECONTROLDATA.setFanSpeed(GENERAL_INT);
+        GENERAL_CLIMATECONTROLDATA.setCurrentTemperature(GENERAL_TEMPERATURE);
+        GENERAL_CLIMATECONTROLDATA.setDesiredTemperature(GENERAL_TEMPERATURE);
+        GENERAL_CLIMATECONTROLDATA.setAcEnable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLDATA.setCirculateAirEnable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLDATA.setAutoModeEnable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLDATA.setDualModeEnable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLDATA.setAcMaxEnable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLDATA.setDefrostZone(GENERAL_DEFROSTZONE);
+        GENERAL_CLIMATECONTROLDATA.setVentilationMode(GENERAL_VENTILATIONMODE);
+
+        GENERAL_SEATCONTROLDATA.setMemory(GENERAL_SEATMEMORYACTION);
+        GENERAL_SEATCONTROLDATA.setMassageCushionFirmness(GENERAL_MASSAGECUSHIONFIRMNESS_LIST);
+        GENERAL_SEATCONTROLDATA.setMassageMode(GENERAL_MASSAGEMODEDATA_LIST);
+        GENERAL_SEATCONTROLDATA.setMassageEnabled(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLDATA.setHeadSupportHorizontalPosition(GENERAL_INT);
+        GENERAL_SEATCONTROLDATA.setHeadSupportVerticalPosition(GENERAL_INT);
+        GENERAL_SEATCONTROLDATA.setBackTiltAngle(GENERAL_INT);
+        GENERAL_SEATCONTROLDATA.setBackVerticalPosition(GENERAL_INT);
+        GENERAL_SEATCONTROLDATA.setFrontVerticalPosition(GENERAL_INT);
+        GENERAL_SEATCONTROLDATA.setVerticalPosition(GENERAL_INT);
+        GENERAL_SEATCONTROLDATA.setHorizontalPosition(GENERAL_INT);
+        GENERAL_SEATCONTROLDATA.setCoolingLevel(GENERAL_INT);
+        GENERAL_SEATCONTROLDATA.setHeatingLevel(GENERAL_INT);
+        GENERAL_SEATCONTROLDATA.setHeatingEnabled(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLDATA.setCoolingEnabled(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLDATA.setId(GENERAL_SUPPORTEDSEAT);
+
+        GENERAL_AUDIOCONTROLDATA.setSource(GENERAL_PRIMARYAUDIOSOURCE);
+        GENERAL_AUDIOCONTROLDATA.setVolume(GENERAL_INT);
+        GENERAL_AUDIOCONTROLDATA.setKeepContext(GENERAL_BOOLEAN);
+        GENERAL_AUDIOCONTROLDATA.setEqualizerSettings(GENERAL_EQUALIZERSETTINGS_LIST);
+
+        GENERAL_HMISETTINGSCONTROLDATA.setDistanceUnit(GENERAL_DISTANCEUNIT);
+        GENERAL_HMISETTINGSCONTROLDATA.setTemperatureUnit(GENERAL_TEMPERATUREUNIT);
+        GENERAL_HMISETTINGSCONTROLDATA.setDisplayMode(GENERAL_DISPLAYMODE);
+
+        GENERAL_DYNAMICUPDATECAPABILITIES.setSupportsDynamicSubMenus(GENERAL_BOOLEAN);
+        GENERAL_DYNAMICUPDATECAPABILITIES.setSupportedDynamicImageFieldNames(Collections.singletonList(GENERAL_IMAGEFIELDNAME));
+
+        GENERAL_LIGHTCONTROLDATA.setLightState(GENERAL_LIGHTSTATE_LIST);
+
+        GENERAL_STATIONIDNUMBER.setCountryCode(GENERAL_INT);
+        GENERAL_STATIONIDNUMBER.setFccFacilityId(GENERAL_INT);
+
+        GENERAL_SISDATA.setStationMessage(GENERAL_STRING);
+        GENERAL_SISDATA.setStationLocation(VehicleDataHelper.GPS);
+
+        GENERAL_SISDATA.setStationLongName(GENERAL_STRING);
+        GENERAL_SISDATA.setStationIDNumber(GENERAL_STATIONIDNUMBER);
+        GENERAL_SISDATA.setStationShortName(GENERAL_STRING);
+
+        GENERAL_RDSDATA.setProgramService(GENERAL_STRING);
+        GENERAL_RDSDATA.setRadioText(GENERAL_STRING);
+        GENERAL_RDSDATA.setClockText(GENERAL_STRING);
+        GENERAL_RDSDATA.setProgramIdentification(GENERAL_STRING);
+        GENERAL_RDSDATA.setRegion(GENERAL_STRING);
+        GENERAL_RDSDATA.setTrafficProgram(GENERAL_BOOLEAN);
+        GENERAL_RDSDATA.setTrafficAnnouncement(GENERAL_BOOLEAN);
+        GENERAL_RDSDATA.setProgramType(GENERAL_INT);
+
+        GENERAL_RADIOCONTROLDATA.setFrequencyInteger(GENERAL_INT);
+        GENERAL_RADIOCONTROLDATA.setFrequencyFraction(GENERAL_INT);
+        GENERAL_RADIOCONTROLDATA.setBand(GENERAL_RADIOBAND);
+        GENERAL_RADIOCONTROLDATA.setRdsData(GENERAL_RDSDATA);
+        GENERAL_RADIOCONTROLDATA.setAvailableHDs(GENERAL_INT);
+        GENERAL_RADIOCONTROLDATA.setHdChannel(GENERAL_INT);
+        GENERAL_RADIOCONTROLDATA.setSignalStrength(GENERAL_INT);
+        GENERAL_RADIOCONTROLDATA.setSignalChangeThreshold(GENERAL_INT);
+        GENERAL_RADIOCONTROLDATA.setRadioEnable(GENERAL_BOOLEAN);
+        GENERAL_RADIOCONTROLDATA.setState(GENERAL_RADIOSTATE);
+
+        GENERAL_MODULEDATA.setModuleType(GENERAL_MODULETYPE);
+        GENERAL_MODULEDATA.setClimateControlData(GENERAL_CLIMATECONTROLDATA);
+
+        GENERAL_CHOICE.setMenuName(GENERAL_STRING);
+        GENERAL_CHOICE.setSecondaryText(GENERAL_STRING);
+        GENERAL_CHOICE.setTertiaryText(GENERAL_STRING);
+        GENERAL_CHOICE.setChoiceID(GENERAL_INT);
+        GENERAL_CHOICE.setImage(GENERAL_IMAGE);
+        GENERAL_CHOICE.setSecondaryImage(GENERAL_IMAGE);
+        GENERAL_CHOICE.setVrCommands(GENERAL_STRING_LIST);
+
+        GENERAL_MASSAGEMODEDATA.setMassageMode(GENERAL_MASSAGEMODE);
+        GENERAL_MASSAGEMODEDATA.setMassageZone(GENERAL_MASSAGEZONE);
+        GENERAL_MASSAGEMODEDATA_LIST.add(GENERAL_MASSAGEMODEDATA);
+
+        GENERAL_MASSAGECUSHIONFIRMNESS.setCushion(GENERAL_MASSAGECUSHION);
+        GENERAL_MASSAGECUSHIONFIRMNESS.setFirmness(GENERAL_INT);
+        GENERAL_MASSAGECUSHIONFIRMNESS_LIST.add(GENERAL_MASSAGECUSHIONFIRMNESS);
+
+        GENERAL_TOUCHCOORD.setX(GENERAL_INT);
+        GENERAL_TOUCHCOORD.setY(GENERAL_INT);
+        GENERAL_TOUCHCOORD_LIST.add(GENERAL_TOUCHCOORD);
+
+        GENERAL_TOUCHEVENT.setId(GENERAL_INT);
+        GENERAL_TOUCHEVENT.setTs(GENERAL_LONG_LIST);
+        GENERAL_TOUCHEVENT.setC(GENERAL_TOUCHCOORD_LIST);
+        GENERAL_TOUCHEVENT_LIST.add(GENERAL_TOUCHEVENT);
+
+        GENERAL_TEXTFIELD.setName(GENERAL_TEXTFIELDNAME);
+        GENERAL_TEXTFIELD.setRows(GENERAL_INT);
+        GENERAL_TEXTFIELD.setWidth(GENERAL_INT);
+        GENERAL_TEXTFIELD.setCharacterSet(GENERAL_CHARACTERSET);
+        GENERAL_TEXTFIELD_LIST.add(GENERAL_TEXTFIELD);
+
+        GENERAL_COORDINATE.setLongitudeDegrees(GENERAL_FLOAT);
+        GENERAL_COORDINATE.setLatitudeDegrees(GENERAL_FLOAT);
+
+        GENERAL_OASISADDRESS.setCountryName(GENERAL_STRING);
+        GENERAL_OASISADDRESS.setThoroughfare(GENERAL_STRING);
+        GENERAL_OASISADDRESS.setSubThoroughfare(GENERAL_STRING);
+        GENERAL_OASISADDRESS.setCountryCode(GENERAL_STRING);
+        GENERAL_OASISADDRESS.setPostalCode(GENERAL_STRING);
+        GENERAL_OASISADDRESS.setLocality(GENERAL_STRING);
+        GENERAL_OASISADDRESS.setSubLocality(GENERAL_STRING);
+        GENERAL_OASISADDRESS.setAdministrativeArea(GENERAL_STRING);
+        GENERAL_OASISADDRESS.setSubAdministrativeArea(GENERAL_STRING);
+
+        GENERAL_LOCATIONDETAILS.setAddressLines(GENERAL_STRING_LIST);
+        GENERAL_LOCATIONDETAILS.setCoordinate(GENERAL_COORDINATE);
+        GENERAL_LOCATIONDETAILS.setLocationDescription(GENERAL_STRING);
+        GENERAL_LOCATIONDETAILS.setLocationImage(GENERAL_IMAGE);
+        GENERAL_LOCATIONDETAILS.setLocationName(GENERAL_STRING);
+        GENERAL_LOCATIONDETAILS.setSearchAddress(GENERAL_OASISADDRESS);
+        GENERAL_LOCATIONDETAILS.setPhoneNumber(GENERAL_STRING);
+
+        GENERAL_FILETYPE_LIST.add(GENERAL_FILETYPE);
+
+        GENERAL_IMAGEFIELD.setImageResolution(GENERAL_IMAGERESOLUTION);
+        GENERAL_IMAGEFIELD.setName(GENERAL_IMAGEFIELDNAME);
+        GENERAL_IMAGEFIELD.setImageTypeSupported(GENERAL_FILETYPE_LIST);
+        GENERAL_IMAGEFIELD_LIST.add(GENERAL_IMAGEFIELD);
+
+        GENERAL_WINDOW_TYPE_CAPABILITIES.setType(GENERAL_WINDOWTYPE);
+        GENERAL_WINDOW_TYPE_CAPABILITIES.setMaximumNumberOfWindows(GENERAL_INT);
+        GENERAL_WINDOW_TYPE_CAPABILITIES_LIST.add(GENERAL_WINDOW_TYPE_CAPABILITIES);
+
+        GENERAL_WINDOW_CAPABILITY.setWindowID(GENERAL_INT);
+        GENERAL_WINDOW_CAPABILITY.setTextFields(GENERAL_TEXTFIELD_LIST);
+        GENERAL_WINDOW_CAPABILITY.setImageFields(GENERAL_IMAGEFIELD_LIST);
+        GENERAL_WINDOW_CAPABILITY.setImageTypeSupported(GENERAL_IMAGE_TYPE_LIST);
+        GENERAL_WINDOW_CAPABILITY.setTemplatesAvailable(GENERAL_STRING_LIST);
+        GENERAL_WINDOW_CAPABILITY.setNumCustomPresetsAvailable(GENERAL_INT);
+        GENERAL_WINDOW_CAPABILITY.setButtonCapabilities(GENERAL_BUTTONCAPABILITIES_LIST);
+        GENERAL_WINDOW_CAPABILITY.setSoftButtonCapabilities(GENERAL_SOFTBUTTONCAPABILITIES_LIST);
+        GENERAL_WINDOW_CAPABILITY_LIST.add(GENERAL_WINDOW_CAPABILITY);
+
+        GENERAL_DISPLAY_CAPABILITY.setDisplayName(GENERAL_STRING);
+        GENERAL_DISPLAY_CAPABILITY.setWindowTypeSupported(GENERAL_WINDOW_TYPE_CAPABILITIES_LIST);
+        GENERAL_DISPLAY_CAPABILITY.setWindowCapabilities(GENERAL_WINDOW_CAPABILITY_LIST);
+        GENERAL_DISPLAYCAPABILITY_LIST.add(GENERAL_DISPLAY_CAPABILITY);
+
+        GENERAL_SCREENPARAMS.setImageResolution(GENERAL_IMAGERESOLUTION);
+        GENERAL_SCREENPARAMS.setTouchEventAvailable(GENERAL_TOUCHEVENTCAPABILITIES);
+
+        GENERAL_MEDIACLOCKFORMAT_LIST.add(MediaClockFormat.CLOCK1);
+        GENERAL_MEDIACLOCKFORMAT_LIST.add(MediaClockFormat.CLOCK2);
+        GENERAL_SEAT_LIST.add(GENERAL_SEAT_LOCATION);
+
+        GENERAL_IMAGE.setValue(GENERAL_STRING);
+        GENERAL_IMAGE.setImageType(GENERAL_IMAGETYPE);
+        GENERAL_IMAGE.setIsTemplate(GENERAL_BOOLEAN);
+
+        GENERAL_TEMPLATE_CONFIGURATION.setTemplate(GENERAL_STRING);
+        GENERAL_TEMPLATE_CONFIGURATION.setDayColorScheme(TestValues.GENERAL_DAYCOLORSCHEME);
+        GENERAL_TEMPLATE_CONFIGURATION.setNightColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME);
+
+        GENERAL_SOFTBUTTON.setIsHighlighted(GENERAL_BOOLEAN);
+        GENERAL_SOFTBUTTON.setSoftButtonID(GENERAL_INT);
+        GENERAL_SOFTBUTTON.setSystemAction(SystemAction.STEAL_FOCUS);
+        GENERAL_SOFTBUTTON.setText(GENERAL_STRING);
+        GENERAL_SOFTBUTTON.setType(SoftButtonType.SBT_TEXT);
+        GENERAL_SOFTBUTTON.setImage(GENERAL_IMAGE);
+        GENERAL_SOFTBUTTON_LIST.add(GENERAL_SOFTBUTTON);
+
+        GENERAL_TURN.setNavigationText(GENERAL_STRING);
+        GENERAL_TURN.setTurnIcon(GENERAL_IMAGE);
+        GENERAL_TURN_LIST.add(GENERAL_TURN);
+
+        GENERAL_MENUPARAMS.setMenuName(GENERAL_STRING);
+        GENERAL_MENUPARAMS.setParentID(GENERAL_INT);
+        GENERAL_MENUPARAMS.setPosition(GENERAL_INT);
+
+        GENERAL_VRHELPITEM.setText(GENERAL_STRING);
+        GENERAL_VRHELPITEM.setImage(GENERAL_IMAGE);
+        GENERAL_VRHELPITEM.setPosition(100);
+        GENERAL_VRHELPITEM_LIST.add(GENERAL_VRHELPITEM);
+
+        GENERAL_TTSCHUNK_LIST.add(new TTSChunk("Welcome to the jungle", SpeechCapabilities.TEXT));
+        GENERAL_TTSCHUNK_LIST.add(new TTSChunk("Say a command", SpeechCapabilities.TEXT));
+
+        GENERAL_KEYBOARDPROPERTIES.setAutoCompleteText(GENERAL_STRING);
+        GENERAL_KEYBOARDPROPERTIES.setKeypressMode(KeypressMode.SINGLE_KEYPRESS);
+        GENERAL_KEYBOARDPROPERTIES.setKeyboardLayout(KeyboardLayout.QWERTY);
+        GENERAL_KEYBOARDPROPERTIES.setLanguage(Language.EN_US);
+        GENERAL_KEYBOARDPROPERTIES.setLimitedCharacterList(TestValues.GENERAL_STRING_LIST);
+
+        GENERAL_STARTTIME.setHours(GENERAL_INT);
+        GENERAL_STARTTIME.setMinutes(GENERAL_INT);
+        GENERAL_STARTTIME.setSeconds(GENERAL_INT);
 
         GENERAL_CHOICE_LIST.add(GENERAL_CHOICE);
 
@@ -825,10 +826,10 @@ public class TestValues {
         GENERAL_GLOBALPROPERTY_LIST.add(GlobalProperty.MENUICON);
 
         for (VehicleDataType data : VehicleDataType.values()) {
-        	VehicleDataResult result = new VehicleDataResult();
+            VehicleDataResult result = new VehicleDataResult();
             result.setResultCode(VehicleDataResultCode.SUCCESS);
             result.setDataType(data);
-        	GENERAL_VEHICLEDATARESULT_LIST.add(result);
+            GENERAL_VEHICLEDATARESULT_LIST.add(result);
         }
 
         GENERAL_OEM_CUSTOM_VEHICLE_DATA.setResultCode(VehicleDataResultCode.SUCCESS);
@@ -896,501 +897,501 @@ public class TestValues {
         GENERAL_PERMISSIONITEM.setRequireEncryption(GENERAL_BOOLEAN);
         GENERAL_PERMISSIONITEM_LIST.add(GENERAL_PERMISSIONITEM);
 
-		GENERAL_SYSTEMCAPABILITY.setSystemCapabilityType(GENERAL_SYSTEMCAPABILITYTYPE);
-
-		GENERAL_NAVIGATIONCAPABILITY.setSendLocationEnabled(GENERAL_BOOLEAN);
-		GENERAL_NAVIGATIONCAPABILITY.setWayPointsEnabled(GENERAL_BOOLEAN);
-
-		GENERAL_PHONECAPABILITY.setDialNumberEnabled(GENERAL_BOOLEAN);
-
-		GENERAL_VIDEOSTREAMINGFORMAT.setProtocol(GENERAL_VIDEOSTREAMINGPROTOCOL);
-		GENERAL_VIDEOSTREAMINGFORMAT.setCodec(GENERAL_VIDEOSTREAMINGCODEC);
-
-		GENERAL_VIDEOSTREAMINGFORMAT_LIST.add(GENERAL_VIDEOSTREAMINGFORMAT);
-		GENERAL_VIDEOSTREAMINGFORMAT_LIST.add(GENERAL_VIDEOSTREAMINGFORMAT);
-
-		GENERAL_VIDEOSTREAMINGCAPABILITY.setMaxBitrate(GENERAL_INT);
-		GENERAL_VIDEOSTREAMINGCAPABILITY.setPreferredResolution(GENERAL_IMAGERESOLUTION);
-		GENERAL_VIDEOSTREAMINGCAPABILITY.setSupportedFormats(GENERAL_VIDEOSTREAMINGFORMAT_LIST);
-		GENERAL_VIDEOSTREAMINGCAPABILITY.setIsHapticSpatialDataSupported(GENERAL_BOOLEAN);
-
-		GENERAL_CLIMATECONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setFanSpeedAvailable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setDesiredTemperatureAvailable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setAcEnableAvailable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setAcMaxEnableAvailable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setCirculateAirEnableAvailable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setAutoModeEnableAvailable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setDualModeEnableAvailable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setDefrostZoneAvailable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setDefrostZone(GENERAL_DEFROSTZONE_LIST);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setVentilationModeAvailable(GENERAL_BOOLEAN);
-		GENERAL_CLIMATECONTROLCAPABILITIES.setVentilationMode(GENERAL_VENTILATIONMODE_LIST);
-		GENERAL_CLIMATECONTROLCAPABILITIES_LIST.add(GENERAL_CLIMATECONTROLCAPABILITIES);
-
-		GENERAL_RADIOCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
-		GENERAL_RADIOCONTROLCAPABILITIES.setRadioEnableAvailable(GENERAL_BOOLEAN);
-		GENERAL_RADIOCONTROLCAPABILITIES.setRadioBandAvailable(GENERAL_BOOLEAN);
-		GENERAL_RADIOCONTROLCAPABILITIES.setRadioFrequencyAvailable(GENERAL_BOOLEAN);
-		GENERAL_RADIOCONTROLCAPABILITIES.setHdChannelAvailable(GENERAL_BOOLEAN);
-		GENERAL_RADIOCONTROLCAPABILITIES.setRdsDataAvailable(GENERAL_BOOLEAN);
-		GENERAL_RADIOCONTROLCAPABILITIES.setAvailableHDsAvailable(GENERAL_BOOLEAN);
-		GENERAL_RADIOCONTROLCAPABILITIES.setStateAvailable(GENERAL_BOOLEAN);
-		GENERAL_RADIOCONTROLCAPABILITIES.setSignalStrengthAvailable(GENERAL_BOOLEAN);
-		GENERAL_RADIOCONTROLCAPABILITIES.setSignalChangeThresholdAvailable(GENERAL_BOOLEAN);
-		GENERAL_RADIOCONTROLCAPABILITIES_LIST.add(GENERAL_RADIOCONTROLCAPABILITIES);
-
-		GENERAL_SEATCONTROLCAPABILITIES.setMemoryAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setMassageCushionFirmnessAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setMassageModeAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setMassageEnabledAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setHeadSupportVerticalPositionAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setHeadSupportHorizontalPositionAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setBackTiltAngleAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setBackVerticalPositionAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setFrontVerticalPositionAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setVerticalPositionAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setHorizontalPositionAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setCoolingLevelAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setHeatingLevelAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setCoolingEnabledAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setHeatingEnabledAvailable(GENERAL_BOOLEAN);
-		GENERAL_SEATCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
-		GENERAL_SEATCONTROLCAPABILITIES_LIST.add(GENERAL_SEATCONTROLCAPABILITIES);
-
-		GENERAL_AUDIOCONTROLCAPABILITIES.setEqualizerMaxChannelId(GENERAL_INT);
-		GENERAL_AUDIOCONTROLCAPABILITIES.setEqualizerAvailable(GENERAL_BOOLEAN);
-		GENERAL_AUDIOCONTROLCAPABILITIES.setVolumeAvailable(GENERAL_BOOLEAN);
-		GENERAL_AUDIOCONTROLCAPABILITIES.setSourceAvailable(GENERAL_BOOLEAN);
-		GENERAL_AUDIOCONTROLCAPABILITIES.setKeepContextAvailable(GENERAL_BOOLEAN);
-		GENERAL_AUDIOCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
-		GENERAL_AUDIOCONTROLCAPABILITIES_LIST.add(GENERAL_AUDIOCONTROLCAPABILITIES);
-
-		GENERAL_HMISETTINGSCONTROLCAPABILITIES.setDisplayModeUnitAvailable(GENERAL_BOOLEAN);
-		GENERAL_HMISETTINGSCONTROLCAPABILITIES.setDistanceUnitAvailable(GENERAL_BOOLEAN);
-		GENERAL_HMISETTINGSCONTROLCAPABILITIES.setTemperatureUnitAvailable(GENERAL_BOOLEAN);
-		GENERAL_HMISETTINGSCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
-
-		GENERAL_LIGHTCONTROLCAPABILITIES.setSupportedLights(GENERAL_LIGHTCAPABILITIES_LIST);
-		GENERAL_LIGHTCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
-
-		GENERAL_EQUALIZERSETTINGS.setChannelSetting(GENERAL_INT);
-		GENERAL_EQUALIZERSETTINGS.setChannelName(GENERAL_STRING);
-		GENERAL_EQUALIZERSETTINGS.setChannelId(GENERAL_INT);
-		GENERAL_EQUALIZERSETTINGS_LIST.add(GENERAL_EQUALIZERSETTINGS);
-
-		GENERAL_LIGHTCAPABILITIES.setName(GENERAL_LIGHTNAME);
-		GENERAL_LIGHTCAPABILITIES.setDensityAvailable(GENERAL_BOOLEAN);
-		GENERAL_LIGHTCAPABILITIES.setRGBColorSpaceAvailable(GENERAL_BOOLEAN);
-		GENERAL_LIGHTCAPABILITIES_LIST.add(GENERAL_LIGHTCAPABILITIES);
-
-		GENERAL_LIGHTSTATE.setId(GENERAL_LIGHTNAME);
-		GENERAL_LIGHTSTATE.setDensity(GENERAL_FLOAT);
-		GENERAL_LIGHTSTATE.setStatus(GENERAL_LIGHTSTATUS);
-		GENERAL_LIGHTSTATE.setColor(GENERAL_RGBCOLOR);
-		GENERAL_LIGHTSTATE_LIST.add(GENERAL_LIGHTSTATE);
-
-		GENERAL_REMOTECONTROLCAPABILITIES.setButtonCapabilities(GENERAL_BUTTONCAPABILITIES_LIST);
-		GENERAL_REMOTECONTROLCAPABILITIES.setClimateControlCapabilities(GENERAL_CLIMATECONTROLCAPABILITIES_LIST);
-		GENERAL_REMOTECONTROLCAPABILITIES.setRadioControlCapabilities(GENERAL_RADIOCONTROLCAPABILITIES_LIST);
-
-		GENERAL_HMICAPABILITIES.setNavigationAvilable(GENERAL_BOOLEAN);
-		GENERAL_HMICAPABILITIES.setVideoStreamingAvailable(GENERAL_BOOLEAN);
-		GENERAL_HMICAPABILITIES.setPhoneCallAvilable(GENERAL_BOOLEAN);
-
-		List<MetadataType> exampleList = new ArrayList<>();
-		exampleList.add(0, MetadataType.CURRENT_TEMPERATURE);
-		exampleList.add(1, MetadataType.MEDIA_ALBUM);
-		exampleList.add(2, MetadataType.MEDIA_ARTIST);
-
-		GENERAL_METADATASTRUCT.setMainField1(exampleList);
-		GENERAL_METADATASTRUCT.setMainField2(exampleList);
-		GENERAL_METADATASTRUCT.setMainField3(exampleList);
-		GENERAL_METADATASTRUCT.setMainField4(exampleList);
-
-		GENERAL_RECTANGLE.setX(GENERAL_FLOAT);
-		GENERAL_RECTANGLE.setY(GENERAL_FLOAT);
-		GENERAL_RECTANGLE.setWidth(GENERAL_FLOAT);
-		GENERAL_RECTANGLE.setHeight(GENERAL_FLOAT);
-
-		GENERAL_HAPTIC_RECT.setId(GENERAL_INTEGER);
-		GENERAL_HAPTIC_RECT.setRect(GENERAL_RECTANGLE);
-
-		GENERAL_RGBCOLOR.setRed(GENERAL_INTEGER);
-		GENERAL_RGBCOLOR.setGreen(GENERAL_INTEGER);
-		GENERAL_RGBCOLOR.setBlue(GENERAL_INTEGER);
-
-		GENERAL_NIGHTCOLORSCHEME.setPrimaryColor(GENERAL_RGBCOLOR);
-		GENERAL_NIGHTCOLORSCHEME.setSecondaryColor(GENERAL_RGBCOLOR);
-		GENERAL_NIGHTCOLORSCHEME.setBackgroundColor(GENERAL_RGBCOLOR);
-
-		GENERAL_DAYCOLORSCHEME.setPrimaryColor(GENERAL_RGBCOLOR);
-		GENERAL_DAYCOLORSCHEME.setSecondaryColor(GENERAL_RGBCOLOR);
-		GENERAL_DAYCOLORSCHEME.setBackgroundColor(GENERAL_RGBCOLOR);
-
-		GENERAL_LOCKSCREENCONFIG.setAppIcon(R.drawable.sdl_lockscreen_icon);
-		GENERAL_LOCKSCREENCONFIG.setBackgroundColor(Color.BLUE);
-		GENERAL_LOCKSCREENCONFIG.setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
-		GENERAL_LOCKSCREENCONFIG.setCustomView(R.layout.activity_sdllock_screen);
-		GENERAL_CLOUDAPPPROPERTIES.setNicknames(GENERAL_STRING_LIST);
-		GENERAL_CLOUDAPPPROPERTIES.setAppID(GENERAL_STRING);
-		GENERAL_CLOUDAPPPROPERTIES.setEnabled(GENERAL_BOOLEAN);
-		GENERAL_CLOUDAPPPROPERTIES.setAuthToken(GENERAL_STRING);
-		GENERAL_CLOUDAPPPROPERTIES.setCloudTransportType(GENERAL_STRING);
-		GENERAL_CLOUDAPPPROPERTIES.setHybridAppPreference(GENERAL_HYBRID_APP_PREFERENCE);
-		GENERAL_CLOUDAPPPROPERTIES.setEndpoint(GENERAL_STRING);
-		GENERAL_WEATHER_SERVICE_MANIFEST.setWeatherForLocationSupported(GENERAL_BOOLEAN);
-		GENERAL_WEATHER_SERVICE_MANIFEST.setCurrentForecastSupported(GENERAL_BOOLEAN);
-		GENERAL_WEATHER_SERVICE_MANIFEST.setMaxMultidayForecastAmount(GENERAL_INTEGER);
-		GENERAL_WEATHER_SERVICE_MANIFEST.setMaxMinutelyForecastAmount(GENERAL_INTEGER);
-		GENERAL_WEATHER_SERVICE_MANIFEST.setMaxHourlyForecastAmount(GENERAL_INTEGER);
-
-		GENERAL_APPSERVICEMANIFEST.setWeatherServiceManifest(GENERAL_WEATHER_SERVICE_MANIFEST);
-		GENERAL_APPSERVICEMANIFEST.setServiceName(GENERAL_STRING);
-		GENERAL_APPSERVICEMANIFEST.setServiceIcon(GENERAL_IMAGE);
-		GENERAL_APPSERVICEMANIFEST.setRpcSpecVersion(GENERAL_SDLMSGVERSION);
-		GENERAL_APPSERVICEMANIFEST.setMediaServiceManifest(GENERAL_MEDIA_SERVICE_MANIFEST);
-		GENERAL_APPSERVICEMANIFEST.setHandledRpcs(GENERAL_FUNCTION_ID_LIST);
-		GENERAL_APPSERVICEMANIFEST.setAllowAppConsumers(GENERAL_BOOLEAN);
-		GENERAL_APPSERVICEMANIFEST.setServiceType(GENERAL_STRING);
-
-		GENERAL_NAVIGATION_SERVICE_MANIFEST.setAcceptsWayPoints(GENERAL_BOOLEAN);
-
-		GENERAL_APPSERVICERECORD.setServiceID(GENERAL_STRING);
-		GENERAL_APPSERVICERECORD.setServiceManifest(GENERAL_APPSERVICEMANIFEST);
-		GENERAL_APPSERVICERECORD.setServiceActive(GENERAL_BOOLEAN);
-		GENERAL_APPSERVICERECORD.setServicePublished(GENERAL_BOOLEAN);
-
-		GENERAL_APP_SERVICE_CAPABILITY.setUpdatedAppServiceRecord(GENERAL_APPSERVICERECORD);
-		GENERAL_APP_SERVICE_CAPABILITY.setUpdateReason(GENERAL_SERVICE_UPDATE_REASON);
-
-		GENERAL_APP_SERVICE_CAPABILITIES.setAppServices(GENERAL_APPSERVICECAPABILITY_LIST);
-
-		GENERAL_DATETIME.setDay(TestValues.GENERAL_INT);
-		GENERAL_DATETIME.setHour(TestValues.GENERAL_INT);
-		GENERAL_DATETIME.setMilliSecond(TestValues.GENERAL_INT);
-		GENERAL_DATETIME.setMinute(TestValues.GENERAL_INT);
-		GENERAL_DATETIME.setMonth(TestValues.GENERAL_INT);
-		GENERAL_DATETIME.setSecond(TestValues.GENERAL_INT);
-		GENERAL_DATETIME.setTzHour(TestValues.GENERAL_INT);
-		GENERAL_DATETIME.setTzMinute(TestValues.GENERAL_INT);
-		GENERAL_DATETIME.setYear(TestValues.GENERAL_INT);
-
-		GENERAL_WEATHERDATA.setCurrentTemperature(GENERAL_TEMPERATURE);
-		GENERAL_WEATHERDATA.setTemperatureHigh(GENERAL_TEMPERATURE);
-		GENERAL_WEATHERDATA.setTemperatureLow(GENERAL_TEMPERATURE);
-		GENERAL_WEATHERDATA.setApparentTemperature(GENERAL_TEMPERATURE);
-		GENERAL_WEATHERDATA.setWeatherSummary(GENERAL_STRING);
-		GENERAL_WEATHERDATA.setTime(GENERAL_DATETIME);
-		GENERAL_WEATHERDATA.setHumidity(GENERAL_FLOAT);
-		GENERAL_WEATHERDATA.setCloudCover(GENERAL_FLOAT);
-		GENERAL_WEATHERDATA.setMoonPhase(GENERAL_FLOAT);
-		GENERAL_WEATHERDATA.setWindBearing(GENERAL_INTEGER);
-		GENERAL_WEATHERDATA.setWindGust(GENERAL_FLOAT);
-		GENERAL_WEATHERDATA.setWindSpeed(GENERAL_FLOAT);
-		GENERAL_WEATHERDATA.setNearestStormBearing(GENERAL_INTEGER);
-		GENERAL_WEATHERDATA.setNearestStormDistance(GENERAL_INTEGER);
-		GENERAL_WEATHERDATA.setPrecipAccumulation(GENERAL_FLOAT);
-		GENERAL_WEATHERDATA.setPrecipIntensity(GENERAL_FLOAT);
-		GENERAL_WEATHERDATA.setPrecipProbability(GENERAL_FLOAT);
-		GENERAL_WEATHERDATA.setPrecipType(GENERAL_STRING);
-		GENERAL_WEATHERDATA.setVisibility(GENERAL_FLOAT);
-		GENERAL_WEATHERDATA.setWeatherIcon(GENERAL_IMAGE);
-
-		GENERAL_WEATHERALERT.setTitle(GENERAL_STRING);
-		GENERAL_WEATHERALERT.setSummary(GENERAL_STRING);
-		GENERAL_WEATHERALERT.setExpires(GENERAL_DATETIME);
-		GENERAL_WEATHERALERT.setRegions(GENERAL_STRING_LIST);
-		GENERAL_WEATHERALERT.setSeverity(GENERAL_STRING);
-		GENERAL_WEATHERALERT.setTimeIssued(GENERAL_DATETIME);
-
-		GENERAL_WEATHERSERVICEDATA.setLocation(GENERAL_LOCATIONDETAILS);
-		GENERAL_WEATHERSERVICEDATA.setCurrentForecast(GENERAL_WEATHERDATA);
-		GENERAL_WEATHERSERVICEDATA.setMinuteForecast(GENERAL_WEATHERDATA_LIST);
-		GENERAL_WEATHERSERVICEDATA.setHourlyForecast(GENERAL_WEATHERDATA_LIST);
-		GENERAL_WEATHERSERVICEDATA.setMultidayForecast(GENERAL_WEATHERDATA_LIST);
-		GENERAL_WEATHERSERVICEDATA.setAlerts(GENERAL_WEATHERALERT_LIST);
-
-		GENERAL_MEDIASERVICEDATA.setMediaType(GENERAL_MEDIATYPE);
-		GENERAL_MEDIASERVICEDATA.setMediaTitle(GENERAL_STRING);
-		GENERAL_MEDIASERVICEDATA.setMediaArtist(GENERAL_STRING);
-		GENERAL_MEDIASERVICEDATA.setMediaAlbum(GENERAL_STRING);
-		GENERAL_MEDIASERVICEDATA.setPlaylistName(GENERAL_STRING);
-		GENERAL_MEDIASERVICEDATA.setIsExplicit(GENERAL_BOOLEAN);
-		GENERAL_MEDIASERVICEDATA.setTrackPlaybackProgress(GENERAL_INTEGER);
-		GENERAL_MEDIASERVICEDATA.setTrackPlaybackDuration(GENERAL_INTEGER);
-		GENERAL_MEDIASERVICEDATA.setQueuePlaybackProgress(GENERAL_INTEGER);
-		GENERAL_MEDIASERVICEDATA.setQueuePlaybackDuration(GENERAL_INTEGER);
-		GENERAL_MEDIASERVICEDATA.setQueueCurrentTrackNumber(GENERAL_INTEGER);
-		GENERAL_MEDIASERVICEDATA.setQueueTotalTrackCount(GENERAL_INTEGER);
-
-		GENERAL_APPSERVICEDATA.setServiceType(GENERAL_STRING);
-		GENERAL_APPSERVICEDATA.setServiceID(GENERAL_STRING);
-		GENERAL_APPSERVICEDATA.setWeatherServiceData(GENERAL_WEATHERSERVICEDATA);
-		GENERAL_APPSERVICEDATA.setMediaServiceData(GENERAL_MEDIASERVICEDATA);
-
-		GENERAL_NAVIGATION_INSTRUCTION.setLocationDetails(GENERAL_LOCATIONDETAILS);
-		GENERAL_NAVIGATION_INSTRUCTION.setAction(GENERAL_NAVIGATIONACTION);
-		GENERAL_NAVIGATION_INSTRUCTION.setEta(GENERAL_DATETIME);
-		GENERAL_NAVIGATION_INSTRUCTION.setBearing(GENERAL_INTEGER);
-		GENERAL_NAVIGATION_INSTRUCTION.setJunctionType(GENERAL_NAVIGATION_JUNCTION);
-		GENERAL_NAVIGATION_INSTRUCTION.setDrivingSide(GENERAL_DIRECTION);
-		GENERAL_NAVIGATION_INSTRUCTION.setDetails(GENERAL_STRING);
-		GENERAL_NAVIGATION_INSTRUCTION.setImage(GENERAL_IMAGE);
-		GENERAL_MODULE_INFO.setModuleId(TestValues.GENERAL_STRING);
-		GENERAL_MODULE_INFO.setModuleLocation(TestValues.GENERAL_GRID);
-		GENERAL_MODULE_INFO.setModuleServiceArea(TestValues.GENERAL_GRID);
-		GENERAL_MODULE_INFO.setMultipleAccessAllowance(TestValues.GENERAL_BOOLEAN);
-
-		GENERAL_GEAR_STATUS.setActualGear(GENERAL_ACTUAL_GEAR);
-		GENERAL_GEAR_STATUS.setTransmissionType(GENERAL_TRANSMISSION_TYPE);
-		GENERAL_GEAR_STATUS.setUserSelectedGear(GENERAL_USER_SELECTED_GEAR);
-
-		GENERAL_WINDOW_STATUS.setLocation(TestValues.GENERAL_GRID);
-		GENERAL_WINDOW_STATUS.setState(TestValues.GENERAL_WINDOW_STATE);
-		GENERAL_STABILITY_CONTROL_STATUS.setEscSystem(GENERAL_ESC_SYSTEM);
-		GENERAL_STABILITY_CONTROL_STATUS.setTrailerSwayControl(GENERAL_S_WAY_CONTROL);
-
-		try {
-			JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_ALLOWED, GENERAL_HMILEVEL_LIST);
-			JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_USER_DISALLOWED, GENERAL_HMILEVEL_LIST);
-
-			JSON_PCMSTREAMCAPABILITIES.put(AudioPassThruCapabilities.KEY_AUDIO_TYPE, GENERAL_AUDIOTYPE);
-			JSON_PCMSTREAMCAPABILITIES.put(AudioPassThruCapabilities.KEY_BITS_PER_SAMPLE, GENERAL_BITSPERSAMPLE);
-			JSON_PCMSTREAMCAPABILITIES.put(AudioPassThruCapabilities.KEY_SAMPLING_RATE, GENERAL_SAMPLINGRATE);
-
-			JSON_TOUCHEVENTCAPABILITIES.put(TouchEventCapabilities.KEY_DOUBLE_PRESS_AVAILABLE, GENERAL_BOOLEAN);
-			JSON_TOUCHEVENTCAPABILITIES.put(TouchEventCapabilities.KEY_MULTI_TOUCH_AVAILABLE, GENERAL_BOOLEAN);
-			JSON_TOUCHEVENTCAPABILITIES.put(TouchEventCapabilities.KEY_PRESS_AVAILABLE, GENERAL_BOOLEAN);
-
-			JSON_IMAGERESOLUTION.put(ImageResolution.KEY_RESOLUTION_HEIGHT, GENERAL_INT);
-			JSON_IMAGERESOLUTION.put(ImageResolution.KEY_RESOLUTION_WIDTH, GENERAL_INT);
-
-			JSON_CHOICE.put(Choice.KEY_MENU_NAME, GENERAL_STRING);
-			JSON_CHOICE.put(Choice.KEY_SECONDARY_TEXT, GENERAL_STRING);
-			JSON_CHOICE.put(Choice.KEY_TERTIARY_TEXT, GENERAL_STRING);
-			JSON_CHOICE.put(Choice.KEY_CHOICE_ID, GENERAL_INT);
-			JSON_CHOICE.put(Choice.KEY_IMAGE, JSON_IMAGE);
-			JSON_CHOICE.put(Choice.KEY_SECONDARY_IMAGE, JSON_IMAGE);
-			JSON_CHOICE.put(Choice.KEY_VR_COMMANDS, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
-
-			JSON_IMAGE_TYPE_SUPPORTED.put(ImageType.DYNAMIC);
-			JSON_IMAGE_TYPE_SUPPORTED.put(ImageType.STATIC);
-
-			JSON_HMILEVELS.put(HMILevel.HMI_FULL);
-			JSON_HMILEVELS.put(HMILevel.HMI_BACKGROUND);
-
-			JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_ALLOWED, JSON_HMILEVELS);
-			JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_USER_DISALLOWED, JSON_HMILEVELS);
-
-			JSON_PARAMETERPERMISSIONS.put(ParameterPermissions.KEY_ALLOWED, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
-			JSON_PARAMETERPERMISSIONS.put(ParameterPermissions.KEY_USER_DISALLOWED, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
-
-			JSON_PERMISSIONITEM.put(PermissionItem.KEY_HMI_PERMISSIONS, JSON_HMIPERMISSIONS);
-			JSON_PERMISSIONITEM.put(PermissionItem.KEY_PARAMETER_PERMISSIONS, JSON_PARAMETERPERMISSIONS);
-			JSON_PERMISSIONITEM.put(PermissionItem.KEY_RPC_NAME, GENERAL_STRING);
-			JSON_PERMISSIONITEM.put(PermissionItem.KEY_REQUIRE_ENCRYPTION, GENERAL_BOOLEAN);
-			JSON_PERMISSIONITEMS.put(JSON_PERMISSIONITEM);
-
-			JSON_IMAGE.put(Image.KEY_IMAGE_TYPE, GENERAL_IMAGETYPE);
-			JSON_IMAGE.put(Image.KEY_VALUE, GENERAL_STRING);
-			JSON_IMAGE.put(Image.KEY_IS_TEMPLATE, GENERAL_BOOLEAN);
-
-			JSON_SOFTBUTTON.put(SoftButton.KEY_IS_HIGHLIGHTED , GENERAL_BOOLEAN);
-			JSON_SOFTBUTTON.put(SoftButton.KEY_SOFT_BUTTON_ID, GENERAL_INT);
-			JSON_SOFTBUTTON.put(SoftButton.KEY_SYSTEM_ACTION, SystemAction.STEAL_FOCUS);
-			JSON_SOFTBUTTON.put(SoftButton.KEY_TEXT, GENERAL_STRING);
-			JSON_SOFTBUTTON.put(SoftButton.KEY_TYPE, SoftButtonType.SBT_TEXT);
-			JSON_SOFTBUTTON.put(SoftButton.KEY_IMAGE, GENERAL_IMAGE.serializeJSON());
-			JSON_SOFTBUTTONS.put(JSON_SOFTBUTTON);
-
-			JSON_TURN.put(Turn.KEY_NAVIGATION_TEXT, GENERAL_STRING);
-			JSON_TURN.put(Turn.KEY_TURN_IMAGE, GENERAL_IMAGE.serializeJSON());
-			JSON_TURNS.put(JSON_TURN);
-
-			JSON_MENUPARAMS.put(MenuParams.KEY_MENU_NAME, GENERAL_STRING);
-			JSON_MENUPARAMS.put(MenuParams.KEY_PARENT_ID, GENERAL_INT);
-			JSON_MENUPARAMS.put(MenuParams.KEY_POSITION, GENERAL_INT);
-
-	    	JSON_VRHELPITEM.put(VrHelpItem.KEY_TEXT, GENERAL_STRING);
-	    	JSON_VRHELPITEM.put(VrHelpItem.KEY_IMAGE, JSON_IMAGE);
-	    	JSON_VRHELPITEM.put(VrHelpItem.KEY_POSITION, GENERAL_INT);
-	    	JSON_VRHELPITEMS.put(JSON_VRHELPITEM);
-
-	    	JSONObject jsonTtsChunk = new JSONObject();
-	    	jsonTtsChunk.put(TTSChunk.KEY_TEXT, "Welcome to the jungle");
-	    	jsonTtsChunk.put(TTSChunk.KEY_TYPE, SpeechCapabilities.TEXT);
-	    	JSON_TTSCHUNKS.put(jsonTtsChunk);
-	    	jsonTtsChunk = new JSONObject();
-	    	jsonTtsChunk.put(TTSChunk.KEY_TEXT, "Say a command");
-	    	jsonTtsChunk.put(TTSChunk.KEY_TYPE, SpeechCapabilities.TEXT);
-	    	JSON_TTSCHUNKS.put(jsonTtsChunk);
-
-	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_AUTO_COMPLETE_TEXT, GENERAL_STRING);
-	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_KEYPRESS_MODE, KeypressMode.SINGLE_KEYPRESS);
-	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_KEYBOARD_LAYOUT, KeyboardLayout.QWERTY);
-	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_LANGUAGE, Language.EN_US);
-	    	JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_LIMITED_CHARACTER_LIST, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
-
-			JSON_STARTTIME.put(StartTime.KEY_HOURS, GENERAL_STARTTIME.getHours());
-			JSON_STARTTIME.put(StartTime.KEY_MINUTES, GENERAL_STARTTIME.getMinutes());
-			JSON_STARTTIME.put(StartTime.KEY_SECONDS, GENERAL_STARTTIME.getSeconds());
-
-			JSON_CHOICES.put(JSON_CHOICE);
-
-			JSON_DEVICEINFO.put(DeviceInfo.KEY_CARRIER, GENERAL_STRING);
-			JSON_DEVICEINFO.put(DeviceInfo.KEY_FIRMWARE_REV, GENERAL_STRING);
-			JSON_DEVICEINFO.put(DeviceInfo.KEY_HARDWARE, GENERAL_STRING);
-			JSON_DEVICEINFO.put(DeviceInfo.KEY_MAX_NUMBER_RFCOMM_PORTS, GENERAL_INT);
-			JSON_DEVICEINFO.put(DeviceInfo.KEY_OS, GENERAL_STRING);
-			JSON_DEVICEINFO.put(DeviceInfo.KEY_OS_VERSION, GENERAL_STRING);
-
-			JSON_RGBCOLOR.put(RGBColor.KEY_RED, GENERAL_INT);
-			JSON_RGBCOLOR.put(RGBColor.KEY_GREEN, GENERAL_INT);
-			JSON_RGBCOLOR.put(RGBColor.KEY_BLUE, GENERAL_INT);
-
-			JSON_DAYCOLORSCHEME.put(TemplateColorScheme.KEY_PRIMARY_COLOR, JSON_RGBCOLOR);
-			JSON_DAYCOLORSCHEME.put(TemplateColorScheme.KEY_SECONDARY_COLOR, JSON_RGBCOLOR);
-			JSON_DAYCOLORSCHEME.put(TemplateColorScheme.KEY_BACKGROUND_COLOR, JSON_RGBCOLOR);
-
-			JSON_NIGHTCOLORSCHEME.put(TemplateColorScheme.KEY_PRIMARY_COLOR, JSON_RGBCOLOR);
-			JSON_NIGHTCOLORSCHEME.put(TemplateColorScheme.KEY_SECONDARY_COLOR, JSON_RGBCOLOR);
-			JSON_NIGHTCOLORSCHEME.put(TemplateColorScheme.KEY_BACKGROUND_COLOR, JSON_RGBCOLOR);
-
-			JSON_SDLMSGVERSION.put(SdlMsgVersion.KEY_MAJOR_VERSION, GENERAL_INT);
-			JSON_SDLMSGVERSION.put(SdlMsgVersion.KEY_MINOR_VERSION, GENERAL_INT);
-
-			JSON_DIDRESULT.put(DIDResult.KEY_DATA, GENERAL_STRING);
-			JSON_DIDRESULT.put(DIDResult.KEY_DID_LOCATION, GENERAL_INT);
-			JSON_DIDRESULT.put(DIDResult.KEY_RESULT_CODE, VehicleDataResultCode.SUCCESS);
-			JSON_DIDRESULTS.put(JSON_DIDRESULT);
-
-			JSON_PRESETBANKCAPABILITIES.put(PresetBankCapabilities.KEY_ON_SCREEN_PRESETS_AVAILABLE, GENERAL_BOOLEAN);
-
-			JSONObject jsonButton = new JSONObject();
-			jsonButton.put(ButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, false);
-			jsonButton.put(ButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, GENERAL_BOOLEAN);
-			jsonButton.put(ButtonCapabilities.KEY_UP_DOWN_AVAILABLE, GENERAL_BOOLEAN);
-			jsonButton.put(ButtonCapabilities.KEY_NAME, ButtonName.SEEKRIGHT);
-			JSON_BUTTONCAPABILITIES.put(jsonButton);
-
-			JSONObject jsonRadioControlCapabilities = new JSONObject();
-			jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_MODULE_NAME, GENERAL_STRING);
-			jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_RADIO_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
-			jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_RADIO_BAND_AVAILABLE, GENERAL_BOOLEAN);
-			jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_RADIO_FREQUENCY_AVAILABLE, GENERAL_BOOLEAN);
-			jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_HD_CHANNEL_AVAILABLE, GENERAL_BOOLEAN);
-			jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_RDS_DATA_AVAILABLE, GENERAL_BOOLEAN);
-			jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_AVAILABLE_HDS_AVAILABLE, GENERAL_BOOLEAN);
-			jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_STATE_AVAILABLE, GENERAL_BOOLEAN);
-			jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_SIGNAL_STRENGTH_AVAILABLE, GENERAL_BOOLEAN);
-			jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_SIGNAL_CHANGE_THRESHOLD_AVAILABLE, GENERAL_BOOLEAN);
-			JSON_RADIOCONTROLCAPABILITIES.put(jsonRadioControlCapabilities);
-
-			JSONObject jsonClimateControlCapabilities = new JSONObject();
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_MODULE_NAME, GENERAL_STRING);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_FAN_SPEED_AVAILABLE, GENERAL_BOOLEAN);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_DESIRED_TEMPERATURE_AVAILABLE, GENERAL_BOOLEAN);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_AC_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_AC_MAX_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_CIRCULATE_AIR_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_AUTO_MODE_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_DUAL_MODE_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_DEFROST_ZONE_AVAILABLE, GENERAL_BOOLEAN);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_DEFROST_ZONE, GENERAL_DEFROSTZONE_LIST);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_VENTILATION_MODE_AVAILABLE, GENERAL_BOOLEAN);
-			jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_VENTILATION_MODE, GENERAL_VENTILATIONMODE_LIST);
-			JSON_CLIMATECONTROLCAPABILITIES.put(jsonClimateControlCapabilities);
-
-			jsonButton = new JSONObject();
-			jsonButton.put(SoftButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, GENERAL_BOOLEAN);
-			jsonButton.put(SoftButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, GENERAL_BOOLEAN);
-			jsonButton.put(SoftButtonCapabilities.KEY_UP_DOWN_AVAILABLE, GENERAL_BOOLEAN);
-			jsonButton.put(SoftButtonCapabilities.KEY_IMAGE_SUPPORTED, GENERAL_BOOLEAN);
-			JSON_SOFTBUTTONCAPABILITIES.put(jsonButton);
-
-			jsonButton = new JSONObject();
-			jsonButton.put(AudioPassThruCapabilities.KEY_AUDIO_TYPE, GENERAL_AUDIOTYPE);
-			jsonButton.put(AudioPassThruCapabilities.KEY_BITS_PER_SAMPLE, GENERAL_BITSPERSAMPLE);
-			jsonButton.put(AudioPassThruCapabilities.KEY_SAMPLING_RATE, GENERAL_SAMPLINGRATE);
-			JSON_AUDIOPASSTHRUCAPABILITIES.put(jsonButton);
-
-			JSON_TEXTFIELD.put(TextField.KEY_CHARACTER_SET, CharacterSet.CID1SET);
-			JSON_TEXTFIELD.put(TextField.KEY_NAME, TextFieldName.ETA);
-			JSON_TEXTFIELD.put(TextField.KEY_ROWS, GENERAL_INT);
-			JSON_TEXTFIELD.put(TextField.KEY_WIDTH, GENERAL_INT);
-			JSON_TEXTFIELDS.put(JSON_TEXTFIELD);
-
-			JSON_IMAGEFIELD.put(ImageField.KEY_IMAGE_RESOLUTION, JSON_IMAGERESOLUTION);
-			JSON_IMAGEFIELD.put(ImageField.KEY_IMAGE_TYPE_SUPPORTED, JsonUtils.createJsonArray(TestValues.GENERAL_FILETYPE_LIST));
-			JSON_IMAGEFIELD.put(ImageField.KEY_NAME, ImageFieldName.graphic);
-			JSON_IMAGEFIELDS.put(JSON_IMAGEFIELD);
-
-			JSON_WINDOW_TYPE_CAPABILITIES.put(WindowTypeCapabilities.KEY_TYPE, GENERAL_WINDOWTYPE);
-			JSON_WINDOW_TYPE_CAPABILITIES.put(WindowTypeCapabilities.KEY_MAXIMUM_NUMBER_OF_WINDOWS, GENERAL_INT);
-			JSON_WINDOW_TYPE_CAPABILITIES_LIST.put(JSON_WINDOW_TYPE_CAPABILITIES);
-
-			JSON_IMAGE_TYPES.put(ImageType.DYNAMIC);
-			JSON_IMAGE_TYPES.put(ImageType.STATIC);
-
-			JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_WINDOW_ID, GENERAL_INT);
-			JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_TEXT_FIELDS, JSON_TEXTFIELDS);
-			JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_IMAGE_FIELDS, JSON_IMAGEFIELDS);
-			JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_IMAGE_TYPE_SUPPORTED, JSON_IMAGE_TYPES);
-			JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_TEMPLATES_AVAILABLE, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
-			JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_NUM_CUSTOM_PRESETS_AVAILABLE, GENERAL_INT);
-			JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_BUTTON_CAPABILITIES, JSON_BUTTONCAPABILITIES);
-			JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_SOFT_BUTTON_CAPABILITIES, JSON_SOFTBUTTONCAPABILITIES);
-			JSON_WINDOW_CAPABILITIES.put(JSON_WINDOW_CAPABILITY);
-
-			JSONObject jsonTEC = new JSONObject();
-			jsonTEC.put(TouchEventCapabilities.KEY_DOUBLE_PRESS_AVAILABLE, GENERAL_BOOLEAN);
-			jsonTEC.put(TouchEventCapabilities.KEY_MULTI_TOUCH_AVAILABLE, GENERAL_BOOLEAN);
-			jsonTEC.put(TouchEventCapabilities.KEY_PRESS_AVAILABLE, GENERAL_BOOLEAN);
-
-			JSON_SCREENPARAMS.put(ScreenParams.KEY_RESOLUTION, JSON_IMAGERESOLUTION);
-			JSON_SCREENPARAMS.put(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE, jsonTEC);
-
-			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_DISPLAY_TYPE, GENERAL_DISPLAYTYPE);
-			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_DISPLAY_NAME, GENERAL_STRING);
-			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_GRAPHIC_SUPPORTED, GENERAL_BOOLEAN);
-			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_IMAGE_FIELDS, JSON_IMAGEFIELDS);
-			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_MEDIA_CLOCK_FORMATS, JsonUtils.createJsonArray(GENERAL_MEDIACLOCKFORMAT_LIST));
-			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_NUM_CUSTOM_PRESETS_AVAILABLE, GENERAL_INT);
-			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_SCREEN_PARAMS, JSON_SCREENPARAMS);
-			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_TEMPLATES_AVAILABLE, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
-			JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_TEXT_FIELDS, JSON_TEXTFIELDS);
-
-			JSON_DISPLAYCAPABILITY.put(DisplayCapability.KEY_DISPLAY_NAME, GENERAL_STRING);
-			JSON_DISPLAYCAPABILITY.put(DisplayCapability.KEY_WINDOW_TYPE_SUPPORTED, JSON_WINDOW_TYPE_CAPABILITIES_LIST);
-			JSON_DISPLAYCAPABILITY.put(DisplayCapability.KEY_WINDOW_CAPABILITIES, JSON_WINDOW_CAPABILITIES);
-			JSON_DISPLAYCAPABILITY_LIST.put(JSON_DISPLAYCAPABILITY);
-
-			JSON_DYNAMICUPDATECAPABILITIES.put(DynamicUpdateCapabilities.KEY_SUPPORTS_DYNAMIC_SUB_MENUS, GENERAL_BOOLEAN);
-			JSON_DYNAMICUPDATECAPABILITIES.put(DynamicUpdateCapabilities.KEY_SUPPORTED_DYNAMIC_IMAGE_FIELD_NAMES, JsonUtils.createJsonArray(Collections.singletonList(GENERAL_IMAGEFIELDNAME)));
-
-			JSON_TOUCHCOORD.put(TouchCoord.KEY_X, GENERAL_INT);
-			JSON_TOUCHCOORD.put(TouchCoord.KEY_Y, GENERAL_INT);
-			JSON_TOUCHCOORDS.put(JSON_TOUCHCOORD);
-
-			JSON_TOUCHEVENT.put(TouchEvent.KEY_C, JSON_TOUCHCOORDS);
-			JSON_TOUCHEVENT.put(TouchEvent.KEY_ID, GENERAL_INT);
-			JSON_TOUCHEVENT.put(TouchEvent.KEY_TS, JsonUtils.createJsonArray(GENERAL_LONG_LIST));
-			JSON_TOUCHEVENTS.put(JSON_TOUCHEVENT);
-
-			JSON_TEXTFIELDTYPES.put(MetadataType.CURRENT_TEMPERATURE);
-			JSON_TEXTFIELDTYPES.put(MetadataType.MEDIA_ALBUM);
-			JSON_TEXTFIELDTYPES.put(MetadataType.MEDIA_ARTIST);
-
-			JSON_SEAT_LOCATIONS.put(JSON_GRID);
-			JSON_MODULE_INFO.put(ModuleInfo.KEY_MODULE_ID, TestValues.GENERAL_STRING);
-			JSON_MODULE_INFO.put(ModuleInfo.KEY_MODULE_LOCATION, TestValues.JSON_GRID);
-			JSON_MODULE_INFO.put(ModuleInfo.KEY_MODULE_SERVICE_AREA, TestValues.JSON_GRID);
-			JSON_MODULE_INFO.put(ModuleInfo.KEY_MULTIPLE_ACCESS_ALLOWED, TestValues.GENERAL_BOOLEAN);
-
-
-		} catch (JSONException e) {
-			Log.e("Test", "Static Json Construction Failed.", e);
-		}
-	}
+        GENERAL_SYSTEMCAPABILITY.setSystemCapabilityType(GENERAL_SYSTEMCAPABILITYTYPE);
+
+        GENERAL_NAVIGATIONCAPABILITY.setSendLocationEnabled(GENERAL_BOOLEAN);
+        GENERAL_NAVIGATIONCAPABILITY.setWayPointsEnabled(GENERAL_BOOLEAN);
+
+        GENERAL_PHONECAPABILITY.setDialNumberEnabled(GENERAL_BOOLEAN);
+
+        GENERAL_VIDEOSTREAMINGFORMAT.setProtocol(GENERAL_VIDEOSTREAMINGPROTOCOL);
+        GENERAL_VIDEOSTREAMINGFORMAT.setCodec(GENERAL_VIDEOSTREAMINGCODEC);
+
+        GENERAL_VIDEOSTREAMINGFORMAT_LIST.add(GENERAL_VIDEOSTREAMINGFORMAT);
+        GENERAL_VIDEOSTREAMINGFORMAT_LIST.add(GENERAL_VIDEOSTREAMINGFORMAT);
+
+        GENERAL_VIDEOSTREAMINGCAPABILITY.setMaxBitrate(GENERAL_INT);
+        GENERAL_VIDEOSTREAMINGCAPABILITY.setPreferredResolution(GENERAL_IMAGERESOLUTION);
+        GENERAL_VIDEOSTREAMINGCAPABILITY.setSupportedFormats(GENERAL_VIDEOSTREAMINGFORMAT_LIST);
+        GENERAL_VIDEOSTREAMINGCAPABILITY.setIsHapticSpatialDataSupported(GENERAL_BOOLEAN);
+
+        GENERAL_CLIMATECONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setFanSpeedAvailable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setDesiredTemperatureAvailable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setAcEnableAvailable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setAcMaxEnableAvailable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setCirculateAirEnableAvailable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setAutoModeEnableAvailable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setDualModeEnableAvailable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setDefrostZoneAvailable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setDefrostZone(GENERAL_DEFROSTZONE_LIST);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setVentilationModeAvailable(GENERAL_BOOLEAN);
+        GENERAL_CLIMATECONTROLCAPABILITIES.setVentilationMode(GENERAL_VENTILATIONMODE_LIST);
+        GENERAL_CLIMATECONTROLCAPABILITIES_LIST.add(GENERAL_CLIMATECONTROLCAPABILITIES);
+
+        GENERAL_RADIOCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
+        GENERAL_RADIOCONTROLCAPABILITIES.setRadioEnableAvailable(GENERAL_BOOLEAN);
+        GENERAL_RADIOCONTROLCAPABILITIES.setRadioBandAvailable(GENERAL_BOOLEAN);
+        GENERAL_RADIOCONTROLCAPABILITIES.setRadioFrequencyAvailable(GENERAL_BOOLEAN);
+        GENERAL_RADIOCONTROLCAPABILITIES.setHdChannelAvailable(GENERAL_BOOLEAN);
+        GENERAL_RADIOCONTROLCAPABILITIES.setRdsDataAvailable(GENERAL_BOOLEAN);
+        GENERAL_RADIOCONTROLCAPABILITIES.setAvailableHDsAvailable(GENERAL_BOOLEAN);
+        GENERAL_RADIOCONTROLCAPABILITIES.setStateAvailable(GENERAL_BOOLEAN);
+        GENERAL_RADIOCONTROLCAPABILITIES.setSignalStrengthAvailable(GENERAL_BOOLEAN);
+        GENERAL_RADIOCONTROLCAPABILITIES.setSignalChangeThresholdAvailable(GENERAL_BOOLEAN);
+        GENERAL_RADIOCONTROLCAPABILITIES_LIST.add(GENERAL_RADIOCONTROLCAPABILITIES);
+
+        GENERAL_SEATCONTROLCAPABILITIES.setMemoryAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setMassageCushionFirmnessAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setMassageModeAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setMassageEnabledAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setHeadSupportVerticalPositionAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setHeadSupportHorizontalPositionAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setBackTiltAngleAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setBackVerticalPositionAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setFrontVerticalPositionAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setVerticalPositionAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setHorizontalPositionAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setCoolingLevelAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setHeatingLevelAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setCoolingEnabledAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setHeatingEnabledAvailable(GENERAL_BOOLEAN);
+        GENERAL_SEATCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
+        GENERAL_SEATCONTROLCAPABILITIES_LIST.add(GENERAL_SEATCONTROLCAPABILITIES);
+
+        GENERAL_AUDIOCONTROLCAPABILITIES.setEqualizerMaxChannelId(GENERAL_INT);
+        GENERAL_AUDIOCONTROLCAPABILITIES.setEqualizerAvailable(GENERAL_BOOLEAN);
+        GENERAL_AUDIOCONTROLCAPABILITIES.setVolumeAvailable(GENERAL_BOOLEAN);
+        GENERAL_AUDIOCONTROLCAPABILITIES.setSourceAvailable(GENERAL_BOOLEAN);
+        GENERAL_AUDIOCONTROLCAPABILITIES.setKeepContextAvailable(GENERAL_BOOLEAN);
+        GENERAL_AUDIOCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
+        GENERAL_AUDIOCONTROLCAPABILITIES_LIST.add(GENERAL_AUDIOCONTROLCAPABILITIES);
+
+        GENERAL_HMISETTINGSCONTROLCAPABILITIES.setDisplayModeUnitAvailable(GENERAL_BOOLEAN);
+        GENERAL_HMISETTINGSCONTROLCAPABILITIES.setDistanceUnitAvailable(GENERAL_BOOLEAN);
+        GENERAL_HMISETTINGSCONTROLCAPABILITIES.setTemperatureUnitAvailable(GENERAL_BOOLEAN);
+        GENERAL_HMISETTINGSCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
+
+        GENERAL_LIGHTCONTROLCAPABILITIES.setSupportedLights(GENERAL_LIGHTCAPABILITIES_LIST);
+        GENERAL_LIGHTCONTROLCAPABILITIES.setModuleName(GENERAL_STRING);
+
+        GENERAL_EQUALIZERSETTINGS.setChannelSetting(GENERAL_INT);
+        GENERAL_EQUALIZERSETTINGS.setChannelName(GENERAL_STRING);
+        GENERAL_EQUALIZERSETTINGS.setChannelId(GENERAL_INT);
+        GENERAL_EQUALIZERSETTINGS_LIST.add(GENERAL_EQUALIZERSETTINGS);
+
+        GENERAL_LIGHTCAPABILITIES.setName(GENERAL_LIGHTNAME);
+        GENERAL_LIGHTCAPABILITIES.setDensityAvailable(GENERAL_BOOLEAN);
+        GENERAL_LIGHTCAPABILITIES.setRGBColorSpaceAvailable(GENERAL_BOOLEAN);
+        GENERAL_LIGHTCAPABILITIES_LIST.add(GENERAL_LIGHTCAPABILITIES);
+
+        GENERAL_LIGHTSTATE.setId(GENERAL_LIGHTNAME);
+        GENERAL_LIGHTSTATE.setDensity(GENERAL_FLOAT);
+        GENERAL_LIGHTSTATE.setStatus(GENERAL_LIGHTSTATUS);
+        GENERAL_LIGHTSTATE.setColor(GENERAL_RGBCOLOR);
+        GENERAL_LIGHTSTATE_LIST.add(GENERAL_LIGHTSTATE);
+
+        GENERAL_REMOTECONTROLCAPABILITIES.setButtonCapabilities(GENERAL_BUTTONCAPABILITIES_LIST);
+        GENERAL_REMOTECONTROLCAPABILITIES.setClimateControlCapabilities(GENERAL_CLIMATECONTROLCAPABILITIES_LIST);
+        GENERAL_REMOTECONTROLCAPABILITIES.setRadioControlCapabilities(GENERAL_RADIOCONTROLCAPABILITIES_LIST);
+
+        GENERAL_HMICAPABILITIES.setNavigationAvilable(GENERAL_BOOLEAN);
+        GENERAL_HMICAPABILITIES.setVideoStreamingAvailable(GENERAL_BOOLEAN);
+        GENERAL_HMICAPABILITIES.setPhoneCallAvilable(GENERAL_BOOLEAN);
+
+        List<MetadataType> exampleList = new ArrayList<>();
+        exampleList.add(0, MetadataType.CURRENT_TEMPERATURE);
+        exampleList.add(1, MetadataType.MEDIA_ALBUM);
+        exampleList.add(2, MetadataType.MEDIA_ARTIST);
+
+        GENERAL_METADATASTRUCT.setMainField1(exampleList);
+        GENERAL_METADATASTRUCT.setMainField2(exampleList);
+        GENERAL_METADATASTRUCT.setMainField3(exampleList);
+        GENERAL_METADATASTRUCT.setMainField4(exampleList);
+
+        GENERAL_RECTANGLE.setX(GENERAL_FLOAT);
+        GENERAL_RECTANGLE.setY(GENERAL_FLOAT);
+        GENERAL_RECTANGLE.setWidth(GENERAL_FLOAT);
+        GENERAL_RECTANGLE.setHeight(GENERAL_FLOAT);
+
+        GENERAL_HAPTIC_RECT.setId(GENERAL_INTEGER);
+        GENERAL_HAPTIC_RECT.setRect(GENERAL_RECTANGLE);
+
+        GENERAL_RGBCOLOR.setRed(GENERAL_INTEGER);
+        GENERAL_RGBCOLOR.setGreen(GENERAL_INTEGER);
+        GENERAL_RGBCOLOR.setBlue(GENERAL_INTEGER);
+
+        GENERAL_NIGHTCOLORSCHEME.setPrimaryColor(GENERAL_RGBCOLOR);
+        GENERAL_NIGHTCOLORSCHEME.setSecondaryColor(GENERAL_RGBCOLOR);
+        GENERAL_NIGHTCOLORSCHEME.setBackgroundColor(GENERAL_RGBCOLOR);
+
+        GENERAL_DAYCOLORSCHEME.setPrimaryColor(GENERAL_RGBCOLOR);
+        GENERAL_DAYCOLORSCHEME.setSecondaryColor(GENERAL_RGBCOLOR);
+        GENERAL_DAYCOLORSCHEME.setBackgroundColor(GENERAL_RGBCOLOR);
+
+        GENERAL_LOCKSCREENCONFIG.setAppIcon(R.drawable.sdl_lockscreen_icon);
+        GENERAL_LOCKSCREENCONFIG.setBackgroundColor(Color.BLUE);
+        GENERAL_LOCKSCREENCONFIG.setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
+        GENERAL_LOCKSCREENCONFIG.setCustomView(R.layout.activity_sdllock_screen);
+        GENERAL_CLOUDAPPPROPERTIES.setNicknames(GENERAL_STRING_LIST);
+        GENERAL_CLOUDAPPPROPERTIES.setAppID(GENERAL_STRING);
+        GENERAL_CLOUDAPPPROPERTIES.setEnabled(GENERAL_BOOLEAN);
+        GENERAL_CLOUDAPPPROPERTIES.setAuthToken(GENERAL_STRING);
+        GENERAL_CLOUDAPPPROPERTIES.setCloudTransportType(GENERAL_STRING);
+        GENERAL_CLOUDAPPPROPERTIES.setHybridAppPreference(GENERAL_HYBRID_APP_PREFERENCE);
+        GENERAL_CLOUDAPPPROPERTIES.setEndpoint(GENERAL_STRING);
+        GENERAL_WEATHER_SERVICE_MANIFEST.setWeatherForLocationSupported(GENERAL_BOOLEAN);
+        GENERAL_WEATHER_SERVICE_MANIFEST.setCurrentForecastSupported(GENERAL_BOOLEAN);
+        GENERAL_WEATHER_SERVICE_MANIFEST.setMaxMultidayForecastAmount(GENERAL_INTEGER);
+        GENERAL_WEATHER_SERVICE_MANIFEST.setMaxMinutelyForecastAmount(GENERAL_INTEGER);
+        GENERAL_WEATHER_SERVICE_MANIFEST.setMaxHourlyForecastAmount(GENERAL_INTEGER);
+
+        GENERAL_APPSERVICEMANIFEST.setWeatherServiceManifest(GENERAL_WEATHER_SERVICE_MANIFEST);
+        GENERAL_APPSERVICEMANIFEST.setServiceName(GENERAL_STRING);
+        GENERAL_APPSERVICEMANIFEST.setServiceIcon(GENERAL_IMAGE);
+        GENERAL_APPSERVICEMANIFEST.setRpcSpecVersion(GENERAL_SDLMSGVERSION);
+        GENERAL_APPSERVICEMANIFEST.setMediaServiceManifest(GENERAL_MEDIA_SERVICE_MANIFEST);
+        GENERAL_APPSERVICEMANIFEST.setHandledRpcs(GENERAL_FUNCTION_ID_LIST);
+        GENERAL_APPSERVICEMANIFEST.setAllowAppConsumers(GENERAL_BOOLEAN);
+        GENERAL_APPSERVICEMANIFEST.setServiceType(GENERAL_STRING);
+
+        GENERAL_NAVIGATION_SERVICE_MANIFEST.setAcceptsWayPoints(GENERAL_BOOLEAN);
+
+        GENERAL_APPSERVICERECORD.setServiceID(GENERAL_STRING);
+        GENERAL_APPSERVICERECORD.setServiceManifest(GENERAL_APPSERVICEMANIFEST);
+        GENERAL_APPSERVICERECORD.setServiceActive(GENERAL_BOOLEAN);
+        GENERAL_APPSERVICERECORD.setServicePublished(GENERAL_BOOLEAN);
+
+        GENERAL_APP_SERVICE_CAPABILITY.setUpdatedAppServiceRecord(GENERAL_APPSERVICERECORD);
+        GENERAL_APP_SERVICE_CAPABILITY.setUpdateReason(GENERAL_SERVICE_UPDATE_REASON);
+
+        GENERAL_APP_SERVICE_CAPABILITIES.setAppServices(GENERAL_APPSERVICECAPABILITY_LIST);
+
+        GENERAL_DATETIME.setDay(TestValues.GENERAL_INT);
+        GENERAL_DATETIME.setHour(TestValues.GENERAL_INT);
+        GENERAL_DATETIME.setMilliSecond(TestValues.GENERAL_INT);
+        GENERAL_DATETIME.setMinute(TestValues.GENERAL_INT);
+        GENERAL_DATETIME.setMonth(TestValues.GENERAL_INT);
+        GENERAL_DATETIME.setSecond(TestValues.GENERAL_INT);
+        GENERAL_DATETIME.setTzHour(TestValues.GENERAL_INT);
+        GENERAL_DATETIME.setTzMinute(TestValues.GENERAL_INT);
+        GENERAL_DATETIME.setYear(TestValues.GENERAL_INT);
+
+        GENERAL_WEATHERDATA.setCurrentTemperature(GENERAL_TEMPERATURE);
+        GENERAL_WEATHERDATA.setTemperatureHigh(GENERAL_TEMPERATURE);
+        GENERAL_WEATHERDATA.setTemperatureLow(GENERAL_TEMPERATURE);
+        GENERAL_WEATHERDATA.setApparentTemperature(GENERAL_TEMPERATURE);
+        GENERAL_WEATHERDATA.setWeatherSummary(GENERAL_STRING);
+        GENERAL_WEATHERDATA.setTime(GENERAL_DATETIME);
+        GENERAL_WEATHERDATA.setHumidity(GENERAL_FLOAT);
+        GENERAL_WEATHERDATA.setCloudCover(GENERAL_FLOAT);
+        GENERAL_WEATHERDATA.setMoonPhase(GENERAL_FLOAT);
+        GENERAL_WEATHERDATA.setWindBearing(GENERAL_INTEGER);
+        GENERAL_WEATHERDATA.setWindGust(GENERAL_FLOAT);
+        GENERAL_WEATHERDATA.setWindSpeed(GENERAL_FLOAT);
+        GENERAL_WEATHERDATA.setNearestStormBearing(GENERAL_INTEGER);
+        GENERAL_WEATHERDATA.setNearestStormDistance(GENERAL_INTEGER);
+        GENERAL_WEATHERDATA.setPrecipAccumulation(GENERAL_FLOAT);
+        GENERAL_WEATHERDATA.setPrecipIntensity(GENERAL_FLOAT);
+        GENERAL_WEATHERDATA.setPrecipProbability(GENERAL_FLOAT);
+        GENERAL_WEATHERDATA.setPrecipType(GENERAL_STRING);
+        GENERAL_WEATHERDATA.setVisibility(GENERAL_FLOAT);
+        GENERAL_WEATHERDATA.setWeatherIcon(GENERAL_IMAGE);
+
+        GENERAL_WEATHERALERT.setTitle(GENERAL_STRING);
+        GENERAL_WEATHERALERT.setSummary(GENERAL_STRING);
+        GENERAL_WEATHERALERT.setExpires(GENERAL_DATETIME);
+        GENERAL_WEATHERALERT.setRegions(GENERAL_STRING_LIST);
+        GENERAL_WEATHERALERT.setSeverity(GENERAL_STRING);
+        GENERAL_WEATHERALERT.setTimeIssued(GENERAL_DATETIME);
+
+        GENERAL_WEATHERSERVICEDATA.setLocation(GENERAL_LOCATIONDETAILS);
+        GENERAL_WEATHERSERVICEDATA.setCurrentForecast(GENERAL_WEATHERDATA);
+        GENERAL_WEATHERSERVICEDATA.setMinuteForecast(GENERAL_WEATHERDATA_LIST);
+        GENERAL_WEATHERSERVICEDATA.setHourlyForecast(GENERAL_WEATHERDATA_LIST);
+        GENERAL_WEATHERSERVICEDATA.setMultidayForecast(GENERAL_WEATHERDATA_LIST);
+        GENERAL_WEATHERSERVICEDATA.setAlerts(GENERAL_WEATHERALERT_LIST);
+
+        GENERAL_MEDIASERVICEDATA.setMediaType(GENERAL_MEDIATYPE);
+        GENERAL_MEDIASERVICEDATA.setMediaTitle(GENERAL_STRING);
+        GENERAL_MEDIASERVICEDATA.setMediaArtist(GENERAL_STRING);
+        GENERAL_MEDIASERVICEDATA.setMediaAlbum(GENERAL_STRING);
+        GENERAL_MEDIASERVICEDATA.setPlaylistName(GENERAL_STRING);
+        GENERAL_MEDIASERVICEDATA.setIsExplicit(GENERAL_BOOLEAN);
+        GENERAL_MEDIASERVICEDATA.setTrackPlaybackProgress(GENERAL_INTEGER);
+        GENERAL_MEDIASERVICEDATA.setTrackPlaybackDuration(GENERAL_INTEGER);
+        GENERAL_MEDIASERVICEDATA.setQueuePlaybackProgress(GENERAL_INTEGER);
+        GENERAL_MEDIASERVICEDATA.setQueuePlaybackDuration(GENERAL_INTEGER);
+        GENERAL_MEDIASERVICEDATA.setQueueCurrentTrackNumber(GENERAL_INTEGER);
+        GENERAL_MEDIASERVICEDATA.setQueueTotalTrackCount(GENERAL_INTEGER);
+
+        GENERAL_APPSERVICEDATA.setServiceType(GENERAL_STRING);
+        GENERAL_APPSERVICEDATA.setServiceID(GENERAL_STRING);
+        GENERAL_APPSERVICEDATA.setWeatherServiceData(GENERAL_WEATHERSERVICEDATA);
+        GENERAL_APPSERVICEDATA.setMediaServiceData(GENERAL_MEDIASERVICEDATA);
+
+        GENERAL_NAVIGATION_INSTRUCTION.setLocationDetails(GENERAL_LOCATIONDETAILS);
+        GENERAL_NAVIGATION_INSTRUCTION.setAction(GENERAL_NAVIGATIONACTION);
+        GENERAL_NAVIGATION_INSTRUCTION.setEta(GENERAL_DATETIME);
+        GENERAL_NAVIGATION_INSTRUCTION.setBearing(GENERAL_INTEGER);
+        GENERAL_NAVIGATION_INSTRUCTION.setJunctionType(GENERAL_NAVIGATION_JUNCTION);
+        GENERAL_NAVIGATION_INSTRUCTION.setDrivingSide(GENERAL_DIRECTION);
+        GENERAL_NAVIGATION_INSTRUCTION.setDetails(GENERAL_STRING);
+        GENERAL_NAVIGATION_INSTRUCTION.setImage(GENERAL_IMAGE);
+        GENERAL_MODULE_INFO.setModuleId(TestValues.GENERAL_STRING);
+        GENERAL_MODULE_INFO.setModuleLocation(TestValues.GENERAL_GRID);
+        GENERAL_MODULE_INFO.setModuleServiceArea(TestValues.GENERAL_GRID);
+        GENERAL_MODULE_INFO.setMultipleAccessAllowance(TestValues.GENERAL_BOOLEAN);
+
+        GENERAL_GEAR_STATUS.setActualGear(GENERAL_ACTUAL_GEAR);
+        GENERAL_GEAR_STATUS.setTransmissionType(GENERAL_TRANSMISSION_TYPE);
+        GENERAL_GEAR_STATUS.setUserSelectedGear(GENERAL_USER_SELECTED_GEAR);
+
+        GENERAL_WINDOW_STATUS.setLocation(TestValues.GENERAL_GRID);
+        GENERAL_WINDOW_STATUS.setState(TestValues.GENERAL_WINDOW_STATE);
+        GENERAL_STABILITY_CONTROL_STATUS.setEscSystem(GENERAL_ESC_SYSTEM);
+        GENERAL_STABILITY_CONTROL_STATUS.setTrailerSwayControl(GENERAL_S_WAY_CONTROL);
+
+        try {
+            JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_ALLOWED, GENERAL_HMILEVEL_LIST);
+            JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_USER_DISALLOWED, GENERAL_HMILEVEL_LIST);
+
+            JSON_PCMSTREAMCAPABILITIES.put(AudioPassThruCapabilities.KEY_AUDIO_TYPE, GENERAL_AUDIOTYPE);
+            JSON_PCMSTREAMCAPABILITIES.put(AudioPassThruCapabilities.KEY_BITS_PER_SAMPLE, GENERAL_BITSPERSAMPLE);
+            JSON_PCMSTREAMCAPABILITIES.put(AudioPassThruCapabilities.KEY_SAMPLING_RATE, GENERAL_SAMPLINGRATE);
+
+            JSON_TOUCHEVENTCAPABILITIES.put(TouchEventCapabilities.KEY_DOUBLE_PRESS_AVAILABLE, GENERAL_BOOLEAN);
+            JSON_TOUCHEVENTCAPABILITIES.put(TouchEventCapabilities.KEY_MULTI_TOUCH_AVAILABLE, GENERAL_BOOLEAN);
+            JSON_TOUCHEVENTCAPABILITIES.put(TouchEventCapabilities.KEY_PRESS_AVAILABLE, GENERAL_BOOLEAN);
+
+            JSON_IMAGERESOLUTION.put(ImageResolution.KEY_RESOLUTION_HEIGHT, GENERAL_INT);
+            JSON_IMAGERESOLUTION.put(ImageResolution.KEY_RESOLUTION_WIDTH, GENERAL_INT);
+
+            JSON_CHOICE.put(Choice.KEY_MENU_NAME, GENERAL_STRING);
+            JSON_CHOICE.put(Choice.KEY_SECONDARY_TEXT, GENERAL_STRING);
+            JSON_CHOICE.put(Choice.KEY_TERTIARY_TEXT, GENERAL_STRING);
+            JSON_CHOICE.put(Choice.KEY_CHOICE_ID, GENERAL_INT);
+            JSON_CHOICE.put(Choice.KEY_IMAGE, JSON_IMAGE);
+            JSON_CHOICE.put(Choice.KEY_SECONDARY_IMAGE, JSON_IMAGE);
+            JSON_CHOICE.put(Choice.KEY_VR_COMMANDS, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
+
+            JSON_IMAGE_TYPE_SUPPORTED.put(ImageType.DYNAMIC);
+            JSON_IMAGE_TYPE_SUPPORTED.put(ImageType.STATIC);
+
+            JSON_HMILEVELS.put(HMILevel.HMI_FULL);
+            JSON_HMILEVELS.put(HMILevel.HMI_BACKGROUND);
+
+            JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_ALLOWED, JSON_HMILEVELS);
+            JSON_HMIPERMISSIONS.put(HMIPermissions.KEY_USER_DISALLOWED, JSON_HMILEVELS);
+
+            JSON_PARAMETERPERMISSIONS.put(ParameterPermissions.KEY_ALLOWED, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
+            JSON_PARAMETERPERMISSIONS.put(ParameterPermissions.KEY_USER_DISALLOWED, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
+
+            JSON_PERMISSIONITEM.put(PermissionItem.KEY_HMI_PERMISSIONS, JSON_HMIPERMISSIONS);
+            JSON_PERMISSIONITEM.put(PermissionItem.KEY_PARAMETER_PERMISSIONS, JSON_PARAMETERPERMISSIONS);
+            JSON_PERMISSIONITEM.put(PermissionItem.KEY_RPC_NAME, GENERAL_STRING);
+            JSON_PERMISSIONITEM.put(PermissionItem.KEY_REQUIRE_ENCRYPTION, GENERAL_BOOLEAN);
+            JSON_PERMISSIONITEMS.put(JSON_PERMISSIONITEM);
+
+            JSON_IMAGE.put(Image.KEY_IMAGE_TYPE, GENERAL_IMAGETYPE);
+            JSON_IMAGE.put(Image.KEY_VALUE, GENERAL_STRING);
+            JSON_IMAGE.put(Image.KEY_IS_TEMPLATE, GENERAL_BOOLEAN);
+
+            JSON_SOFTBUTTON.put(SoftButton.KEY_IS_HIGHLIGHTED, GENERAL_BOOLEAN);
+            JSON_SOFTBUTTON.put(SoftButton.KEY_SOFT_BUTTON_ID, GENERAL_INT);
+            JSON_SOFTBUTTON.put(SoftButton.KEY_SYSTEM_ACTION, SystemAction.STEAL_FOCUS);
+            JSON_SOFTBUTTON.put(SoftButton.KEY_TEXT, GENERAL_STRING);
+            JSON_SOFTBUTTON.put(SoftButton.KEY_TYPE, SoftButtonType.SBT_TEXT);
+            JSON_SOFTBUTTON.put(SoftButton.KEY_IMAGE, GENERAL_IMAGE.serializeJSON());
+            JSON_SOFTBUTTONS.put(JSON_SOFTBUTTON);
+
+            JSON_TURN.put(Turn.KEY_NAVIGATION_TEXT, GENERAL_STRING);
+            JSON_TURN.put(Turn.KEY_TURN_IMAGE, GENERAL_IMAGE.serializeJSON());
+            JSON_TURNS.put(JSON_TURN);
+
+            JSON_MENUPARAMS.put(MenuParams.KEY_MENU_NAME, GENERAL_STRING);
+            JSON_MENUPARAMS.put(MenuParams.KEY_PARENT_ID, GENERAL_INT);
+            JSON_MENUPARAMS.put(MenuParams.KEY_POSITION, GENERAL_INT);
+
+            JSON_VRHELPITEM.put(VrHelpItem.KEY_TEXT, GENERAL_STRING);
+            JSON_VRHELPITEM.put(VrHelpItem.KEY_IMAGE, JSON_IMAGE);
+            JSON_VRHELPITEM.put(VrHelpItem.KEY_POSITION, GENERAL_INT);
+            JSON_VRHELPITEMS.put(JSON_VRHELPITEM);
+
+            JSONObject jsonTtsChunk = new JSONObject();
+            jsonTtsChunk.put(TTSChunk.KEY_TEXT, "Welcome to the jungle");
+            jsonTtsChunk.put(TTSChunk.KEY_TYPE, SpeechCapabilities.TEXT);
+            JSON_TTSCHUNKS.put(jsonTtsChunk);
+            jsonTtsChunk = new JSONObject();
+            jsonTtsChunk.put(TTSChunk.KEY_TEXT, "Say a command");
+            jsonTtsChunk.put(TTSChunk.KEY_TYPE, SpeechCapabilities.TEXT);
+            JSON_TTSCHUNKS.put(jsonTtsChunk);
+
+            JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_AUTO_COMPLETE_TEXT, GENERAL_STRING);
+            JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_KEYPRESS_MODE, KeypressMode.SINGLE_KEYPRESS);
+            JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_KEYBOARD_LAYOUT, KeyboardLayout.QWERTY);
+            JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_LANGUAGE, Language.EN_US);
+            JSON_KEYBOARDPROPERTIES.put(KeyboardProperties.KEY_LIMITED_CHARACTER_LIST, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
+
+            JSON_STARTTIME.put(StartTime.KEY_HOURS, GENERAL_STARTTIME.getHours());
+            JSON_STARTTIME.put(StartTime.KEY_MINUTES, GENERAL_STARTTIME.getMinutes());
+            JSON_STARTTIME.put(StartTime.KEY_SECONDS, GENERAL_STARTTIME.getSeconds());
+
+            JSON_CHOICES.put(JSON_CHOICE);
+
+            JSON_DEVICEINFO.put(DeviceInfo.KEY_CARRIER, GENERAL_STRING);
+            JSON_DEVICEINFO.put(DeviceInfo.KEY_FIRMWARE_REV, GENERAL_STRING);
+            JSON_DEVICEINFO.put(DeviceInfo.KEY_HARDWARE, GENERAL_STRING);
+            JSON_DEVICEINFO.put(DeviceInfo.KEY_MAX_NUMBER_RFCOMM_PORTS, GENERAL_INT);
+            JSON_DEVICEINFO.put(DeviceInfo.KEY_OS, GENERAL_STRING);
+            JSON_DEVICEINFO.put(DeviceInfo.KEY_OS_VERSION, GENERAL_STRING);
+
+            JSON_RGBCOLOR.put(RGBColor.KEY_RED, GENERAL_INT);
+            JSON_RGBCOLOR.put(RGBColor.KEY_GREEN, GENERAL_INT);
+            JSON_RGBCOLOR.put(RGBColor.KEY_BLUE, GENERAL_INT);
+
+            JSON_DAYCOLORSCHEME.put(TemplateColorScheme.KEY_PRIMARY_COLOR, JSON_RGBCOLOR);
+            JSON_DAYCOLORSCHEME.put(TemplateColorScheme.KEY_SECONDARY_COLOR, JSON_RGBCOLOR);
+            JSON_DAYCOLORSCHEME.put(TemplateColorScheme.KEY_BACKGROUND_COLOR, JSON_RGBCOLOR);
+
+            JSON_NIGHTCOLORSCHEME.put(TemplateColorScheme.KEY_PRIMARY_COLOR, JSON_RGBCOLOR);
+            JSON_NIGHTCOLORSCHEME.put(TemplateColorScheme.KEY_SECONDARY_COLOR, JSON_RGBCOLOR);
+            JSON_NIGHTCOLORSCHEME.put(TemplateColorScheme.KEY_BACKGROUND_COLOR, JSON_RGBCOLOR);
+
+            JSON_SDLMSGVERSION.put(SdlMsgVersion.KEY_MAJOR_VERSION, GENERAL_INT);
+            JSON_SDLMSGVERSION.put(SdlMsgVersion.KEY_MINOR_VERSION, GENERAL_INT);
+
+            JSON_DIDRESULT.put(DIDResult.KEY_DATA, GENERAL_STRING);
+            JSON_DIDRESULT.put(DIDResult.KEY_DID_LOCATION, GENERAL_INT);
+            JSON_DIDRESULT.put(DIDResult.KEY_RESULT_CODE, VehicleDataResultCode.SUCCESS);
+            JSON_DIDRESULTS.put(JSON_DIDRESULT);
+
+            JSON_PRESETBANKCAPABILITIES.put(PresetBankCapabilities.KEY_ON_SCREEN_PRESETS_AVAILABLE, GENERAL_BOOLEAN);
+
+            JSONObject jsonButton = new JSONObject();
+            jsonButton.put(ButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, false);
+            jsonButton.put(ButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, GENERAL_BOOLEAN);
+            jsonButton.put(ButtonCapabilities.KEY_UP_DOWN_AVAILABLE, GENERAL_BOOLEAN);
+            jsonButton.put(ButtonCapabilities.KEY_NAME, ButtonName.SEEKRIGHT);
+            JSON_BUTTONCAPABILITIES.put(jsonButton);
+
+            JSONObject jsonRadioControlCapabilities = new JSONObject();
+            jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_MODULE_NAME, GENERAL_STRING);
+            jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_RADIO_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
+            jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_RADIO_BAND_AVAILABLE, GENERAL_BOOLEAN);
+            jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_RADIO_FREQUENCY_AVAILABLE, GENERAL_BOOLEAN);
+            jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_HD_CHANNEL_AVAILABLE, GENERAL_BOOLEAN);
+            jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_RDS_DATA_AVAILABLE, GENERAL_BOOLEAN);
+            jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_AVAILABLE_HDS_AVAILABLE, GENERAL_BOOLEAN);
+            jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_STATE_AVAILABLE, GENERAL_BOOLEAN);
+            jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_SIGNAL_STRENGTH_AVAILABLE, GENERAL_BOOLEAN);
+            jsonRadioControlCapabilities.put(RadioControlCapabilities.KEY_SIGNAL_CHANGE_THRESHOLD_AVAILABLE, GENERAL_BOOLEAN);
+            JSON_RADIOCONTROLCAPABILITIES.put(jsonRadioControlCapabilities);
+
+            JSONObject jsonClimateControlCapabilities = new JSONObject();
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_MODULE_NAME, GENERAL_STRING);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_FAN_SPEED_AVAILABLE, GENERAL_BOOLEAN);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_DESIRED_TEMPERATURE_AVAILABLE, GENERAL_BOOLEAN);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_AC_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_AC_MAX_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_CIRCULATE_AIR_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_AUTO_MODE_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_DUAL_MODE_ENABLE_AVAILABLE, GENERAL_BOOLEAN);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_DEFROST_ZONE_AVAILABLE, GENERAL_BOOLEAN);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_DEFROST_ZONE, GENERAL_DEFROSTZONE_LIST);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_VENTILATION_MODE_AVAILABLE, GENERAL_BOOLEAN);
+            jsonClimateControlCapabilities.put(ClimateControlCapabilities.KEY_VENTILATION_MODE, GENERAL_VENTILATIONMODE_LIST);
+            JSON_CLIMATECONTROLCAPABILITIES.put(jsonClimateControlCapabilities);
+
+            jsonButton = new JSONObject();
+            jsonButton.put(SoftButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, GENERAL_BOOLEAN);
+            jsonButton.put(SoftButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, GENERAL_BOOLEAN);
+            jsonButton.put(SoftButtonCapabilities.KEY_UP_DOWN_AVAILABLE, GENERAL_BOOLEAN);
+            jsonButton.put(SoftButtonCapabilities.KEY_IMAGE_SUPPORTED, GENERAL_BOOLEAN);
+            JSON_SOFTBUTTONCAPABILITIES.put(jsonButton);
+
+            jsonButton = new JSONObject();
+            jsonButton.put(AudioPassThruCapabilities.KEY_AUDIO_TYPE, GENERAL_AUDIOTYPE);
+            jsonButton.put(AudioPassThruCapabilities.KEY_BITS_PER_SAMPLE, GENERAL_BITSPERSAMPLE);
+            jsonButton.put(AudioPassThruCapabilities.KEY_SAMPLING_RATE, GENERAL_SAMPLINGRATE);
+            JSON_AUDIOPASSTHRUCAPABILITIES.put(jsonButton);
+
+            JSON_TEXTFIELD.put(TextField.KEY_CHARACTER_SET, CharacterSet.CID1SET);
+            JSON_TEXTFIELD.put(TextField.KEY_NAME, TextFieldName.ETA);
+            JSON_TEXTFIELD.put(TextField.KEY_ROWS, GENERAL_INT);
+            JSON_TEXTFIELD.put(TextField.KEY_WIDTH, GENERAL_INT);
+            JSON_TEXTFIELDS.put(JSON_TEXTFIELD);
+
+            JSON_IMAGEFIELD.put(ImageField.KEY_IMAGE_RESOLUTION, JSON_IMAGERESOLUTION);
+            JSON_IMAGEFIELD.put(ImageField.KEY_IMAGE_TYPE_SUPPORTED, JsonUtils.createJsonArray(TestValues.GENERAL_FILETYPE_LIST));
+            JSON_IMAGEFIELD.put(ImageField.KEY_NAME, ImageFieldName.graphic);
+            JSON_IMAGEFIELDS.put(JSON_IMAGEFIELD);
+
+            JSON_WINDOW_TYPE_CAPABILITIES.put(WindowTypeCapabilities.KEY_TYPE, GENERAL_WINDOWTYPE);
+            JSON_WINDOW_TYPE_CAPABILITIES.put(WindowTypeCapabilities.KEY_MAXIMUM_NUMBER_OF_WINDOWS, GENERAL_INT);
+            JSON_WINDOW_TYPE_CAPABILITIES_LIST.put(JSON_WINDOW_TYPE_CAPABILITIES);
+
+            JSON_IMAGE_TYPES.put(ImageType.DYNAMIC);
+            JSON_IMAGE_TYPES.put(ImageType.STATIC);
+
+            JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_WINDOW_ID, GENERAL_INT);
+            JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_TEXT_FIELDS, JSON_TEXTFIELDS);
+            JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_IMAGE_FIELDS, JSON_IMAGEFIELDS);
+            JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_IMAGE_TYPE_SUPPORTED, JSON_IMAGE_TYPES);
+            JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_TEMPLATES_AVAILABLE, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
+            JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_NUM_CUSTOM_PRESETS_AVAILABLE, GENERAL_INT);
+            JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_BUTTON_CAPABILITIES, JSON_BUTTONCAPABILITIES);
+            JSON_WINDOW_CAPABILITY.put(WindowCapability.KEY_SOFT_BUTTON_CAPABILITIES, JSON_SOFTBUTTONCAPABILITIES);
+            JSON_WINDOW_CAPABILITIES.put(JSON_WINDOW_CAPABILITY);
+
+            JSONObject jsonTEC = new JSONObject();
+            jsonTEC.put(TouchEventCapabilities.KEY_DOUBLE_PRESS_AVAILABLE, GENERAL_BOOLEAN);
+            jsonTEC.put(TouchEventCapabilities.KEY_MULTI_TOUCH_AVAILABLE, GENERAL_BOOLEAN);
+            jsonTEC.put(TouchEventCapabilities.KEY_PRESS_AVAILABLE, GENERAL_BOOLEAN);
+
+            JSON_SCREENPARAMS.put(ScreenParams.KEY_RESOLUTION, JSON_IMAGERESOLUTION);
+            JSON_SCREENPARAMS.put(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE, jsonTEC);
+
+            JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_DISPLAY_TYPE, GENERAL_DISPLAYTYPE);
+            JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_DISPLAY_NAME, GENERAL_STRING);
+            JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_GRAPHIC_SUPPORTED, GENERAL_BOOLEAN);
+            JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_IMAGE_FIELDS, JSON_IMAGEFIELDS);
+            JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_MEDIA_CLOCK_FORMATS, JsonUtils.createJsonArray(GENERAL_MEDIACLOCKFORMAT_LIST));
+            JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_NUM_CUSTOM_PRESETS_AVAILABLE, GENERAL_INT);
+            JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_SCREEN_PARAMS, JSON_SCREENPARAMS);
+            JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_TEMPLATES_AVAILABLE, JsonUtils.createJsonArray(GENERAL_STRING_LIST));
+            JSON_DISPLAYCAPABILITIES.put(DisplayCapabilities.KEY_TEXT_FIELDS, JSON_TEXTFIELDS);
+
+            JSON_DISPLAYCAPABILITY.put(DisplayCapability.KEY_DISPLAY_NAME, GENERAL_STRING);
+            JSON_DISPLAYCAPABILITY.put(DisplayCapability.KEY_WINDOW_TYPE_SUPPORTED, JSON_WINDOW_TYPE_CAPABILITIES_LIST);
+            JSON_DISPLAYCAPABILITY.put(DisplayCapability.KEY_WINDOW_CAPABILITIES, JSON_WINDOW_CAPABILITIES);
+            JSON_DISPLAYCAPABILITY_LIST.put(JSON_DISPLAYCAPABILITY);
+
+            JSON_DYNAMICUPDATECAPABILITIES.put(DynamicUpdateCapabilities.KEY_SUPPORTS_DYNAMIC_SUB_MENUS, GENERAL_BOOLEAN);
+            JSON_DYNAMICUPDATECAPABILITIES.put(DynamicUpdateCapabilities.KEY_SUPPORTED_DYNAMIC_IMAGE_FIELD_NAMES, JsonUtils.createJsonArray(Collections.singletonList(GENERAL_IMAGEFIELDNAME)));
+
+            JSON_TOUCHCOORD.put(TouchCoord.KEY_X, GENERAL_INT);
+            JSON_TOUCHCOORD.put(TouchCoord.KEY_Y, GENERAL_INT);
+            JSON_TOUCHCOORDS.put(JSON_TOUCHCOORD);
+
+            JSON_TOUCHEVENT.put(TouchEvent.KEY_C, JSON_TOUCHCOORDS);
+            JSON_TOUCHEVENT.put(TouchEvent.KEY_ID, GENERAL_INT);
+            JSON_TOUCHEVENT.put(TouchEvent.KEY_TS, JsonUtils.createJsonArray(GENERAL_LONG_LIST));
+            JSON_TOUCHEVENTS.put(JSON_TOUCHEVENT);
+
+            JSON_TEXTFIELDTYPES.put(MetadataType.CURRENT_TEMPERATURE);
+            JSON_TEXTFIELDTYPES.put(MetadataType.MEDIA_ALBUM);
+            JSON_TEXTFIELDTYPES.put(MetadataType.MEDIA_ARTIST);
+
+            JSON_SEAT_LOCATIONS.put(JSON_GRID);
+            JSON_MODULE_INFO.put(ModuleInfo.KEY_MODULE_ID, TestValues.GENERAL_STRING);
+            JSON_MODULE_INFO.put(ModuleInfo.KEY_MODULE_LOCATION, TestValues.JSON_GRID);
+            JSON_MODULE_INFO.put(ModuleInfo.KEY_MODULE_SERVICE_AREA, TestValues.JSON_GRID);
+            JSON_MODULE_INFO.put(ModuleInfo.KEY_MULTIPLE_ACCESS_ALLOWED, TestValues.GENERAL_BOOLEAN);
+
+
+        } catch (JSONException e) {
+            Log.e("Test", "Static Json Construction Failed.", e);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
index da99ac3fd..724be920b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
@@ -15,153 +15,155 @@ import com.smartdevicelink.proxy.rpc.enums.PrerecordedSpeech;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.TransmissionType;
 import com.smartdevicelink.proxy.rpc.enums.VentilationMode;
+import com.smartdevicelink.util.CompareUtils;
 
 import java.util.Iterator;
 import java.util.List;
 
-public class Validator{
+public class Validator {
 
     // TODO: This class could be (mostly) eliminated if all RPC classes implement their own .equals() and .hashCode() methods.
-	// Some special methods do exist for pseudo-enums (FrameType, SessionType, FrameData, FrameDataControlFrame)
-	
-    private Validator(){}
+    // Some special methods do exist for pseudo-enums (FrameType, SessionType, FrameData, FrameDataControlFrame)
 
-    public static boolean validateMenuParams(MenuParams menuParams1, MenuParams menuParams2){
-        if(menuParams1 == null){
-            return ( menuParams2 == null );
+    private Validator() {
+    }
+
+    public static boolean validateMenuParams(MenuParams menuParams1, MenuParams menuParams2) {
+        if (menuParams1 == null) {
+            return (menuParams2 == null);
         }
-        if(menuParams2 == null){
-            return ( menuParams1 == null );
+        if (menuParams2 == null) {
+            return (menuParams1 == null);
         }
 
-        return ( menuParams1.getMenuName().equals(menuParams2.getMenuName())
+        return (menuParams1.getMenuName().equals(menuParams2.getMenuName())
                 && menuParams1.getParentID() == menuParams2.getParentID() && menuParams1.getPosition() == menuParams2
-                .getPosition() );
+                .getPosition());
     }
-    
-    public static boolean validateVehicleDataResult(VehicleDataResult result1, VehicleDataResult result2){
-        if(result1 == null){
-            return ( result2 == null );
+
+    public static boolean validateVehicleDataResult(VehicleDataResult result1, VehicleDataResult result2) {
+        if (result1 == null) {
+            return (result2 == null);
         }
-        if(result2 == null){
-            return ( result1 == null );
+        if (result2 == null) {
+            return (result1 == null);
         }
 
-        if(result1.getDataType() != null && result2.getDataType() != null){
-            return ( result1.getDataType().equals(result2.getDataType())
-                    && result1.getResultCode().equals(result2.getResultCode()) );
+        if (result1.getDataType() != null && result2.getDataType() != null) {
+            return (result1.getDataType().equals(result2.getDataType())
+                    && result1.getResultCode().equals(result2.getResultCode()));
         } else {
-            return ( result1.getOEMCustomVehicleDataType().equals(result2.getOEMCustomVehicleDataType())
-                    && result1.getResultCode().equals(result2.getResultCode()) );
-        }
-    }
-
-    public static boolean validateBulkData(byte[] array1, byte[] array2){
-        if(array1 == null){
-            return ( array2 == null );
-        }
-        if(array2 == null){
-            return ( array1 == null );
-        }
-
-        if(array1.length != array2.length){
-            return false;
-        }
-
-        for(int i = 0; i < array1.length; i++){
-            if(array1[i] != array2[i]){
-                return false;
-            }
-        }
-
-        return true;
-    }
-    
-    public static boolean validateFrameTypeArray (FrameType[] array1, FrameType[] array2) {
-    	
-    	if (array1 == null) {
-    		return (array2 == null);
-    	}
-    	
-    	if (array2 == null) {
-    		return (array1 == null);
-    	}
-    	
-    	if (array1.length != array2.length) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < array1.length; i++) {
-    		if (array1[i] != array2[i]) {
-    			return false;
-    		}
-    	}
-    	
-    	return true;
-    }
-    
-    public static boolean validateSessionTypeArray (SessionType[] array1, SessionType[] array2) {
-    	
-    	if (array1 == null) {
-    		return (array2 == null);
-    	}
-    	
-    	if (array2 == null) {
-    		return (array1 == null);
-    	}
-    	
-    	if (array1.length != array2.length) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < array1.length; i++) {
-    		if (array1[i] != array2[i]) {
-    			return false;
-    		}
-    	}
-    	
-    	return true;
-    }
-    
-    public static boolean validateFrameDataControlFrameTypeArray (FrameDataControlFrameType[] array1, FrameDataControlFrameType[] array2) {
-    	
-    	if (array1 == null) {
-    		return (array2 == null);
-    	}
-    	
-    	if (array2 == null) {
-    		return (array1 == null);
-    	}
-    	
-    	if (array1.length != array2.length) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < array1.length; i++) {
-    		if (array1[i] != array2[i]) {
-    			return false;
-    		}
-    	}
-    	
-    	return true;
-    }
-
-
-    public static boolean validateImage(Image image1, Image image2){
-        if(image1 == null){
-            return ( image2 == null );
-        }
-        if(image2 == null){
-            return ( image1 == null );
-        }
-
-        if(!( image1.getValue().equals(image2.getValue()) )){
+            return (result1.getOEMCustomVehicleDataType().equals(result2.getOEMCustomVehicleDataType())
+                    && result1.getResultCode().equals(result2.getResultCode()));
+        }
+    }
+
+    public static boolean validateBulkData(byte[] array1, byte[] array2) {
+        if (array1 == null) {
+            return (array2 == null);
+        }
+        if (array2 == null) {
+            return (array1 == null);
+        }
+
+        if (array1.length != array2.length) {
+            return false;
+        }
+
+        for (int i = 0; i < array1.length; i++) {
+            if (array1[i] != array2[i]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateFrameTypeArray(FrameType[] array1, FrameType[] array2) {
+
+        if (array1 == null) {
+            return (array2 == null);
+        }
+
+        if (array2 == null) {
+            return (array1 == null);
+        }
+
+        if (array1.length != array2.length) {
+            return false;
+        }
+
+        for (int i = 0; i < array1.length; i++) {
+            if (array1[i] != array2[i]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateSessionTypeArray(SessionType[] array1, SessionType[] array2) {
+
+        if (array1 == null) {
+            return (array2 == null);
+        }
+
+        if (array2 == null) {
+            return (array1 == null);
+        }
+
+        if (array1.length != array2.length) {
+            return false;
+        }
+
+        for (int i = 0; i < array1.length; i++) {
+            if (array1[i] != array2[i]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateFrameDataControlFrameTypeArray(FrameDataControlFrameType[] array1, FrameDataControlFrameType[] array2) {
+
+        if (array1 == null) {
+            return (array2 == null);
+        }
+
+        if (array2 == null) {
+            return (array1 == null);
+        }
+
+        if (array1.length != array2.length) {
+            return false;
+        }
+
+        for (int i = 0; i < array1.length; i++) {
+            if (array1[i] != array2[i]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+
+    public static boolean validateImage(Image image1, Image image2) {
+        if (image1 == null) {
+            return (image2 == null);
+        }
+        if (image2 == null) {
+            return (image1 == null);
+        }
+
+        if (!(image1.getValue().equals(image2.getValue()))) {
             log("validateImage",
                     "image1 name \"" + image1.getValue() + "\" didn't match image2 name \"" + image2.getValue() + "\".");
             return false;
         }
 
-        if(image1.getImageType() != image2.getImageType()){
+        if (image1.getImageType() != image2.getImageType()) {
             log("validateImage",
                     "image1 type \"" + image1.getImageType() + "\" didn't match image2 type \"" + image2.getImageType()
                             + "\".");
@@ -171,33 +173,33 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateSdlFile(SdlFile sdlFile1, SdlFile sdlFile2){
-        if(sdlFile1 == null){
-            return ( sdlFile2 == null );
+    public static boolean validateSdlFile(SdlFile sdlFile1, SdlFile sdlFile2) {
+        if (sdlFile1 == null) {
+            return (sdlFile2 == null);
         }
-        if(sdlFile2 == null){
-            return ( sdlFile1 == null );
+        if (sdlFile2 == null) {
+            return (sdlFile1 == null);
         }
 
-        if(!( sdlFile1.getName().equals(sdlFile2.getName()) )){
+        if (!(sdlFile1.getName().equals(sdlFile2.getName()))) {
             log("validateSdlFile",
                     "sdlFile1 name \"" + sdlFile1.getName() + "\" didn't match sdlFile2 name \"" + sdlFile2.getName() + "\".");
             return false;
         }
 
-        if(sdlFile1.getResourceId() != sdlFile2.getResourceId() ){
+        if (sdlFile1.getResourceId() != sdlFile2.getResourceId()) {
             log("validateSdlFile",
                     "sdlFile1 resourceId \"" + sdlFile1.getName() + "\" didn't match sdlFile2 resourceId \"" + sdlFile2.getName() + "\".");
             return false;
         }
 
-        if((sdlFile1.getType()!= null && sdlFile2.getType() != null) && !( sdlFile1.getType().equals(sdlFile2.getType()) )){
+        if ((sdlFile1.getType() != null && sdlFile2.getType() != null) && !(sdlFile1.getType().equals(sdlFile2.getType()))) {
             log("validateSdlFile",
                     "sdlFile1 type \"" + sdlFile1.getType() + "\" didn't match sdlFile2 type \"" + sdlFile2.getType() + "\".");
             return false;
         }
 
-        if( (sdlFile1.getUri() != sdlFile2.getUri()) && !( sdlFile1.getUri().equals(sdlFile2.getUri()) )){
+        if ((sdlFile1.getUri() != sdlFile2.getUri()) && !(sdlFile1.getUri().equals(sdlFile2.getUri()))) {
             log("validateSdlFile",
                     "sdlFile1 uri \"" + sdlFile1.getUri() + "\" didn't match sdlFile2 uri \"" + sdlFile2.getUri() + "\".");
             return false;
@@ -207,50 +209,50 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateStringList(List<String> vrCommands1, List<String> vrCommands2){
-        if(vrCommands1 == null){
-            return ( vrCommands2 == null );
+    public static boolean validateStringList(List<String> vrCommands1, List<String> vrCommands2) {
+        if (vrCommands1 == null) {
+            return (vrCommands2 == null);
         }
-        if(vrCommands2 == null){
-            return ( vrCommands1 == null );
+        if (vrCommands2 == null) {
+            return (vrCommands1 == null);
         }
 
-        for(int i = 0; i < vrCommands1.size(); i++){
-            if(!vrCommands1.get(i).equals(vrCommands2.get(i))){
+        for (int i = 0; i < vrCommands1.size(); i++) {
+            if (!vrCommands1.get(i).equals(vrCommands2.get(i))) {
                 return false;
             }
         }
 
         return true;
     }
-    
-    public static boolean validateIntegerList(List<Integer> intList1, List<Integer> intList2){
-        if(intList1 == null){
-            return ( intList2 == null );
+
+    public static boolean validateIntegerList(List<Integer> intList1, List<Integer> intList2) {
+        if (intList1 == null) {
+            return (intList2 == null);
         }
-        if(intList2 == null){
-            return ( intList1 == null );
+        if (intList2 == null) {
+            return (intList1 == null);
         }
 
-        for(int i = 0; i < intList1.size(); i++){
-            if(!intList1.get(i).equals(intList2.get(i))){
+        for (int i = 0; i < intList1.size(); i++) {
+            if (!intList1.get(i).equals(intList2.get(i))) {
                 return false;
             }
         }
 
         return true;
     }
-    
-    public static boolean validateLongList(List<Long> intList1, List<Long> intList2){
-        if(intList1 == null){
-            return ( intList2 == null );
+
+    public static boolean validateLongList(List<Long> intList1, List<Long> intList2) {
+        if (intList1 == null) {
+            return (intList2 == null);
         }
-        if(intList2 == null){
-            return ( intList1 == null );
+        if (intList2 == null) {
+            return (intList1 == null);
         }
 
-        for(int i = 0; i < intList1.size(); i++){
-            if(!intList1.get(i).equals(intList2.get(i))){
+        for (int i = 0; i < intList1.size(); i++) {
+            if (!intList1.get(i).equals(intList2.get(i))) {
                 return false;
             }
         }
@@ -258,31 +260,31 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateSoftButton(SoftButton button1, SoftButton button2){
+    public static boolean validateSoftButton(SoftButton button1, SoftButton button2) {
         return validateImage(button1.getImage(), button2.getImage())
                 && validateText(button1.getText(), button2.getText())
                 && button1.getIsHighlighted() == button2.getIsHighlighted()
-                && ( (button1 .getSoftButtonID() == null && button2.getSoftButtonID() == null) || button1.getSoftButtonID().equals(button2.getSoftButtonID()))
+                && ((button1.getSoftButtonID() == null && button2.getSoftButtonID() == null) || button1.getSoftButtonID().equals(button2.getSoftButtonID()))
                 && button1.getSystemAction() == button2.getSystemAction()
                 && button1.getType() == button2.getType();
     }
 
-    public static boolean validateSoftButtons(List<SoftButton> list1, List<SoftButton> list2){
-        if(list1 == null){
-            return ( list2 == null );
+    public static boolean validateSoftButtons(List<SoftButton> list1, List<SoftButton> list2) {
+        if (list1 == null) {
+            return (list2 == null);
         }
-        if(list2 == null){
-            return ( list1 == null );
+        if (list2 == null) {
+            return (list1 == null);
         }
 
         Iterator<SoftButton> iterator1 = list1.iterator();
         Iterator<SoftButton> iterator2 = list2.iterator();
 
-        while(iterator1.hasNext() && iterator2.hasNext()){
+        while (iterator1.hasNext() && iterator2.hasNext()) {
             SoftButton button1 = iterator1.next();
             SoftButton button2 = iterator2.next();
 
-            if(!validateSoftButton(button1, button2)){
+            if (!validateSoftButton(button1, button2)) {
                 return false;
             }
         }
@@ -290,115 +292,115 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateCoordinate(Coordinate c1, Coordinate c2){
-        if(c1 == null){
-            return ( c2 == null );
+    public static boolean validateCoordinate(Coordinate c1, Coordinate c2) {
+        if (c1 == null) {
+            return (c2 == null);
         }
-        if(c2 == null){
-            return ( c1 == null );
+        if (c2 == null) {
+            return (c1 == null);
         }
 
-        if(c1.getLatitudeDegrees() != c2.getLatitudeDegrees()){
+        if (c1.getLatitudeDegrees() != c2.getLatitudeDegrees()) {
             return false;
         }
 
-        if(c1.getLongitudeDegrees() != c2.getLongitudeDegrees()){
+        if (c1.getLongitudeDegrees() != c2.getLongitudeDegrees()) {
             return false;
         }
 
         return true;
     }
 
-	public static boolean validateRectangle(Rectangle c1, Rectangle c2){
-		if(c1 == null){
-			return ( c2 == null );
-		}
-		if(c2 == null){
-			return ( c1 == null );
-		}
+    public static boolean validateRectangle(Rectangle c1, Rectangle c2) {
+        if (c1 == null) {
+            return (c2 == null);
+        }
+        if (c2 == null) {
+            return (c1 == null);
+        }
 
-		if(c1.getX() != c2.getX()){
-			return false;
-		}
+        if (c1.getX() != c2.getX()) {
+            return false;
+        }
 
-		if(c1.getY() != c2.getY()){
-			return false;
-		}
+        if (c1.getY() != c2.getY()) {
+            return false;
+        }
 
-		if(c1.getWidth() != c2.getWidth()){
-			return false;
-		}
+        if (c1.getWidth() != c2.getWidth()) {
+            return false;
+        }
 
-		if(c1.getHeight() != c2.getHeight()){
-			return false;
-		}
+        if (c1.getHeight() != c2.getHeight()) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-    public static boolean validateOasisAddress(OasisAddress a1, OasisAddress a2){
-        if(a1 == null){
-            return ( a2 == null );
+    public static boolean validateOasisAddress(OasisAddress a1, OasisAddress a2) {
+        if (a1 == null) {
+            return (a2 == null);
         }
-        if(a2 == null){
-            return ( a1 == null );
+        if (a2 == null) {
+            return (a1 == null);
         }
 
-        if(!a1.getAdministrativeArea().equals(a2.getAdministrativeArea())){
+        if (!a1.getAdministrativeArea().equals(a2.getAdministrativeArea())) {
             return false;
         }
 
-        if(!a1.getCountryCode().equals(a2.getCountryCode())){
+        if (!a1.getCountryCode().equals(a2.getCountryCode())) {
             return false;
         }
 
-        if(!a1.getCountryName().equals(a2.getCountryName())){
+        if (!a1.getCountryName().equals(a2.getCountryName())) {
             return false;
         }
 
-        if(!a1.getLocality().equals(a2.getLocality())){
+        if (!a1.getLocality().equals(a2.getLocality())) {
             return false;
         }
 
-        if(!a1.getSubLocality().equals(a2.getSubLocality())){
+        if (!a1.getSubLocality().equals(a2.getSubLocality())) {
             return false;
         }
 
-        if(!a1.getSubAdministrativeArea().equals(a2.getSubAdministrativeArea())){
+        if (!a1.getSubAdministrativeArea().equals(a2.getSubAdministrativeArea())) {
             return false;
         }
 
-        if(!a1.getPostalCode().equals(a2.getPostalCode())){
+        if (!a1.getPostalCode().equals(a2.getPostalCode())) {
             return false;
         }
 
-        if(!a1.getThoroughfare().equals(a2.getThoroughfare())){
+        if (!a1.getThoroughfare().equals(a2.getThoroughfare())) {
             return false;
         }
 
-        if(!a1.getSubThoroughfare().equals(a2.getSubThoroughfare())){
+        if (!a1.getSubThoroughfare().equals(a2.getSubThoroughfare())) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateTtsChunks(List<TTSChunk> list1, List<TTSChunk> list2){
-        if(list1 == null){
-            return ( list2 == null );
+    public static boolean validateTtsChunks(List<TTSChunk> list1, List<TTSChunk> list2) {
+        if (list1 == null) {
+            return (list2 == null);
         }
-        if(list2 == null){
-            return ( list1 == null );
+        if (list2 == null) {
+            return (list1 == null);
         }
 
         Iterator<TTSChunk> iterator1 = list1.iterator();
         Iterator<TTSChunk> iterator2 = list2.iterator();
 
-        while(iterator1.hasNext() && iterator2.hasNext()){
+        while (iterator1.hasNext() && iterator2.hasNext()) {
             TTSChunk chunk1 = iterator1.next();
             TTSChunk chunk2 = iterator2.next();
 
-            if(!validateText(chunk1.getText(), chunk2.getText()) || chunk1.getType() != chunk2.getType()){
+            if (!validateText(chunk1.getText(), chunk2.getText()) || chunk1.getType() != chunk2.getType()) {
                 return false;
             }
         }
@@ -406,43 +408,43 @@ public class Validator{
         return true;
     }
 
-	public static boolean validateAppServiceTypeList(List<AppServiceType> list1, List<AppServiceType> list2){
-		if(list1 == null){
-			return ( list2 == null );
-		}
-		if(list2 == null){
-			return ( list1 == null );
-		}
+    public static boolean validateAppServiceTypeList(List<AppServiceType> list1, List<AppServiceType> list2) {
+        if (list1 == null) {
+            return (list2 == null);
+        }
+        if (list2 == null) {
+            return (list1 == null);
+        }
 
-		Iterator<AppServiceType> iterator1 = list1.iterator();
-		Iterator<AppServiceType> iterator2 = list2.iterator();
+        Iterator<AppServiceType> iterator1 = list1.iterator();
+        Iterator<AppServiceType> iterator2 = list2.iterator();
 
-		while(iterator1.hasNext() && iterator2.hasNext()){
-			AppServiceType chunk1 = iterator1.next();
-			AppServiceType chunk2 = iterator2.next();
+        while (iterator1.hasNext() && iterator2.hasNext()) {
+            AppServiceType chunk1 = iterator1.next();
+            AppServiceType chunk2 = iterator2.next();
 
-			if(chunk1 != chunk2){
-				return false;
-			}
-		}
+            if (chunk1 != chunk2) {
+                return false;
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public static boolean validateAppServiceCapabilities(AppServicesCapabilities params1, AppServicesCapabilities params2) {
-		if (params1 == null) {
-			return (params2 == null);
-		}
-		if (params2 == null) {
-			return (params1 == null);
-		}
+    public static boolean validateAppServiceCapabilities(AppServicesCapabilities params1, AppServicesCapabilities params2) {
+        if (params1 == null) {
+            return (params2 == null);
+        }
+        if (params2 == null) {
+            return (params1 == null);
+        }
 
-		if (!validateAppServiceCapabilityList(params1.getAppServices(), params2.getAppServices())){
-			return false;
-		}
+        if (!validateAppServiceCapabilityList(params1.getAppServices(), params2.getAppServices())) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
     public static boolean validateTemplateConfiguration(TemplateConfiguration params1, TemplateConfiguration params2) {
         if (params1 == null) {
@@ -467,238 +469,238 @@ public class Validator{
         return true;
     }
 
-	public static boolean validateAppServiceCapabilityList(List<AppServiceCapability> list1, List<AppServiceCapability> list2){
-		if(list1 == null){
-			return ( list2 == null );
-		}
-		if(list2 == null){
-			return ( list1 == null );
-		}
+    public static boolean validateAppServiceCapabilityList(List<AppServiceCapability> list1, List<AppServiceCapability> list2) {
+        if (list1 == null) {
+            return (list2 == null);
+        }
+        if (list2 == null) {
+            return (list1 == null);
+        }
+
+        Iterator<AppServiceCapability> iterator1 = list1.iterator();
+        Iterator<AppServiceCapability> iterator2 = list2.iterator();
+
+        while (iterator1.hasNext() && iterator2.hasNext()) {
+            AppServiceCapability chunk1 = iterator1.next();
+            AppServiceCapability chunk2 = iterator2.next();
+
+            if (!validateAppServiceRecord(chunk1.getUpdatedAppServiceRecord(), chunk2.getUpdatedAppServiceRecord())) {
+                return false;
+            }
+
+            if (!chunk1.getUpdateReason().equals(chunk2.getUpdateReason())) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateMediaServiceManifest(MediaServiceManifest params1, MediaServiceManifest params2) {
+        if (params1 == null) {
+            return (params2 == null);
+        }
+        if (params2 == null) {
+            return (params1 == null);
+        }
+
+        return true;
+    }
+
+    public static boolean validateNavigationServiceManifest(NavigationServiceManifest params1, NavigationServiceManifest params2) {
+        if (params1 == null) {
+            return (params2 == null);
+        }
+        if (params2 == null) {
+            return (params1 == null);
+        }
+
+        if (!params1.getAcceptsWayPoints().equals(params2.getAcceptsWayPoints())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateAppServiceRecord(AppServiceRecord params1, AppServiceRecord params2) {
+        if (params1 == null) {
+            return (params2 == null);
+        }
+        if (params2 == null) {
+            return (params1 == null);
+        }
+
+        if (!params1.getServiceActive().equals(params2.getServiceActive())) {
+            return false;
+        }
+
+        if (!params1.getServicePublished().equals(params2.getServicePublished())) {
+            return false;
+        }
+
+        if (!params1.getServiceID().equals(params2.getServiceID())) {
+            return false;
+        }
+
+        if (!validateAppServiceManifest(params1.getServiceManifest(), params2.getServiceManifest())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateAppServiceManifest(AppServiceManifest params1, AppServiceManifest params2) {
+        if (params1 == null) {
+            return (params2 == null);
+        }
+        if (params2 == null) {
+            return (params1 == null);
+        }
+
+        if (!params1.getAllowAppConsumers().equals(params2.getAllowAppConsumers())) {
+            return false;
+        }
+
+        if (!validateImage(params1.getServiceIcon(), params2.getServiceIcon())) {
+            return false;
+        }
+
+        if (!params1.getServiceName().equals(params2.getServiceName())) {
+            return false;
+        }
+
+        if (!params1.getServiceType().equals(params2.getServiceType())) {
+            return false;
+        }
+
+        if (!validateSdlMsgVersion(params1.getRpcSpecVersion(), params2.getRpcSpecVersion())) {
+            return false;
+        }
+
+        if (!validateMediaServiceManifest(params1.getMediaServiceManifest(), params2.getMediaServiceManifest())) {
+            return false;
+        }
+
+        if (!validateWeatherServiceManifest(params1.getWeatherServiceManifest(), params2.getWeatherServiceManifest())) {
+            return false;
+        }
+
+        if (!validateIntegerList(params1.getHandledRpcs(), params2.getHandledRpcs())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateWeatherServiceManifest(WeatherServiceManifest params1, WeatherServiceManifest params2) {
+        if (params1 == null) {
+            return (params2 == null);
+        }
+        if (params2 == null) {
+            return (params1 == null);
+        }
 
-		Iterator<AppServiceCapability> iterator1 = list1.iterator();
-		Iterator<AppServiceCapability> iterator2 = list2.iterator();
+        if (!params1.getMaxHourlyForecastAmount().equals(params2.getMaxHourlyForecastAmount())) {
+            return false;
+        }
+
+        if (!params1.getMaxMinutelyForecastAmount().equals(params2.getMaxMinutelyForecastAmount())) {
+            return false;
+        }
 
-		while(iterator1.hasNext() && iterator2.hasNext()){
-			AppServiceCapability chunk1 = iterator1.next();
-			AppServiceCapability chunk2 = iterator2.next();
+        if (!params1.getMaxMultidayForecastAmount().equals(params2.getMaxMultidayForecastAmount())) {
+            return false;
+        }
 
-			if(!validateAppServiceRecord(chunk1.getUpdatedAppServiceRecord(), chunk2.getUpdatedAppServiceRecord())){
-				return false;
-			}
+        if (params1.getCurrentForecastSupported() != params2.getCurrentForecastSupported()) {
+            return false;
+        }
 
-			if (!chunk1.getUpdateReason().equals(chunk2.getUpdateReason())){
-				return false;
-			}
-		}
+        if (params1.getWeatherForLocationSupported() != params2.getWeatherForLocationSupported()) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public static boolean validateMediaServiceManifest(MediaServiceManifest params1, MediaServiceManifest params2){
-		if(params1 == null){
-			return ( params2 == null );
-		}
-		if(params2 == null){
-			return ( params1 == null );
-		}
+    public static boolean validateLocationDetails(LocationDetails params1, LocationDetails params2) {
+        if (params1 == null) {
+            return (params2 == null);
+        }
+        if (params2 == null) {
+            return (params1 == null);
+        }
 
-		return true;
-	}
-
-	public static boolean validateNavigationServiceManifest(NavigationServiceManifest params1, NavigationServiceManifest params2){
-		if(params1 == null){
-			return ( params2 == null );
-		}
-		if(params2 == null){
-			return ( params1 == null );
-		}
-
-		if (!params1.getAcceptsWayPoints().equals(params2.getAcceptsWayPoints())){
-			return false;
-		}
-
-		return true;
-	}
+        if (!params1.getAddressLines().equals(params2.getAddressLines())) {
+            return false;
+        }
 
-	public static boolean validateAppServiceRecord(AppServiceRecord params1, AppServiceRecord params2) {
-		if (params1 == null) {
-			return (params2 == null);
-		}
-		if (params2 == null) {
-			return (params1 == null);
-		}
-
-		if (!params1.getServiceActive().equals(params2.getServiceActive())){
-			return false;
-		}
-
-		if (!params1.getServicePublished().equals(params2.getServicePublished())){
-			return false;
-		}
-
-		if (!params1.getServiceID().equals(params2.getServiceID())){
-			return false;
-		}
-
-		if (!validateAppServiceManifest(params1.getServiceManifest(), params2.getServiceManifest())){
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateAppServiceManifest(AppServiceManifest params1, AppServiceManifest params2){
-		if(params1 == null){
-			return ( params2 == null );
-		}
-		if(params2 == null){
-			return ( params1 == null );
-		}
-
-		if (!params1.getAllowAppConsumers().equals(params2.getAllowAppConsumers())){
-			return false;
-		}
-
-		if (!validateImage(params1.getServiceIcon(), params2.getServiceIcon())){
-			return false;
-		}
-
-		if (!params1.getServiceName().equals(params2.getServiceName())){
-			return false;
-		}
-
-		if (!params1.getServiceType().equals(params2.getServiceType())){
-			return false;
-		}
-
-		if (!validateSdlMsgVersion(params1.getRpcSpecVersion(),params2.getRpcSpecVersion())){
-			return false;
-		}
-
-		if (!validateMediaServiceManifest(params1.getMediaServiceManifest(), params2.getMediaServiceManifest())) {
-			return false;
-		}
-
-		if (!validateWeatherServiceManifest(params1.getWeatherServiceManifest(), params2.getWeatherServiceManifest())){
-			return false;
-		}
-
-		if (!validateIntegerList(params1.getHandledRpcs(), params2.getHandledRpcs())){
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateWeatherServiceManifest(WeatherServiceManifest params1, WeatherServiceManifest params2){
-		if(params1 == null){
-			return ( params2 == null );
-		}
-		if(params2 == null){
-			return ( params1 == null );
-		}
-
-		if (!params1.getMaxHourlyForecastAmount().equals(params2.getMaxHourlyForecastAmount())){
-			return false;
-		}
-
-		if (!params1.getMaxMinutelyForecastAmount().equals(params2.getMaxMinutelyForecastAmount())){
-			return false;
-		}
-
-		if (!params1.getMaxMultidayForecastAmount().equals(params2.getMaxMultidayForecastAmount())){
-			return false;
-		}
-
-		if (params1.getCurrentForecastSupported()!=params2.getCurrentForecastSupported()){
-			return false;
-		}
-
-		if (params1.getWeatherForLocationSupported()!=params2.getWeatherForLocationSupported()){
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateLocationDetails(LocationDetails params1, LocationDetails params2) {
-		if (params1 == null) {
-			return (params2 == null);
-		}
-		if (params2 == null) {
-			return (params1 == null);
-		}
-
-		if (!params1.getAddressLines().equals(params2.getAddressLines())) {
-			return false;
-		}
-
-		if (!validateCoordinate(params1.getCoordinate(), params2.getCoordinate())) {
-			return false;
-		}
-
-		if (!params1.getLocationDescription().equals(params2.getLocationDescription())) {
-			return false;
-		}
-
-		if (!params1.getPhoneNumber().equals(params2.getPhoneNumber())) {
-			return false;
-		}
-
-		if (!validateImage(params1.getLocationImage(), params2.getLocationImage())) {
-			return false;
-		}
-
-		if (!params1.getLocationName().equals(params2.getLocationName())) {
-			return false;
-		}
-
-		if (!validateOasisAddress(params1.getSearchAddress(), params2.getSearchAddress())) {
-			return false;
-		}
-		return true;
-	}
+        if (!validateCoordinate(params1.getCoordinate(), params2.getCoordinate())) {
+            return false;
+        }
 
-    public static boolean validateChoice(Choice choice1, Choice choice2){
-        if(choice1 == null){
-            return ( choice2 == null );
+        if (!params1.getLocationDescription().equals(params2.getLocationDescription())) {
+            return false;
         }
-        if(choice2 == null){
-            return ( choice1 == null );
+
+        if (!params1.getPhoneNumber().equals(params2.getPhoneNumber())) {
+            return false;
         }
 
-        if(!( validateImage(choice1.getImage(), choice2.getImage()) )){
+        if (!validateImage(params1.getLocationImage(), params2.getLocationImage())) {
+            return false;
+        }
+
+        if (!params1.getLocationName().equals(params2.getLocationName())) {
+            return false;
+        }
+
+        if (!validateOasisAddress(params1.getSearchAddress(), params2.getSearchAddress())) {
+            return false;
+        }
+        return true;
+    }
+
+    public static boolean validateChoice(Choice choice1, Choice choice2) {
+        if (choice1 == null) {
+            return (choice2 == null);
+        }
+        if (choice2 == null) {
+            return (choice1 == null);
+        }
+
+        if (!(validateImage(choice1.getImage(), choice2.getImage()))) {
             log("validateChoice", "choice1 image \"" + choice1.getImage() + "\" didn't match choice2 image \""
                     + choice2.getImage() + "\"");
             return false;
         }
-        if(!( validateImage(choice1.getSecondaryImage(), choice2.getSecondaryImage()) )){
+        if (!(validateImage(choice1.getSecondaryImage(), choice2.getSecondaryImage()))) {
             log("validateChoice", "choice1 secondary image \"" + choice1.getSecondaryImage()
                     + "\" didn't match choice2 image \"" + choice2.getSecondaryImage() + "\"");
             return false;
         }
-        if(choice1.getChoiceID() != choice2.getChoiceID()){
+        if (choice1.getChoiceID() != choice2.getChoiceID()) {
             log("validateChoice",
                     "choice1 ID \"" + choice1.getChoiceID() + "\" didn't match choice2 ID \"" + choice2.getChoiceID()
                             + "\"");
             return false;
         }
-        if(!( validateText(choice1.getMenuName(), choice2.getMenuName()) )){
+        if (!(validateText(choice1.getMenuName(), choice2.getMenuName()))) {
             log("validateChoice", "choice1 menu name \"" + choice1.getMenuName()
                     + "\" didn't match choice2 menu name \"" + choice2.getMenuName() + "\"");
             return false;
         }
-        if(!( validateText(choice1.getSecondaryText(), choice2.getSecondaryText()) )){
+        if (!(validateText(choice1.getSecondaryText(), choice2.getSecondaryText()))) {
             log("validateChoice", "choice1 secondary text \"" + choice1.getSecondaryText()
                     + "\" didn't match choice2 secondary text \"" + choice2.getSecondaryText() + "\"");
             return false;
         }
-        if(!( validateText(choice1.getTertiaryText(), choice2.getTertiaryText()) )){
+        if (!(validateText(choice1.getTertiaryText(), choice2.getTertiaryText()))) {
             log("validateChoice", "choice1 tertiary text \"" + choice1.getTertiaryText()
                     + "\" didn't match choice2 tertiary text \"" + choice2.getTertiaryText() + "\"");
             return false;
         }
-        if(!( validateStringList(choice1.getVrCommands(), choice2.getVrCommands()) )){
+        if (!(validateStringList(choice1.getVrCommands(), choice2.getVrCommands()))) {
             log("validateChoice", "choice1 VR commands \"" + choice1.getVrCommands()
                     + "\" didn't match choice2 VR commands \"" + choice2.getVrCommands() + "\"");
             return false;
@@ -707,54 +709,54 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateText(String text1, String text2){
-        if(text1 == null){
-            return ( text2 == null );
+    public static boolean validateText(String text1, String text2) {
+        if (text1 == null) {
+            return (text2 == null);
         }
-        if(text2 == null){
-            return ( text1 == null );
+        if (text2 == null) {
+            return (text1 == null);
         }
 
         return text1.equals(text2);
     }
 
-    public static boolean validateScreenParams(ScreenParams params1, ScreenParams params2){
-        if(params1 == null){
-            return ( params2 == null );
+    public static boolean validateScreenParams(ScreenParams params1, ScreenParams params2) {
+        if (params1 == null) {
+            return (params2 == null);
         }
-        if(params2 == null){
-            return ( params1 == null );
+        if (params2 == null) {
+            return (params1 == null);
         }
 
-        if(!( validateImageResolution(params1.getImageResolution(), params2.getImageResolution()) )){
+        if (!(validateImageResolution(params1.getImageResolution(), params2.getImageResolution()))) {
             log("validateScreenParams", "Image resolutions didn't match!");
             return false;
         }
 
-        if(!( validateTouchEventCapabilities(params1.getTouchEventAvailable(), params2.getTouchEventAvailable()) )){
+        if (!(validateTouchEventCapabilities(params1.getTouchEventAvailable(), params2.getTouchEventAvailable()))) {
             log("validateScreenParams", "Touch event capabilities didn't match!");
             return false;
         }
 
         return true;
     }
-    
-    public static boolean validateImageResolution(ImageResolution image1, ImageResolution image2){
-        if(image1 == null){
-            return ( image2 == null );
+
+    public static boolean validateImageResolution(ImageResolution image1, ImageResolution image2) {
+        if (image1 == null) {
+            return (image2 == null);
         }
-        if(image2 == null){
-            return ( image1 == null );
+        if (image2 == null) {
+            return (image1 == null);
         }
 
-        if((int) image1.getResolutionHeight() != (int) image2.getResolutionHeight()){
+        if ((int) image1.getResolutionHeight() != (int) image2.getResolutionHeight()) {
             log("validateImageResolution",
                     "Height " + image1.getResolutionHeight() + " didn't match height " + image2.getResolutionHeight()
                             + ".");
             return false;
         }
 
-        if((int) image1.getResolutionWidth() != (int) image2.getResolutionWidth()){
+        if ((int) image1.getResolutionWidth() != (int) image2.getResolutionWidth()) {
             log("validateImageResolution",
                     "Width " + image1.getResolutionWidth() + " didn't match width " + image2.getResolutionWidth() + ".");
             return false;
@@ -763,22 +765,22 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateTemperature(Temperature temperature1, Temperature temperature2){
-        if(temperature1 == null){
-            return ( temperature2 == null );
+    public static boolean validateTemperature(Temperature temperature1, Temperature temperature2) {
+        if (temperature1 == null) {
+            return (temperature2 == null);
         }
-        if(temperature2 == null){
-            return ( temperature1 == null );
+        if (temperature2 == null) {
+            return (temperature1 == null);
         }
 
-        if((float) temperature1.getValue() != (float) temperature2.getValue()){
+        if ((float) temperature1.getValue() != (float) temperature2.getValue()) {
             log("validateTemperature",
                     "Value " + temperature1.getValue() + " didn't match value " + temperature2.getValue()
                             + ".");
             return false;
         }
 
-        if(temperature1.getUnit() != temperature2.getUnit()){
+        if (temperature1.getUnit() != temperature2.getUnit()) {
             log("validateTemperature",
                     "Unit " + temperature1.getUnit() + " didn't match unit " + temperature2.getUnit() + ".");
             return false;
@@ -787,64 +789,64 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateRdsData(RdsData rdsData1, RdsData rdsData2){
-        if(rdsData1 == null){
-            return ( rdsData2 == null );
+    public static boolean validateRdsData(RdsData rdsData1, RdsData rdsData2) {
+        if (rdsData1 == null) {
+            return (rdsData2 == null);
         }
-        if(rdsData2 == null){
-            return ( rdsData1 == null );
+        if (rdsData2 == null) {
+            return (rdsData1 == null);
         }
 
-        if(rdsData1.getProgramService() != rdsData2.getProgramService()){
+        if (rdsData1.getProgramService() != rdsData2.getProgramService()) {
             log("validateRdsData",
                     "Ps " + rdsData1.getProgramService() + " didn't match Ps " + rdsData2.getProgramService()
                             + ".");
             return false;
         }
 
-        if(rdsData1.getRadioText() != rdsData2.getRadioText()){
+        if (rdsData1.getRadioText() != rdsData2.getRadioText()) {
             log("validateRdsData",
                     "Rt " + rdsData1.getRadioText() + " didn't match Rt " + rdsData2.getRadioText()
                             + ".");
             return false;
         }
 
-        if(rdsData1.getClockText() != rdsData2.getClockText()){
+        if (rdsData1.getClockText() != rdsData2.getClockText()) {
             log("validateRdsData",
                     "Ct " + rdsData1.getClockText() + " didn't match Ct " + rdsData2.getClockText()
                             + ".");
             return false;
         }
 
-        if(rdsData1.getProgramIdentification() != rdsData2.getProgramIdentification()){
+        if (rdsData1.getProgramIdentification() != rdsData2.getProgramIdentification()) {
             log("validateRdsData",
                     "Pi " + rdsData1.getProgramIdentification() + " didn't match Pi " + rdsData2.getProgramIdentification()
                             + ".");
             return false;
         }
 
-        if(rdsData1.getRegion() != rdsData2.getRegion()){
+        if (rdsData1.getRegion() != rdsData2.getRegion()) {
             log("validateRdsData",
                     "Reg " + rdsData1.getRegion() + " didn't match Reg " + rdsData2.getRegion()
                             + ".");
             return false;
         }
 
-        if(rdsData1.getTrafficProgram() != rdsData2.getTrafficProgram()){
+        if (rdsData1.getTrafficProgram() != rdsData2.getTrafficProgram()) {
             log("validateRdsData",
                     "Tp " + rdsData1.getTrafficProgram() + " didn't match Tp " + rdsData2.getTrafficProgram()
                             + ".");
             return false;
         }
 
-        if(rdsData1.getTrafficAnnouncement() != rdsData2.getTrafficAnnouncement()){
+        if (rdsData1.getTrafficAnnouncement() != rdsData2.getTrafficAnnouncement()) {
             log("validateRdsData",
                     "Ta " + rdsData1.getTrafficAnnouncement() + " didn't match Ta " + rdsData2.getTrafficAnnouncement()
                             + ".");
             return false;
         }
 
-        if(rdsData1.getProgramType() != rdsData2.getProgramType()){
+        if (rdsData1.getProgramType() != rdsData2.getProgramType()) {
             log("validateRdsData",
                     "Pty " + rdsData1.getProgramType() + " didn't match Pty " + rdsData2.getProgramType()
                             + ".");
@@ -854,118 +856,118 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateHMISettingsControlCapabilities(HMISettingsControlCapabilities hmiSettingsControlCapabilities1, HMISettingsControlCapabilities hmiSettingsControlCapabilities2){
-        if(hmiSettingsControlCapabilities1 == null){
-            return ( hmiSettingsControlCapabilities2 == null );
+    public static boolean validateHMISettingsControlCapabilities(HMISettingsControlCapabilities hmiSettingsControlCapabilities1, HMISettingsControlCapabilities hmiSettingsControlCapabilities2) {
+        if (hmiSettingsControlCapabilities1 == null) {
+            return (hmiSettingsControlCapabilities2 == null);
         }
-        if(hmiSettingsControlCapabilities2 == null){
-            return ( hmiSettingsControlCapabilities1 == null );
+        if (hmiSettingsControlCapabilities2 == null) {
+            return (hmiSettingsControlCapabilities1 == null);
         }
 
-        if(hmiSettingsControlCapabilities1.getModuleName() != hmiSettingsControlCapabilities2.getModuleName()){
+        if (hmiSettingsControlCapabilities1.getModuleName() != hmiSettingsControlCapabilities2.getModuleName()) {
             return false;
         }
 
-        if(hmiSettingsControlCapabilities1.getDisplayModeUnitAvailable() != hmiSettingsControlCapabilities2.getDisplayModeUnitAvailable()){
+        if (hmiSettingsControlCapabilities1.getDisplayModeUnitAvailable() != hmiSettingsControlCapabilities2.getDisplayModeUnitAvailable()) {
             return false;
         }
 
-        if(hmiSettingsControlCapabilities1.getDistanceUnitAvailable() != hmiSettingsControlCapabilities2.getDistanceUnitAvailable()){
+        if (hmiSettingsControlCapabilities1.getDistanceUnitAvailable() != hmiSettingsControlCapabilities2.getDistanceUnitAvailable()) {
             return false;
         }
 
-        if(hmiSettingsControlCapabilities1.getTemperatureUnitAvailable() != hmiSettingsControlCapabilities2.getTemperatureUnitAvailable()){
+        if (hmiSettingsControlCapabilities1.getTemperatureUnitAvailable() != hmiSettingsControlCapabilities2.getTemperatureUnitAvailable()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateLightControlCapabilities(LightControlCapabilities lightControlCapabilities1, LightControlCapabilities lightControlCapabilities2){
-        if(lightControlCapabilities1 == null){
-            return ( lightControlCapabilities2 == null );
+    public static boolean validateLightControlCapabilities(LightControlCapabilities lightControlCapabilities1, LightControlCapabilities lightControlCapabilities2) {
+        if (lightControlCapabilities1 == null) {
+            return (lightControlCapabilities2 == null);
         }
-        if(lightControlCapabilities2 == null){
-            return ( lightControlCapabilities1 == null );
+        if (lightControlCapabilities2 == null) {
+            return (lightControlCapabilities1 == null);
         }
 
-        if(lightControlCapabilities1.getModuleName() != lightControlCapabilities2.getModuleName()){
+        if (lightControlCapabilities1.getModuleName() != lightControlCapabilities2.getModuleName()) {
             return false;
         }
 
-        if(!( validateLightCapabilitiesList(lightControlCapabilities1.getSupportedLights(), lightControlCapabilities2.getSupportedLights()) )){
+        if (!(validateLightCapabilitiesList(lightControlCapabilities1.getSupportedLights(), lightControlCapabilities2.getSupportedLights()))) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateClimateControlData(ClimateControlData climateControlData1, ClimateControlData climateControlData2){
-        if(climateControlData1 == null){
-            return ( climateControlData2 == null );
+    public static boolean validateClimateControlData(ClimateControlData climateControlData1, ClimateControlData climateControlData2) {
+        if (climateControlData1 == null) {
+            return (climateControlData2 == null);
         }
-        if(climateControlData2 == null){
-            return ( climateControlData1 == null );
+        if (climateControlData2 == null) {
+            return (climateControlData1 == null);
         }
 
-        if(climateControlData1.getFanSpeed() != climateControlData2.getFanSpeed()){
+        if (climateControlData1.getFanSpeed() != climateControlData2.getFanSpeed()) {
             log("validateClimateControlData",
                     "FanSpeed " + climateControlData1.getFanSpeed() + " didn't match fanSpeed " + climateControlData2.getFanSpeed()
                             + ".");
             return false;
         }
 
-        if(!( validateTemperature(climateControlData1.getCurrentTemperature(), climateControlData2.getCurrentTemperature()) )){
+        if (!(validateTemperature(climateControlData1.getCurrentTemperature(), climateControlData2.getCurrentTemperature()))) {
             return false;
         }
 
-        if(!( validateTemperature(climateControlData1.getDesiredTemperature(), climateControlData2.getDesiredTemperature()) )){
+        if (!(validateTemperature(climateControlData1.getDesiredTemperature(), climateControlData2.getDesiredTemperature()))) {
             return false;
         }
 
-        if(climateControlData1.getAcEnable() != climateControlData2.getAcEnable()){
+        if (climateControlData1.getAcEnable() != climateControlData2.getAcEnable()) {
             log("validateClimateControlData",
                     "AcEnable " + climateControlData1.getAcEnable() + " didn't match AcEnable " + climateControlData2.getAcEnable()
                             + ".");
             return false;
         }
 
-        if(climateControlData1.getCirculateAirEnable() != climateControlData2.getCirculateAirEnable()){
+        if (climateControlData1.getCirculateAirEnable() != climateControlData2.getCirculateAirEnable()) {
             log("validateClimateControlData",
                     "CirculateAirEnable " + climateControlData1.getCirculateAirEnable() + " didn't match CirculateAirEnable " + climateControlData2.getCirculateAirEnable()
                             + ".");
             return false;
         }
 
-        if(climateControlData1.getAutoModeEnable() != climateControlData2.getAutoModeEnable()){
+        if (climateControlData1.getAutoModeEnable() != climateControlData2.getAutoModeEnable()) {
             log("validateClimateControlData",
                     "AutoModeEnable " + climateControlData1.getAutoModeEnable() + " didn't match AutoModeEnable " + climateControlData2.getAutoModeEnable()
                             + ".");
             return false;
         }
 
-        if(climateControlData1.getDefrostZone() != climateControlData2.getDefrostZone()){
+        if (climateControlData1.getDefrostZone() != climateControlData2.getDefrostZone()) {
             log("validateClimateControlData",
                     "DefrostZone " + climateControlData1.getDefrostZone() + " didn't match DefrostZone " + climateControlData2.getDefrostZone()
                             + ".");
             return false;
         }
 
-        if(climateControlData1.getDualModeEnable() != climateControlData2.getDualModeEnable()){
+        if (climateControlData1.getDualModeEnable() != climateControlData2.getDualModeEnable()) {
             log("validateClimateControlData",
                     "DualModeEnable " + climateControlData1.getDualModeEnable() + " didn't match DualModeEnable " + climateControlData2.getDualModeEnable()
                             + ".");
             return false;
         }
 
-        if(climateControlData1.getAcMaxEnable() != climateControlData2.getAcMaxEnable()){
+        if (climateControlData1.getAcMaxEnable() != climateControlData2.getAcMaxEnable()) {
             log("validateClimateControlData",
                     "AcMaxEnable " + climateControlData1.getAcMaxEnable() + " didn't match AcMaxEnable " + climateControlData2.getAcMaxEnable()
                             + ".");
             return false;
         }
 
-        if(climateControlData1.getVentilationMode() != climateControlData2.getVentilationMode()){
+        if (climateControlData1.getVentilationMode() != climateControlData2.getVentilationMode()) {
             log("validateClimateControlData",
                     "VentilationMode " + climateControlData1.getVentilationMode() + " didn't match VentilationMode " + climateControlData2.getVentilationMode()
                             + ".");
@@ -976,296 +978,296 @@ public class Validator{
         return true;
     }
 
-	public static boolean validateSeatControlData(SeatControlData seatControlData1, SeatControlData seatControlData2) {
-		if (seatControlData1 == null) {
-			return (seatControlData2 == null);
-		}
-		if (seatControlData2 == null) {
-			return (seatControlData1 == null);
-		}
-
-		if (seatControlData1.getCoolingEnabled() != seatControlData2.getCoolingEnabled()) {
-			return false;
-		}
-		if (seatControlData1.getHeatingEnabled() != seatControlData2.getHeatingEnabled()) {
-			return false;
-		}
-		if (seatControlData1.getMassageEnabled() != seatControlData2.getMassageEnabled()) {
-			return false;
-		}
-		if (seatControlData1.getBackTiltAngle() != seatControlData2.getBackTiltAngle()) {
-			return false;
-		}
-		if (seatControlData1.getBackVerticalPosition() != seatControlData2.getBackVerticalPosition()) {
-			return false;
-		}
-		if (seatControlData1.getCoolingLevel() != seatControlData2.getCoolingLevel()) {
-			return false;
-		}
-		if (seatControlData1.getFrontVerticalPosition() != seatControlData2.getFrontVerticalPosition()) {
-			return false;
-		}
-		if (seatControlData1.getHeadSupportHorizontalPosition() != seatControlData2.getHeadSupportHorizontalPosition()) {
-			return false;
-		}
-		if (seatControlData1.getHeadSupportVerticalPosition() != seatControlData2.getHeadSupportVerticalPosition()) {
-			return false;
-		}
-		if (seatControlData1.getHeatingLevel() != seatControlData2.getHeatingLevel()) {
-			return false;
-		}
-		if (seatControlData1.getHorizontalPosition() != seatControlData2.getHorizontalPosition()) {
-			return false;
-		}
-		if (seatControlData1.getId() != seatControlData2.getId()) {
-			return false;
-		}
-
-		if (!(validateSeatMemoryAction(seatControlData1.getMemory(), seatControlData2.getMemory()))) {
-			return false;
-		}
-
-		if (!(validateSeatMemoryAction(seatControlData1.getMemory(), seatControlData2.getMemory()))) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateAudioControlData(AudioControlData audioControlData1, AudioControlData audioControlData2) {
-		if (audioControlData1 == null) {
-			return (audioControlData2 == null);
-		}
-		if (audioControlData2 == null) {
-			return (audioControlData1 == null);
-		}
-
-		if (audioControlData1.getKeepContext() != audioControlData2.getKeepContext()) {
-			return false;
-		}
-
-		if (audioControlData1.getSource() != audioControlData2.getSource()) {
-			return false;
-		}
-
-		if (audioControlData1.getVolume() != audioControlData2.getVolume()) {
-			return false;
-		}
-
-		if (!(validateEqualizerSettingsList(audioControlData1.getEqualizerSettings(), audioControlData2.getEqualizerSettings()))) {
-			return false;
-		}
-
-
-		return true;
-	}
-
-	public static boolean validateHMISettingsControlData(HMISettingsControlData hmiSettingsControlData1, HMISettingsControlData hmiSettingsControlData2) {
-		if (hmiSettingsControlData1 == null) {
-			return (hmiSettingsControlData2 == null);
-		}
-		if (hmiSettingsControlData2 == null) {
-			return (hmiSettingsControlData1 == null);
-		}
-
-		if (hmiSettingsControlData1.getDisplayMode() != hmiSettingsControlData2.getDisplayMode()) {
-			return false;
-		}
-
-		if (hmiSettingsControlData1.getDistanceUnit() != hmiSettingsControlData2.getDistanceUnit()) {
-			return false;
-		}
-
-		if (hmiSettingsControlData1.getTemperatureUnit() != hmiSettingsControlData2.getTemperatureUnit()) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateLightControlData(LightControlData lightControlData1, LightControlData lightControlData2) {
-		if (lightControlData1 == null) {
-			return (lightControlData2 == null);
-		}
-		if (lightControlData2 == null) {
-			return (lightControlData1 == null);
-		}
-
-		if (!(validateLightStateList(lightControlData1.getLightState(), lightControlData2.getLightState()))) {
-			return false;
-		}
-
-		return true;
-	}
-
-    public static boolean validateModuleData(ModuleData moduleData1, ModuleData moduleData2){
-        if(moduleData1 == null){
-            return ( moduleData2 == null );
-        }
-        if(moduleData2 == null){
-            return ( moduleData1 == null );
-        }
-
-        if(moduleData1.getModuleType() != moduleData2.getModuleType()){
+    public static boolean validateSeatControlData(SeatControlData seatControlData1, SeatControlData seatControlData2) {
+        if (seatControlData1 == null) {
+            return (seatControlData2 == null);
+        }
+        if (seatControlData2 == null) {
+            return (seatControlData1 == null);
+        }
+
+        if (seatControlData1.getCoolingEnabled() != seatControlData2.getCoolingEnabled()) {
+            return false;
+        }
+        if (seatControlData1.getHeatingEnabled() != seatControlData2.getHeatingEnabled()) {
+            return false;
+        }
+        if (seatControlData1.getMassageEnabled() != seatControlData2.getMassageEnabled()) {
+            return false;
+        }
+        if (seatControlData1.getBackTiltAngle() != seatControlData2.getBackTiltAngle()) {
+            return false;
+        }
+        if (seatControlData1.getBackVerticalPosition() != seatControlData2.getBackVerticalPosition()) {
+            return false;
+        }
+        if (seatControlData1.getCoolingLevel() != seatControlData2.getCoolingLevel()) {
+            return false;
+        }
+        if (seatControlData1.getFrontVerticalPosition() != seatControlData2.getFrontVerticalPosition()) {
+            return false;
+        }
+        if (seatControlData1.getHeadSupportHorizontalPosition() != seatControlData2.getHeadSupportHorizontalPosition()) {
+            return false;
+        }
+        if (seatControlData1.getHeadSupportVerticalPosition() != seatControlData2.getHeadSupportVerticalPosition()) {
+            return false;
+        }
+        if (seatControlData1.getHeatingLevel() != seatControlData2.getHeatingLevel()) {
+            return false;
+        }
+        if (seatControlData1.getHorizontalPosition() != seatControlData2.getHorizontalPosition()) {
+            return false;
+        }
+        if (seatControlData1.getId() != seatControlData2.getId()) {
+            return false;
+        }
+
+        if (!(validateSeatMemoryAction(seatControlData1.getMemory(), seatControlData2.getMemory()))) {
+            return false;
+        }
+
+        if (!(validateSeatMemoryAction(seatControlData1.getMemory(), seatControlData2.getMemory()))) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateAudioControlData(AudioControlData audioControlData1, AudioControlData audioControlData2) {
+        if (audioControlData1 == null) {
+            return (audioControlData2 == null);
+        }
+        if (audioControlData2 == null) {
+            return (audioControlData1 == null);
+        }
+
+        if (audioControlData1.getKeepContext() != audioControlData2.getKeepContext()) {
+            return false;
+        }
+
+        if (audioControlData1.getSource() != audioControlData2.getSource()) {
+            return false;
+        }
+
+        if (audioControlData1.getVolume() != audioControlData2.getVolume()) {
+            return false;
+        }
+
+        if (!(validateEqualizerSettingsList(audioControlData1.getEqualizerSettings(), audioControlData2.getEqualizerSettings()))) {
+            return false;
+        }
+
+
+        return true;
+    }
+
+    public static boolean validateHMISettingsControlData(HMISettingsControlData hmiSettingsControlData1, HMISettingsControlData hmiSettingsControlData2) {
+        if (hmiSettingsControlData1 == null) {
+            return (hmiSettingsControlData2 == null);
+        }
+        if (hmiSettingsControlData2 == null) {
+            return (hmiSettingsControlData1 == null);
+        }
+
+        if (hmiSettingsControlData1.getDisplayMode() != hmiSettingsControlData2.getDisplayMode()) {
+            return false;
+        }
+
+        if (hmiSettingsControlData1.getDistanceUnit() != hmiSettingsControlData2.getDistanceUnit()) {
+            return false;
+        }
+
+        if (hmiSettingsControlData1.getTemperatureUnit() != hmiSettingsControlData2.getTemperatureUnit()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateLightControlData(LightControlData lightControlData1, LightControlData lightControlData2) {
+        if (lightControlData1 == null) {
+            return (lightControlData2 == null);
+        }
+        if (lightControlData2 == null) {
+            return (lightControlData1 == null);
+        }
+
+        if (!(validateLightStateList(lightControlData1.getLightState(), lightControlData2.getLightState()))) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateModuleData(ModuleData moduleData1, ModuleData moduleData2) {
+        if (moduleData1 == null) {
+            return (moduleData2 == null);
+        }
+        if (moduleData2 == null) {
+            return (moduleData1 == null);
+        }
+
+        if (moduleData1.getModuleType() != moduleData2.getModuleType()) {
             log("validateModuleData",
                     "ModuleType " + moduleData1.getModuleType() + " didn't match ModuleType " + moduleData2.getModuleType()
                             + ".");
             return false;
         }
 
-        if(!( validateRadioControlData(moduleData1.getRadioControlData(), moduleData2.getRadioControlData()) )){
+        if (!(validateRadioControlData(moduleData1.getRadioControlData(), moduleData2.getRadioControlData()))) {
             return false;
         }
 
-        if(!( validateClimateControlData(moduleData1.getClimateControlData(), moduleData2.getClimateControlData()) )){
+        if (!(validateClimateControlData(moduleData1.getClimateControlData(), moduleData2.getClimateControlData()))) {
             return false;
         }
 
         return true;
     }
 
-	public static boolean validateSisData(SisData sisData1, SisData sisData2) {
-		if (sisData1 == null) {
-			return (sisData2 == null);
-		}
-		if (sisData2 == null) {
-			return (sisData1 == null);
-		}
+    public static boolean validateSisData(SisData sisData1, SisData sisData2) {
+        if (sisData1 == null) {
+            return (sisData2 == null);
+        }
+        if (sisData2 == null) {
+            return (sisData1 == null);
+        }
 
-		if (sisData1.getStationShortName() != sisData2.getStationShortName()) {
-			return false;
-		}
+        if (sisData1.getStationShortName() != sisData2.getStationShortName()) {
+            return false;
+        }
 
-		if (!(validateStationIDNumber(sisData1.getStationIDNumber(), sisData2.getStationIDNumber()))) {
-			return false;
-		}
+        if (!(validateStationIDNumber(sisData1.getStationIDNumber(), sisData2.getStationIDNumber()))) {
+            return false;
+        }
 
-		if (sisData1.getStationLongName() != sisData2.getStationLongName()) {
-			return false;
-		}
+        if (sisData1.getStationLongName() != sisData2.getStationLongName()) {
+            return false;
+        }
 
-		if (!(validateGpsData(sisData1.getStationLocation(), sisData2.getStationLocation()))) {
-			return false;
-		}
+        if (!(validateGpsData(sisData1.getStationLocation(), sisData2.getStationLocation()))) {
+            return false;
+        }
 
-		if (sisData1.getStationMessage() != sisData2.getStationMessage()) {
-			return false;
-		}
+        if (sisData1.getStationMessage() != sisData2.getStationMessage()) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-    public static boolean validateStationIDNumber(StationIDNumber stationIDNumber1, StationIDNumber stationIDNumber2){
-        if(stationIDNumber1 == null){
-            return ( stationIDNumber2 == null );
+    public static boolean validateStationIDNumber(StationIDNumber stationIDNumber1, StationIDNumber stationIDNumber2) {
+        if (stationIDNumber1 == null) {
+            return (stationIDNumber2 == null);
         }
-        if(stationIDNumber2 == null){
-            return ( stationIDNumber1 == null );
+        if (stationIDNumber2 == null) {
+            return (stationIDNumber1 == null);
         }
 
-        if(stationIDNumber1.getCountryCode() != stationIDNumber2.getCountryCode()){
+        if (stationIDNumber1.getCountryCode() != stationIDNumber2.getCountryCode()) {
             return false;
         }
 
-        if(stationIDNumber1.getFccFacilityId() != stationIDNumber2.getFccFacilityId()){
+        if (stationIDNumber1.getFccFacilityId() != stationIDNumber2.getFccFacilityId()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateRemoteControlCapabilities(RemoteControlCapabilities remoteControlCapabilities1, RemoteControlCapabilities remoteControlCapabilities2){
-        if(remoteControlCapabilities1 == null){
-            return ( remoteControlCapabilities2 == null );
+    public static boolean validateRemoteControlCapabilities(RemoteControlCapabilities remoteControlCapabilities1, RemoteControlCapabilities remoteControlCapabilities2) {
+        if (remoteControlCapabilities1 == null) {
+            return (remoteControlCapabilities2 == null);
         }
-        if(remoteControlCapabilities2 == null){
-            return ( remoteControlCapabilities1 == null );
+        if (remoteControlCapabilities2 == null) {
+            return (remoteControlCapabilities1 == null);
         }
 
-        if(!( validateButtonCapabilities(remoteControlCapabilities1.getButtonCapabilities(), remoteControlCapabilities2.getButtonCapabilities()) )){
+        if (!(validateButtonCapabilities(remoteControlCapabilities1.getButtonCapabilities(), remoteControlCapabilities2.getButtonCapabilities()))) {
             return false;
         }
 
-        if(!( validateRadioControlCapabilities(remoteControlCapabilities1.getRadioControlCapabilities(), remoteControlCapabilities2.getRadioControlCapabilities()) )){
+        if (!(validateRadioControlCapabilities(remoteControlCapabilities1.getRadioControlCapabilities(), remoteControlCapabilities2.getRadioControlCapabilities()))) {
             return false;
         }
 
-        if(!( validateClimateControlCapabilities(remoteControlCapabilities1.getClimateControlCapabilities(), remoteControlCapabilities2.getClimateControlCapabilities()) )){
+        if (!(validateClimateControlCapabilities(remoteControlCapabilities1.getClimateControlCapabilities(), remoteControlCapabilities2.getClimateControlCapabilities()))) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateRadioControlData(RadioControlData radioControlData1, RadioControlData radioControlData2){
-        if(radioControlData1 == null){
-            return ( radioControlData2 == null );
+    public static boolean validateRadioControlData(RadioControlData radioControlData1, RadioControlData radioControlData2) {
+        if (radioControlData1 == null) {
+            return (radioControlData2 == null);
         }
-        if(radioControlData2 == null){
-            return ( radioControlData1 == null );
+        if (radioControlData2 == null) {
+            return (radioControlData1 == null);
         }
 
-        if(radioControlData1.getFrequencyInteger() != radioControlData2.getFrequencyInteger()){
+        if (radioControlData1.getFrequencyInteger() != radioControlData2.getFrequencyInteger()) {
             log("validateRadioControlData",
                     "FrequencyInteger " + radioControlData1.getFrequencyInteger() + " didn't match FrequencyInteger " + radioControlData2.getFrequencyInteger()
                             + ".");
             return false;
         }
 
-        if(radioControlData1.getFrequencyFraction() != radioControlData2.getFrequencyFraction()){
+        if (radioControlData1.getFrequencyFraction() != radioControlData2.getFrequencyFraction()) {
             log("validateRadioControlData",
                     "FrequencyFraction " + radioControlData1.getFrequencyFraction() + " didn't match FrequencyFraction " + radioControlData2.getFrequencyFraction()
                             + ".");
             return false;
         }
 
-        if(radioControlData1.getBand() != radioControlData2.getBand()){
+        if (radioControlData1.getBand() != radioControlData2.getBand()) {
             log("validateRadioControlData",
                     "Band " + radioControlData1.getBand() + " didn't match Band " + radioControlData2.getBand()
                             + ".");
             return false;
         }
 
-        if(!( validateRdsData(radioControlData1.getRdsData(), radioControlData2.getRdsData()) )){
+        if (!(validateRdsData(radioControlData1.getRdsData(), radioControlData2.getRdsData()))) {
             return false;
         }
 
-        if(radioControlData1.getAvailableHDs() != radioControlData2.getAvailableHDs()){
+        if (radioControlData1.getAvailableHDs() != radioControlData2.getAvailableHDs()) {
             log("validateRadioControlData",
                     "AvailableHDs " + radioControlData1.getAvailableHDs() + " didn't match AvailableHDs " + radioControlData2.getAvailableHDs()
                             + ".");
             return false;
         }
 
-        if(radioControlData1.getHdChannel() != radioControlData2.getHdChannel()){
+        if (radioControlData1.getHdChannel() != radioControlData2.getHdChannel()) {
             log("validateRadioControlData",
                     "HdChannel " + radioControlData1.getHdChannel() + " didn't match HdChannel " + radioControlData2.getHdChannel()
                             + ".");
             return false;
         }
 
-        if(radioControlData1.getSignalStrength() != radioControlData2.getSignalStrength()){
+        if (radioControlData1.getSignalStrength() != radioControlData2.getSignalStrength()) {
             log("validateRadioControlData",
                     "SignalStrength " + radioControlData1.getSignalStrength() + " didn't match SignalStrength " + radioControlData2.getSignalStrength()
                             + ".");
             return false;
         }
 
-        if(radioControlData1.getSignalChangeThreshold() != radioControlData2.getSignalChangeThreshold()){
+        if (radioControlData1.getSignalChangeThreshold() != radioControlData2.getSignalChangeThreshold()) {
             log("validateRadioControlData",
                     "SignalChangeThreshold " + radioControlData1.getSignalChangeThreshold() + " didn't match SignalChangeThreshold " + radioControlData2.getSignalChangeThreshold()
                             + ".");
             return false;
         }
 
-        if(radioControlData1.getRadioEnable() != radioControlData2.getRadioEnable()){
+        if (radioControlData1.getRadioEnable() != radioControlData2.getRadioEnable()) {
             log("validateRadioControlData",
                     "RadioEnable " + radioControlData1.getRadioEnable() + " didn't match RadioEnable " + radioControlData2.getRadioEnable()
                             + ".");
             return false;
         }
 
-        if(radioControlData1.getState() != radioControlData2.getState()){
+        if (radioControlData1.getState() != radioControlData2.getState()) {
             log("validateRadioControlData",
                     "State " + radioControlData1.getState() + " didn't match State " + radioControlData2.getState()
                             + ".");
@@ -1275,22 +1277,22 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateNavigationCapability(NavigationCapability navigationCapability1, NavigationCapability navigationCapability2){
-        if(navigationCapability1 == null){
-            return ( navigationCapability2 == null );
+    public static boolean validateNavigationCapability(NavigationCapability navigationCapability1, NavigationCapability navigationCapability2) {
+        if (navigationCapability1 == null) {
+            return (navigationCapability2 == null);
         }
-        if(navigationCapability2 == null){
-            return ( navigationCapability1 == null );
+        if (navigationCapability2 == null) {
+            return (navigationCapability1 == null);
         }
 
-        if(navigationCapability1.getSendLocationEnabled() != navigationCapability2.getSendLocationEnabled()){
+        if (navigationCapability1.getSendLocationEnabled() != navigationCapability2.getSendLocationEnabled()) {
             log("validateNavigationCapability",
                     "SendLocationEnabled " + navigationCapability1.getSendLocationEnabled() + " didn't match SendLocationEnabled " + navigationCapability2.getSendLocationEnabled()
                             + ".");
             return false;
         }
 
-        if(navigationCapability1.getWayPointsEnabled() != navigationCapability2.getWayPointsEnabled()){
+        if (navigationCapability1.getWayPointsEnabled() != navigationCapability2.getWayPointsEnabled()) {
             log("validateNavigationCapability",
                     "WayPointsEnabled " + navigationCapability1.getWayPointsEnabled() + " didn't match WayPointsEnabled " + navigationCapability2.getWayPointsEnabled() + ".");
             return false;
@@ -1324,15 +1326,15 @@ public class Validator{
         return true;
     }
 
-    public static boolean validatePhoneCapability(PhoneCapability phoneCapability1, PhoneCapability phoneCapability2){
-        if(phoneCapability1 == null){
-            return ( phoneCapability2 == null );
+    public static boolean validatePhoneCapability(PhoneCapability phoneCapability1, PhoneCapability phoneCapability2) {
+        if (phoneCapability1 == null) {
+            return (phoneCapability2 == null);
         }
-        if(phoneCapability2 == null){
-            return ( phoneCapability1 == null );
+        if (phoneCapability2 == null) {
+            return (phoneCapability1 == null);
         }
 
-        if(phoneCapability1.getDialNumberEnabled() != phoneCapability2.getDialNumberEnabled()){
+        if (phoneCapability1.getDialNumberEnabled() != phoneCapability2.getDialNumberEnabled()) {
             log("validatePhoneCapability",
                     "DialNumberEnabled " + phoneCapability1.getDialNumberEnabled() + " didn't match DialNumberEnabled " + phoneCapability1.getDialNumberEnabled()
                             + ".");
@@ -1342,27 +1344,27 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateTouchEventCapabilities(TouchEventCapabilities item1, TouchEventCapabilities item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateTouchEventCapabilities(TouchEventCapabilities item1, TouchEventCapabilities item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getPressAvailable() != item2.getPressAvailable()){
+        if (item1.getPressAvailable() != item2.getPressAvailable()) {
             log("validateTouchEventCapabilities", "Press available \"" + item1.getPressAvailable()
                     + "\" didn't match press available \"" + item1.getPressAvailable() + "\".");
             return false;
         }
 
-        if(item1.getDoublePressAvailable() != item2.getDoublePressAvailable()){
+        if (item1.getDoublePressAvailable() != item2.getDoublePressAvailable()) {
             log("validateTouchEventCapabilities", "Double press available \"" + item1.getDoublePressAvailable()
                     + "\" didn't match double press available \"" + item1.getDoublePressAvailable() + "\".");
             return false;
         }
 
-        if(item1.getMultiTouchAvailable() != item2.getMultiTouchAvailable()){
+        if (item1.getMultiTouchAvailable() != item2.getMultiTouchAvailable()) {
             log("validateTouchEventCapabilities", "Multi-touch available \"" + item1.getMultiTouchAvailable()
                     + "\" didn't match multi-touch available \"" + item1.getMultiTouchAvailable() + "\".");
             return false;
@@ -1371,72 +1373,72 @@ public class Validator{
         return true;
     }
 
-	public static boolean validateSeatMemoryAction(SeatMemoryAction item1, SeatMemoryAction item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
+    public static boolean validateSeatMemoryAction(SeatMemoryAction item1, SeatMemoryAction item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-		if (item1.getAction() == null) {
-			return (item2.getAction() == null);
-		}
+        if (item1.getAction() == null) {
+            return (item2.getAction() == null);
+        }
 
-		if (item1.getAction() != item2.getAction()) {
-			return false;
-		}
+        if (item1.getAction() != item2.getAction()) {
+            return false;
+        }
 
-		if (item1.getId() != item2.getId()) {
-			return false;
-		}
+        if (item1.getId() != item2.getId()) {
+            return false;
+        }
 
-		if (item1.getLabel() != item2.getLabel()) {
-			return false;
-		}
+        if (item1.getLabel() != item2.getLabel()) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-    public static boolean validateTextFields(TextField item1, TextField item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateTextFields(TextField item1, TextField item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
 
-        if(item1.getCharacterSet() != item2.getCharacterSet()){
+        if (item1.getCharacterSet() != item2.getCharacterSet()) {
             return false;
         }
-        if(item1.getName() != item2.getName()){
+        if (item1.getName() != item2.getName()) {
             return false;
         }
-        if(item1.getRows() != item2.getRows()){
+        if (item1.getRows() != item2.getRows()) {
             return false;
         }
-        if(item1.getWidth() != item2.getWidth()){
+        if (item1.getWidth() != item2.getWidth()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateImageFields(ImageField item1, ImageField item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateImageFields(ImageField item1, ImageField item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
-        if(! (validateFileTypes(item1.getImageTypeSupported(), item2.getImageTypeSupported()) )){
+        if (!(validateFileTypes(item1.getImageTypeSupported(), item2.getImageTypeSupported()))) {
             return false;
         }
-        if(item1.getName() != item2.getName()){
+        if (item1.getName() != item2.getName()) {
             return false;
         }
-        if(!( validateImageResolution(item1.getImageResolution(), item2.getImageResolution()) )){
+        if (!(validateImageResolution(item1.getImageResolution(), item2.getImageResolution()))) {
             return false;
         }
 
@@ -1465,314 +1467,314 @@ public class Validator{
 
         return true;
     }
-    
-    public static boolean validateFileTypes (List<FileType> item1, List<FileType> item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.size() != item2.size()) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < item1.size(); i++) {
-    		if (item1.get(i) != item2.get(i)) {
-    			return false;
-    		}
-    	}
-    	
-    	return true;
-    }
-
-	public static boolean validateWeatherDataList(List<WeatherData> item1Array, List<WeatherData> item2Array) {
-		if(item1Array.size() != item2Array.size()){
-			return false;
-		}
-
-		for(int i = 0; i < item1Array.size(); i++){
-			if(!validateWeatherData(item1Array.get(i), item2Array.get(i))){
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public static boolean validateWeatherData(WeatherData item1, WeatherData item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (!validateTemperature(item1.getCurrentTemperature(), item2.getCurrentTemperature())) {
-			return false;
-		}
-
-		if (!validateTemperature(item1.getTemperatureHigh(), item2.getTemperatureHigh())) {
-			return false;
-		}
-
-		if (!validateTemperature(item1.getTemperatureLow(), item2.getTemperatureLow())) {
-			return false;
-		}
-
-		if (!validateTemperature(item1.getApparentTemperature(), item2.getApparentTemperature())) {
-			return false;
-		}
-
-		if (!validateTemperature(item1.getApparentTemperatureHigh(), item2.getApparentTemperatureHigh())) {
-			return false;
-		}
-
-		if (!validateTemperature(item1.getApparentTemperatureLow(), item2.getApparentTemperatureLow())) {
-			return false;
-		}
-
-		if (!item1.getWeatherSummary().equals(item2.getWeatherSummary())) {
-			return false;
-		}
-
-		if (!validateDateTime(item1.getTime(), item2.getTime())) {
-			return false;
-		}
-
-		if (!item1.getHumidity().equals(item2.getHumidity())) {
-			return false;
-		}
-
-		if (!item1.getCloudCover().equals(item2.getCloudCover())) {
-			return false;
-		}
-
-		if (!item1.getMoonPhase().equals(item2.getMoonPhase())) {
-			return false;
-		}
-
-		if (!item1.getWindBearing().equals(item2.getWindBearing())) {
-			return false;
-		}
-
-		if (!item1.getWindGust().equals(item2.getWindGust())) {
-			return false;
-		}
-
-		if (!item1.getWindSpeed().equals(item2.getWindSpeed())) {
-			return false;
-		}
-
-		if (!item1.getNearestStormBearing().equals(item2.getNearestStormBearing())) {
-			return false;
-		}
-
-		if (!item1.getNearestStormDistance().equals(item2.getNearestStormDistance())) {
-			return false;
-		}
-
-		if (!item1.getPrecipAccumulation().equals(item2.getPrecipAccumulation())) {
-			return false;
-		}
-
-		if (!item1.getPrecipIntensity().equals(item2.getPrecipIntensity())) {
-			return false;
-		}
-
-		if (!item1.getPrecipProbability().equals(item2.getPrecipProbability())) {
-			return false;
-		}
-
-		if (!item1.getPrecipType().equals(item2.getPrecipType())) {
-			return false;
-		}
-
-		if (!item1.getVisibility().equals(item2.getVisibility())) {
-			return false;
-		}
-
-		if (!validateImage(item1.getWeatherIcon(), item2.getWeatherIcon())) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateWeatherAlertList(List<WeatherAlert> item1Array, List<WeatherAlert> item2Array) {
-		if(item1Array.size() != item2Array.size()){
-			return false;
-		}
 
-		for(int i = 0; i < item1Array.size(); i++){
-			if(!validateWeatherAlert(item1Array.get(i), item2Array.get(i))){
-				return false;
-			}
-		}
-		return true;
-	}
+    public static boolean validateFileTypes(List<FileType> item1, List<FileType> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (item1.get(i) != item2.get(i)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateWeatherDataList(List<WeatherData> item1Array, List<WeatherData> item2Array) {
+        if (item1Array.size() != item2Array.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1Array.size(); i++) {
+            if (!validateWeatherData(item1Array.get(i), item2Array.get(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean validateWeatherData(WeatherData item1, WeatherData item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
 
-	public static boolean validateNavigationInstructionList(List<NavigationInstruction> item1Array, List<NavigationInstruction> item2Array) {
-        if (item1Array == null && item2Array == null){
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (!validateTemperature(item1.getCurrentTemperature(), item2.getCurrentTemperature())) {
+            return false;
+        }
+
+        if (!validateTemperature(item1.getTemperatureHigh(), item2.getTemperatureHigh())) {
+            return false;
+        }
+
+        if (!validateTemperature(item1.getTemperatureLow(), item2.getTemperatureLow())) {
+            return false;
+        }
+
+        if (!validateTemperature(item1.getApparentTemperature(), item2.getApparentTemperature())) {
+            return false;
+        }
+
+        if (!validateTemperature(item1.getApparentTemperatureHigh(), item2.getApparentTemperatureHigh())) {
+            return false;
+        }
+
+        if (!validateTemperature(item1.getApparentTemperatureLow(), item2.getApparentTemperatureLow())) {
+            return false;
+        }
+
+        if (!item1.getWeatherSummary().equals(item2.getWeatherSummary())) {
+            return false;
+        }
+
+        if (!validateDateTime(item1.getTime(), item2.getTime())) {
+            return false;
+        }
+
+        if (!item1.getHumidity().equals(item2.getHumidity())) {
+            return false;
+        }
+
+        if (!item1.getCloudCover().equals(item2.getCloudCover())) {
+            return false;
+        }
+
+        if (!item1.getMoonPhase().equals(item2.getMoonPhase())) {
+            return false;
+        }
+
+        if (!item1.getWindBearing().equals(item2.getWindBearing())) {
+            return false;
+        }
+
+        if (!item1.getWindGust().equals(item2.getWindGust())) {
+            return false;
+        }
+
+        if (!item1.getWindSpeed().equals(item2.getWindSpeed())) {
+            return false;
+        }
+
+        if (!item1.getNearestStormBearing().equals(item2.getNearestStormBearing())) {
+            return false;
+        }
+
+        if (!item1.getNearestStormDistance().equals(item2.getNearestStormDistance())) {
+            return false;
+        }
+
+        if (!item1.getPrecipAccumulation().equals(item2.getPrecipAccumulation())) {
+            return false;
+        }
+
+        if (!item1.getPrecipIntensity().equals(item2.getPrecipIntensity())) {
+            return false;
+        }
+
+        if (!item1.getPrecipProbability().equals(item2.getPrecipProbability())) {
+            return false;
+        }
+
+        if (!item1.getPrecipType().equals(item2.getPrecipType())) {
+            return false;
+        }
+
+        if (!item1.getVisibility().equals(item2.getVisibility())) {
+            return false;
+        }
+
+        if (!validateImage(item1.getWeatherIcon(), item2.getWeatherIcon())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateWeatherAlertList(List<WeatherAlert> item1Array, List<WeatherAlert> item2Array) {
+        if (item1Array.size() != item2Array.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1Array.size(); i++) {
+            if (!validateWeatherAlert(item1Array.get(i), item2Array.get(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean validateNavigationInstructionList(List<NavigationInstruction> item1Array, List<NavigationInstruction> item2Array) {
+        if (item1Array == null && item2Array == null) {
             return true;
         }
 
-        if (item1Array == null || item2Array == null){
+        if (item1Array == null || item2Array == null) {
             return false;
         }
 
-		if(item1Array.size() != item2Array.size()){
-			return false;
-		}
+        if (item1Array.size() != item2Array.size()) {
+            return false;
+        }
 
-		for(int i = 0; i < item1Array.size(); i++){
-			if(!validateNavigationInstruction(item1Array.get(i), item2Array.get(i))){
-				return false;
-			}
-		}
-		return true;
-	}
+        for (int i = 0; i < item1Array.size(); i++) {
+            if (!validateNavigationInstruction(item1Array.get(i), item2Array.get(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-	public static boolean validateNavigationInstruction(NavigationInstruction item1, NavigationInstruction item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
+    public static boolean validateNavigationInstruction(NavigationInstruction item1, NavigationInstruction item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
 
-		if (item2 == null) {
-			return (item1 == null);
-		}
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-		if (!validateLocationDetails(item1.getLocationDetails(),item2.getLocationDetails())) {
-			return false;
-		}
+        if (!validateLocationDetails(item1.getLocationDetails(), item2.getLocationDetails())) {
+            return false;
+        }
 
-		if (!item1.getAction().equals(item2.getAction())) {
-			return false;
-		}
+        if (!item1.getAction().equals(item2.getAction())) {
+            return false;
+        }
 
-		if (!validateDateTime(item1.getEta(),item2.getEta())) {
-			return false;
-		}
+        if (!validateDateTime(item1.getEta(), item2.getEta())) {
+            return false;
+        }
 
-		if (!item1.getBearing().equals(item2.getBearing())) {
-			return false;
-		}
+        if (!item1.getBearing().equals(item2.getBearing())) {
+            return false;
+        }
 
-		if (!item1.getJunctionType().equals(item2.getJunctionType())) {
-			return false;
-		}
+        if (!item1.getJunctionType().equals(item2.getJunctionType())) {
+            return false;
+        }
 
-		if (!item1.getDrivingSide().equals(item2.getDrivingSide())) {
-			return false;
-		}
+        if (!item1.getDrivingSide().equals(item2.getDrivingSide())) {
+            return false;
+        }
 
-		if (!item1.getDetails().equals(item2.getDetails())) {
-			return false;
-		}
+        if (!item1.getDetails().equals(item2.getDetails())) {
+            return false;
+        }
 
-		if (!validateImage(item1.getImage(),item2.getImage())) {
-			return false;
-		}
+        if (!validateImage(item1.getImage(), item2.getImage())) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public static boolean validateMediaServiceData(MediaServiceData item1, MediaServiceData item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
+    public static boolean validateMediaServiceData(MediaServiceData item1, MediaServiceData item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
 
-		if (item2 == null) {
-			return (item1 == null);
-		}
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-		if (!item1.getMediaType().equals(item2.getMediaType())) {
-			return false;
-		}
+        if (!item1.getMediaType().equals(item2.getMediaType())) {
+            return false;
+        }
 
-		if (!item1.getMediaTitle().equals(item2.getMediaTitle())) {
-			return false;
-		}
+        if (!item1.getMediaTitle().equals(item2.getMediaTitle())) {
+            return false;
+        }
 
-		if (!item1.getMediaArtist().equals(item2.getMediaArtist())) {
-			return false;
-		}
+        if (!item1.getMediaArtist().equals(item2.getMediaArtist())) {
+            return false;
+        }
 
-		if (!item1.getMediaAlbum().equals(item2.getMediaAlbum())) {
-			return false;
-		}
+        if (!item1.getMediaAlbum().equals(item2.getMediaAlbum())) {
+            return false;
+        }
 
-		if (!item1.getPlaylistName().equals(item2.getPlaylistName())) {
-			return false;
-		}
+        if (!item1.getPlaylistName().equals(item2.getPlaylistName())) {
+            return false;
+        }
 
-		if (!item1.getIsExplicit().equals(item2.getIsExplicit())) {
-			return false;
-		}
+        if (!item1.getIsExplicit().equals(item2.getIsExplicit())) {
+            return false;
+        }
 
-		if (!item1.getTrackPlaybackProgress().equals(item2.getTrackPlaybackProgress())) {
-			return false;
-		}
+        if (!item1.getTrackPlaybackProgress().equals(item2.getTrackPlaybackProgress())) {
+            return false;
+        }
 
-		if (!item1.getTrackPlaybackDuration().equals(item2.getTrackPlaybackDuration())) {
-			return false;
-		}
+        if (!item1.getTrackPlaybackDuration().equals(item2.getTrackPlaybackDuration())) {
+            return false;
+        }
 
-		if (!item1.getQueuePlaybackProgress().equals(item2.getQueuePlaybackProgress())) {
-			return false;
-		}
-
-		if (!item1.getQueueCurrentTrackNumber().equals(item2.getQueueCurrentTrackNumber())) {
-			return false;
-		}
-
-		if (!item1.getQueuePlaybackDuration().equals(item2.getQueuePlaybackDuration())) {
-			return false;
-		}
+        if (!item1.getQueuePlaybackProgress().equals(item2.getQueuePlaybackProgress())) {
+            return false;
+        }
 
-		if (!item1.getQueueTotalTrackCount().equals(item2.getQueueTotalTrackCount())) {
-			return false;
-		}
+        if (!item1.getQueueCurrentTrackNumber().equals(item2.getQueueCurrentTrackNumber())) {
+            return false;
+        }
 
-		return true;
-	}
+        if (!item1.getQueuePlaybackDuration().equals(item2.getQueuePlaybackDuration())) {
+            return false;
+        }
 
-	public static boolean validateWeatherServiceData(WeatherServiceData item1, WeatherServiceData item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
+        if (!item1.getQueueTotalTrackCount().equals(item2.getQueueTotalTrackCount())) {
+            return false;
+        }
 
-		if (item2 == null) {
-			return (item1 == null);
-		}
+        return true;
+    }
 
-		if (!validateLocationDetails(item1.getLocation(), item2.getLocation())) {
-			return false;
-		}
+    public static boolean validateWeatherServiceData(WeatherServiceData item1, WeatherServiceData item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
 
-		if (!validateWeatherData(item1.getCurrentForecast(), item2.getCurrentForecast())) {
-			return false;
-		}
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-		if (!validateWeatherDataList(item1.getHourlyForecast(), item2.getHourlyForecast())) {
-			return false;
-		}
+        if (!validateLocationDetails(item1.getLocation(), item2.getLocation())) {
+            return false;
+        }
 
-		if (!validateWeatherDataList(item1.getMinuteForecast(), item2.getMinuteForecast())) {
-			return false;
-		}
+        if (!validateWeatherData(item1.getCurrentForecast(), item2.getCurrentForecast())) {
+            return false;
+        }
 
-		if (!validateWeatherDataList(item1.getMultidayForecast(), item2.getMultidayForecast())) {
-			return false;
-		}
+        if (!validateWeatherDataList(item1.getHourlyForecast(), item2.getHourlyForecast())) {
+            return false;
+        }
 
-		if (!validateWeatherAlertList(item1.getAlerts(), item2.getAlerts())) {
-			return false;
-		}
+        if (!validateWeatherDataList(item1.getMinuteForecast(), item2.getMinuteForecast())) {
+            return false;
+        }
 
-		return true;
-	}
+        if (!validateWeatherDataList(item1.getMultidayForecast(), item2.getMultidayForecast())) {
+            return false;
+        }
+
+        if (!validateWeatherAlertList(item1.getAlerts(), item2.getAlerts())) {
+            return false;
+        }
+
+        return true;
+    }
 
     public static boolean validateNavigationServiceData(NavigationServiceData item1, NavigationServiceData item2) {
         if (item1 == null) {
@@ -1811,7 +1813,7 @@ public class Validator{
             return false;
         }
 
-        if (item1.getNextInstructionDistanceScale() != null && item2.getNextInstructionDistanceScale() != null  && !item1.getNextInstructionDistanceScale().equals(item2.getNextInstructionDistanceScale())) {
+        if (item1.getNextInstructionDistanceScale() != null && item2.getNextInstructionDistanceScale() != null && !item1.getNextInstructionDistanceScale().equals(item2.getNextInstructionDistanceScale())) {
             return false;
         }
 
@@ -1822,495 +1824,495 @@ public class Validator{
         return true;
     }
 
-	public static boolean validateWeatherAlert(WeatherAlert item1, WeatherAlert item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
+    public static boolean validateWeatherAlert(WeatherAlert item1, WeatherAlert item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
 
-		if (item2 == null) {
-			return (item1 == null);
-		}
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-		if (!validateDateTime(item1.getExpires(), item2.getExpires())) {
-			return false;
-		}
+        if (!validateDateTime(item1.getExpires(), item2.getExpires())) {
+            return false;
+        }
 
-		if (!validateDateTime(item1.getTimeIssued(), item2.getTimeIssued())) {
-			return false;
-		}
+        if (!validateDateTime(item1.getTimeIssued(), item2.getTimeIssued())) {
+            return false;
+        }
 
-		if (!item1.getTitle().equals(item2.getTitle())) {
-			return false;
-		}
+        if (!item1.getTitle().equals(item2.getTitle())) {
+            return false;
+        }
 
-		if (!item1.getSummary().equals(item2.getSummary())) {
-			return false;
-		}
+        if (!item1.getSummary().equals(item2.getSummary())) {
+            return false;
+        }
 
-		if (!item1.getSeverity().equals(item2.getSeverity())) {
-			return false;
-		}
+        if (!item1.getSeverity().equals(item2.getSeverity())) {
+            return false;
+        }
 
-		if (!validateStringList(item1.getRegions(), item2.getRegions())) {
-			return false;
-		}
+        if (!validateStringList(item1.getRegions(), item2.getRegions())) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public static boolean validateDateTime(DateTime item1, DateTime item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
+    public static boolean validateDateTime(DateTime item1, DateTime item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
 
-		if (item2 == null) {
-			return (item1 == null);
-		}
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-		if(item1.getDay() != item2.getDay()){
-			return false;
-		}
+        if (item1.getDay() != item2.getDay()) {
+            return false;
+        }
 
-		if(item1.getHour() != item2.getHour()){
-			return false;
-		}
+        if (item1.getHour() != item2.getHour()) {
+            return false;
+        }
 
-		if(item1.getMilliSecond() != item2.getMilliSecond()){
-			return false;
-		}
+        if (item1.getMilliSecond() != item2.getMilliSecond()) {
+            return false;
+        }
 
-		if(item1.getMinute() != item2.getMinute()){
-			return false;
-		}
+        if (item1.getMinute() != item2.getMinute()) {
+            return false;
+        }
 
-		if(item1.getMonth() != item2.getMonth()){
-			return false;
-		}
+        if (item1.getMonth() != item2.getMonth()) {
+            return false;
+        }
 
-		if(item1.getSecond() != item2.getSecond()){
-			return false;
-		}
+        if (item1.getSecond() != item2.getSecond()) {
+            return false;
+        }
 
-		if(item1.getTzHour() != item2.getTzHour()){
-			return false;
-		}
+        if (item1.getTzHour() != item2.getTzHour()) {
+            return false;
+        }
 
-		if(item1.getTzMinute() != item2.getTzMinute()){
-			return false;
-		}
+        if (item1.getTzMinute() != item2.getTzMinute()) {
+            return false;
+        }
 
-		if(item1.getYear() != item2.getYear()){
-			return false;
-		}
+        if (item1.getYear() != item2.getYear()) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-    public static boolean validateGpsData(GPSData item1, GPSData item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateGpsData(GPSData item1, GPSData item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getActual() != item2.getActual()){
+        if (item1.getActual() != item2.getActual()) {
             return false;
         }
-        if(item1.getAltitude() != item2.getAltitude()){
+        if (item1.getAltitude() != item2.getAltitude()) {
             return false;
         }
-        if(item1.getCompassDirection() != item2.getCompassDirection()){
+        if (item1.getCompassDirection() != item2.getCompassDirection()) {
             return false;
         }
-        if(item1.getDimension() != item2.getDimension()){
+        if (item1.getDimension() != item2.getDimension()) {
             return false;
         }
-        if(item1.getHdop() != item2.getHdop()){
+        if (item1.getHdop() != item2.getHdop()) {
             return false;
         }
-        if(item1.getHeading() != item2.getHeading()){
+        if (item1.getHeading() != item2.getHeading()) {
             return false;
         }
-        if(item1.getLatitudeDegrees() != item2.getLatitudeDegrees()){
+        if (item1.getLatitudeDegrees() != item2.getLatitudeDegrees()) {
             return false;
         }
-        if(item1.getLongitudeDegrees() != item2.getLongitudeDegrees()){
+        if (item1.getLongitudeDegrees() != item2.getLongitudeDegrees()) {
             return false;
         }
-        if(item1.getPdop() != item2.getPdop()){
+        if (item1.getPdop() != item2.getPdop()) {
             return false;
         }
-        if(item1.getSatellites() != item2.getSatellites()){
+        if (item1.getSatellites() != item2.getSatellites()) {
             return false;
         }
-        if(item1.getSpeed() != item2.getSpeed()){
+        if (item1.getSpeed() != item2.getSpeed()) {
             return false;
         }
-        if(item1.getUtcDay() != item2.getUtcDay()){
+        if (item1.getUtcDay() != item2.getUtcDay()) {
             return false;
         }
-        if(item1.getUtcHours() != item2.getUtcHours()){
+        if (item1.getUtcHours() != item2.getUtcHours()) {
             return false;
         }
-        if(item1.getUtcMinutes() != item1.getUtcMinutes()){
+        if (item1.getUtcMinutes() != item1.getUtcMinutes()) {
             return false;
         }
-        if(item1.getUtcMonth() != item2.getUtcMonth()){
+        if (item1.getUtcMonth() != item2.getUtcMonth()) {
             return false;
         }
-        if(item1.getUtcSeconds() != item2.getUtcSeconds()){
+        if (item1.getUtcSeconds() != item2.getUtcSeconds()) {
             return false;
         }
-        if(item1.getUtcYear() != item2.getUtcYear()){
+        if (item1.getUtcYear() != item2.getUtcYear()) {
             return false;
         }
-        if(item1.getVdop() != item2.getVdop()){
+        if (item1.getVdop() != item2.getVdop()) {
             return false;
         }
-        if(item1.getShifted() != item2.getShifted()){
+        if (item1.getShifted() != item2.getShifted()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateTireStatus(TireStatus item1, TireStatus item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateTireStatus(TireStatus item1, TireStatus item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );                
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getPressureTellTale() != item2.getPressureTellTale()){
+        if (item1.getPressureTellTale() != item2.getPressureTellTale()) {
             return false;
         }
-        
+
         SingleTireStatus item1Status = item1.getLeftFront();
         SingleTireStatus item2Status = item2.getLeftFront();
         boolean isEqual = validateSingleTireStatus(item1Status, item2Status);
-        if(!isEqual) return false;
+        if (!isEqual) return false;
         item1Status = item1.getRightFront();
         item2Status = item2.getRightFront();
         isEqual = validateSingleTireStatus(item1Status, item2Status);
-        if(!isEqual) return false;
+        if (!isEqual) return false;
         item1Status = item1.getLeftRear();
         item2Status = item2.getLeftRear();
         isEqual = validateSingleTireStatus(item1Status, item2Status);
-        if(!isEqual) return false;
+        if (!isEqual) return false;
         item1Status = item1.getRightRear();
         item2Status = item2.getRightRear();
         isEqual = validateSingleTireStatus(item1Status, item2Status);
-        if(!isEqual) return false;
+        if (!isEqual) return false;
         item1Status = item1.getInnerLeftRear();
         item2Status = item2.getInnerLeftRear();
         isEqual = validateSingleTireStatus(item1Status, item2Status);
-        if(!isEqual) return false;
+        if (!isEqual) return false;
         item1Status = item1.getInnerRightRear();
         item2Status = item2.getInnerRightRear();
         isEqual = validateSingleTireStatus(item1Status, item2Status);
-        if(!isEqual) return false;
-        
+        if (!isEqual) return false;
+
         return true;
     }
 
-    public static boolean validateSingleTireStatus(SingleTireStatus item1, SingleTireStatus item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateSingleTireStatus(SingleTireStatus item1, SingleTireStatus item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getStatus() != item2.getStatus()){
+        if (item1.getStatus() != item2.getStatus()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateBeltStatus(BeltStatus item1, BeltStatus item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateBeltStatus(BeltStatus item1, BeltStatus item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getLeftRearInflatableBelted() != item2.getLeftRearInflatableBelted()){
+        if (item1.getLeftRearInflatableBelted() != item2.getLeftRearInflatableBelted()) {
             return false;
         }
-        if(item1.getRightRearInflatableBelted() != item2.getRightRearInflatableBelted()){
+        if (item1.getRightRearInflatableBelted() != item2.getRightRearInflatableBelted()) {
             return false;
         }
-        if(item1.getPassengerChildDetected() != item2.getPassengerChildDetected()){
+        if (item1.getPassengerChildDetected() != item2.getPassengerChildDetected()) {
             return false;
         }
-        if(item1.getDriverBuckleBelted() != item2.getDriverBuckleBelted()){
+        if (item1.getDriverBuckleBelted() != item2.getDriverBuckleBelted()) {
             return false;
         }
-        if(item1.getPassengerBuckleBelted() != item2.getPassengerBuckleBelted()){
+        if (item1.getPassengerBuckleBelted() != item2.getPassengerBuckleBelted()) {
             return false;
         }
-        if(item1.getRightRow2BuckleBelted() != item2.getRightRow2BuckleBelted()){
+        if (item1.getRightRow2BuckleBelted() != item2.getRightRow2BuckleBelted()) {
             return false;
         }
-        if(item1.getMiddleRow1BuckleBelted() != item2.getMiddleRow1BuckleBelted()){
+        if (item1.getMiddleRow1BuckleBelted() != item2.getMiddleRow1BuckleBelted()) {
             return false;
         }
-        if(item1.getLeftRow2BuckleBelted() != item2.getLeftRow2BuckleBelted()){
+        if (item1.getLeftRow2BuckleBelted() != item2.getLeftRow2BuckleBelted()) {
             return false;
         }
-        if(item1.getMiddleRow2BuckleBelted() != item2.getMiddleRow2BuckleBelted()){
+        if (item1.getMiddleRow2BuckleBelted() != item2.getMiddleRow2BuckleBelted()) {
             return false;
         }
-        if(item1.getMiddleRow3BuckleBelted() != item2.getMiddleRow3BuckleBelted()){
+        if (item1.getMiddleRow3BuckleBelted() != item2.getMiddleRow3BuckleBelted()) {
             return false;
         }
-        if(item1.getLeftRow3BuckleBelted() != item2.getLeftRow3BuckleBelted()){
+        if (item1.getLeftRow3BuckleBelted() != item2.getLeftRow3BuckleBelted()) {
             return false;
         }
-        if(item1.getRightRow3BuckleBelted() != item2.getRightRow3BuckleBelted()){
+        if (item1.getRightRow3BuckleBelted() != item2.getRightRow3BuckleBelted()) {
             return false;
         }
-        if(item1.getPassengerBeltDeployed() != item2.getPassengerBeltDeployed()){
+        if (item1.getPassengerBeltDeployed() != item2.getPassengerBeltDeployed()) {
             return false;
         }
-        if(item1.getMiddleRow1BeltDeployed() != item2.getMiddleRow1BeltDeployed()){
+        if (item1.getMiddleRow1BeltDeployed() != item2.getMiddleRow1BeltDeployed()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateBodyInformation(BodyInformation item1, BodyInformation item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateBodyInformation(BodyInformation item1, BodyInformation item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getIgnitionStatus() != item2.getIgnitionStatus()){
+        if (item1.getIgnitionStatus() != item2.getIgnitionStatus()) {
             return false;
         }
-        if(item1.getIgnitionStableStatus() != item2.getIgnitionStableStatus()){
+        if (item1.getIgnitionStableStatus() != item2.getIgnitionStableStatus()) {
             return false;
         }
-        if(item1.getParkBrakeActive() != item2.getParkBrakeActive()){
+        if (item1.getParkBrakeActive() != item2.getParkBrakeActive()) {
             return false;
         }
-        if(item1.getDriverDoorAjar() != item2.getDriverDoorAjar()){
+        if (item1.getDriverDoorAjar() != item2.getDriverDoorAjar()) {
             return false;
         }
-        if(item1.getPassengerDoorAjar() != item2.getPassengerDoorAjar()){
+        if (item1.getPassengerDoorAjar() != item2.getPassengerDoorAjar()) {
             return false;
         }
-        if(item1.getRearLeftDoorAjar() != item2.getRearLeftDoorAjar()){
+        if (item1.getRearLeftDoorAjar() != item2.getRearLeftDoorAjar()) {
             return false;
         }
-        if(item1.getRearRightDoorAjar() != item2.getRearRightDoorAjar()){
+        if (item1.getRearRightDoorAjar() != item2.getRearRightDoorAjar()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateDeviceStatus(DeviceStatus item1, DeviceStatus item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateDeviceStatus(DeviceStatus item1, DeviceStatus item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getBtIconOn() != item2.getBtIconOn()){
+        if (item1.getBtIconOn() != item2.getBtIconOn()) {
             return false;
         }
-        if(item1.getCallActive() != item2.getCallActive()){
+        if (item1.getCallActive() != item2.getCallActive()) {
             return false;
         }
-        if(item1.getECallEventActive() != item2.getECallEventActive()){
+        if (item1.getECallEventActive() != item2.getECallEventActive()) {
             return false;
         }
-        if(item1.getMonoAudioOutputMuted() != item2.getMonoAudioOutputMuted()){
+        if (item1.getMonoAudioOutputMuted() != item2.getMonoAudioOutputMuted()) {
             return false;
         }
-        if(item1.getPhoneRoaming() != item2.getPhoneRoaming()){
+        if (item1.getPhoneRoaming() != item2.getPhoneRoaming()) {
             return false;
         }
-        if(item1.getStereoAudioOutputMuted() != item2.getStereoAudioOutputMuted()){
+        if (item1.getStereoAudioOutputMuted() != item2.getStereoAudioOutputMuted()) {
             return false;
         }
-        if(item1.getTextMsgAvailable() != item2.getTextMsgAvailable()){
+        if (item1.getTextMsgAvailable() != item2.getTextMsgAvailable()) {
             return false;
         }
-        if(item1.getVoiceRecOn() != item2.getVoiceRecOn()){
+        if (item1.getVoiceRecOn() != item2.getVoiceRecOn()) {
             return false;
         }
-        if(item1.getBattLevelStatus() != item2.getBattLevelStatus()){
+        if (item1.getBattLevelStatus() != item2.getBattLevelStatus()) {
             return false;
         }
-        if(item1.getPrimaryAudioSource() != item2.getPrimaryAudioSource()){
+        if (item1.getPrimaryAudioSource() != item2.getPrimaryAudioSource()) {
             return false;
         }
-        if(item1.getSignalLevelStatus() != item2.getSignalLevelStatus()){
+        if (item1.getSignalLevelStatus() != item2.getSignalLevelStatus()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateHeadLampStatus(HeadLampStatus item1, HeadLampStatus item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateHeadLampStatus(HeadLampStatus item1, HeadLampStatus item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getHighBeamsOn() != item2.getHighBeamsOn()){
+        if (item1.getHighBeamsOn() != item2.getHighBeamsOn()) {
             return false;
         }
-        if(item1.getLowBeamsOn() != item2.getLowBeamsOn()){
+        if (item1.getLowBeamsOn() != item2.getLowBeamsOn()) {
             return false;
         }
-        if(item1.getAmbientLightStatus() != item2.getAmbientLightStatus()){
+        if (item1.getAmbientLightStatus() != item2.getAmbientLightStatus()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateECallInfo(ECallInfo item1, ECallInfo item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateECallInfo(ECallInfo item1, ECallInfo item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getAuxECallNotificationStatus() != item2.getAuxECallNotificationStatus()){
+        if (item1.getAuxECallNotificationStatus() != item2.getAuxECallNotificationStatus()) {
             return false;
         }
-        if(item1.getECallConfirmationStatus() != item2.getECallConfirmationStatus()){
+        if (item1.getECallConfirmationStatus() != item2.getECallConfirmationStatus()) {
             return false;
         }
-        if(item1.getECallNotificationStatus() != item2.getECallNotificationStatus()){
+        if (item1.getECallNotificationStatus() != item2.getECallNotificationStatus()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateAirbagStatus(AirbagStatus item1, AirbagStatus item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateAirbagStatus(AirbagStatus item1, AirbagStatus item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
-        if(item1.getDriverAirbagDeployed() != item2.getDriverAirbagDeployed()){
+        if (item1.getDriverAirbagDeployed() != item2.getDriverAirbagDeployed()) {
             return false;
         }
-        if(item1.getDriverSideAirbagDeployed() != item2.getDriverSideAirbagDeployed()){
+        if (item1.getDriverSideAirbagDeployed() != item2.getDriverSideAirbagDeployed()) {
             return false;
         }
-        if(item1.getDriverCurtainAirbagDeployed() != item2.getDriverCurtainAirbagDeployed()){
+        if (item1.getDriverCurtainAirbagDeployed() != item2.getDriverCurtainAirbagDeployed()) {
             return false;
         }
-        if(item1.getPassengerAirbagDeployed() != item2.getPassengerAirbagDeployed()){
+        if (item1.getPassengerAirbagDeployed() != item2.getPassengerAirbagDeployed()) {
             return false;
         }
-        if(item1.getPassengerCurtainAirbagDeployed() != item2.getPassengerCurtainAirbagDeployed()){
+        if (item1.getPassengerCurtainAirbagDeployed() != item2.getPassengerCurtainAirbagDeployed()) {
             return false;
         }
-        if(item1.getDriverKneeAirbagDeployed() != item2.getDriverKneeAirbagDeployed()){
+        if (item1.getDriverKneeAirbagDeployed() != item2.getDriverKneeAirbagDeployed()) {
             return false;
         }
-        if(item1.getPassengerSideAirbagDeployed() != item2.getPassengerSideAirbagDeployed()){
+        if (item1.getPassengerSideAirbagDeployed() != item2.getPassengerSideAirbagDeployed()) {
             return false;
         }
-        if(item1.getPassengerKneeAirbagDeployed() != item2.getPassengerKneeAirbagDeployed()){
+        if (item1.getPassengerKneeAirbagDeployed() != item2.getPassengerKneeAirbagDeployed()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateEmergencyEvent(EmergencyEvent item1, EmergencyEvent item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateEmergencyEvent(EmergencyEvent item1, EmergencyEvent item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getEmergencyEventType() != item2.getEmergencyEventType()){
+        if (item1.getEmergencyEventType() != item2.getEmergencyEventType()) {
             return false;
         }
-        if(item1.getFuelCutoffStatus() != item2.getFuelCutoffStatus()){
+        if (item1.getFuelCutoffStatus() != item2.getFuelCutoffStatus()) {
             return false;
         }
-        if(item1.getMaximumChangeVelocity() != item2.getMaximumChangeVelocity()){
+        if (item1.getMaximumChangeVelocity() != item2.getMaximumChangeVelocity()) {
             return false;
         }
-        if(item1.getMultipleEvents() != item2.getMultipleEvents()){
+        if (item1.getMultipleEvents() != item2.getMultipleEvents()) {
             return false;
         }
-        if(item1.getRolloverEvent() != item2.getRolloverEvent()){
+        if (item1.getRolloverEvent() != item2.getRolloverEvent()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateClusterModeStatus(ClusterModeStatus item1, ClusterModeStatus item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateClusterModeStatus(ClusterModeStatus item1, ClusterModeStatus item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getPowerModeActive() != item2.getPowerModeActive()){
+        if (item1.getPowerModeActive() != item2.getPowerModeActive()) {
             return false;
         }
-        if(item1.getPowerModeQualificationStatus() != item2.getPowerModeQualificationStatus()){
+        if (item1.getPowerModeQualificationStatus() != item2.getPowerModeQualificationStatus()) {
             return false;
         }
-        if(item1.getPowerModeStatus() != item2.getPowerModeStatus()){
+        if (item1.getPowerModeStatus() != item2.getPowerModeStatus()) {
             return false;
         }
-        if(item1.getCarModeStatus() != item2.getCarModeStatus()){
+        if (item1.getCarModeStatus() != item2.getCarModeStatus()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateMyKey(MyKey item1, MyKey item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateMyKey(MyKey item1, MyKey item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
 
-        if(item1.getE911Override() != item2.getE911Override()){
+        if (item1.getE911Override() != item2.getE911Override()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateFuelRange (List<FuelRange> item1, List<FuelRange> item2) {
+    public static boolean validateFuelRange(List<FuelRange> item1, List<FuelRange> item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
         }
 
         if (item1.size() != item2.size()) {
@@ -2345,12 +2347,12 @@ public class Validator{
         return true;
     }
 
-    public static boolean validatePermissionItem(PermissionItem item1, PermissionItem item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validatePermissionItem(PermissionItem item1, PermissionItem item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
         /*
         if(item1 == item2){
@@ -2358,31 +2360,31 @@ public class Validator{
             return false;
         }
 		*/
-        if(!item1.getRpcName().equals(item2.getRpcName())){
+        if (!item1.getRpcName().equals(item2.getRpcName())) {
             return false;
         }
 
-        if(!validateHmiPermissions(item1.getHMIPermissions(), item2.getHMIPermissions())){
+        if (!validateHmiPermissions(item1.getHMIPermissions(), item2.getHMIPermissions())) {
             return false;
         }
 
-        if(!validateParameterPermissions(item1.getParameterPermissions(), item2.getParameterPermissions())){
+        if (!validateParameterPermissions(item1.getParameterPermissions(), item2.getParameterPermissions())) {
             return false;
         }
 
-        if(item1.getRequireEncryption() != item2.getRequireEncryption()) {
+        if (item1.getRequireEncryption() != item2.getRequireEncryption()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateHmiPermissions(HMIPermissions item1, HMIPermissions item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateHmiPermissions(HMIPermissions item1, HMIPermissions item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
         /*
         if(item1 == item2){
@@ -2390,45 +2392,45 @@ public class Validator{
             return false;
         }
          */
-        if(!validateHmiLevelLists(item1.getAllowed(), item2.getAllowed())){
+        if (!validateHmiLevelLists(item1.getAllowed(), item2.getAllowed())) {
             return false;
         }
 
         List<HMILevel> item1Array = item1.getUserDisallowed();
         List<HMILevel> item2Array = item2.getUserDisallowed();
 
-        if(item1Array.size() != item2Array.size()){
+        if (item1Array.size() != item2Array.size()) {
             return false;
         }
 
-        for(int i = 0; i < item1Array.size(); i++){
-            if(item1Array.get(i) != item2Array.get(i)){
+        for (int i = 0; i < item1Array.size(); i++) {
+            if (item1Array.get(i) != item2Array.get(i)) {
                 return false;
             }
         }
 
         return true;
     }
-    
+
     public static boolean validateHmiLevelLists(List<HMILevel> item1Array, List<HMILevel> item2Array) {
-        if(item1Array.size() != item2Array.size()){
+        if (item1Array.size() != item2Array.size()) {
             return false;
         }
 
-        for(int i = 0; i < item1Array.size(); i++){
-            if(item1Array.get(i) != item2Array.get(i)){
+        for (int i = 0; i < item1Array.size(); i++) {
+            if (item1Array.get(i) != item2Array.get(i)) {
                 return false;
             }
         }
         return true;
     }
 
-    public static boolean validateParameterPermissions(ParameterPermissions item1, ParameterPermissions item2){
-        if(item1 == null){
-            return ( item2 == null );
+    public static boolean validateParameterPermissions(ParameterPermissions item1, ParameterPermissions item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
         /*
         if(item1 == item2){
@@ -2436,182 +2438,182 @@ public class Validator{
             return false;
         }
 		*/
-        if(!validateStringList(item1.getAllowed(), item2.getAllowed())){
+        if (!validateStringList(item1.getAllowed(), item2.getAllowed())) {
             return false;
         }
 
-        if(!validateStringList(item1.getUserDisallowed(), item2.getUserDisallowed())){
+        if (!validateStringList(item1.getUserDisallowed(), item2.getUserDisallowed())) {
             return false;
         }
 
         return true;
     }
-    
-    public static boolean validateTouchEvent(TouchEvent item1, TouchEvent item2){
-        if(item1 == null){
-            return ( item2 == null );
+
+    public static boolean validateTouchEvent(TouchEvent item1, TouchEvent item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
-        
-        if(item1 == item2){
+
+        if (item1 == item2) {
             return true;
         }
-        
+
         List<TouchCoord> tc1 = item1.getC();
         List<TouchCoord> tc2 = item2.getC();
         List<Long> ts1 = item1.getTs();
         List<Long> ts2 = item2.getTs();
-        
-        for(int i=0; i<tc1.size(); i++){
-            if( ! validateTouchCoord(tc1.get(i), tc2.get(i)) ){
+
+        for (int i = 0; i < tc1.size(); i++) {
+            if (!validateTouchCoord(tc1.get(i), tc2.get(i))) {
                 return false;
             }
-            if(ts1.get(i) != ts2.get(i)){
+            if (ts1.get(i) != ts2.get(i)) {
                 return false;
             }
         }
-        
-        if(item1.getId() != item2.getId()){
+
+        if (item1.getId() != item2.getId()) {
             return false;
         }
-        
-        
+
+
         return true;
     }
-    
-    public static boolean validateTouchCoord(TouchCoord item1, TouchCoord item2){
-        if(item1 == null){
-            return ( item2 == null );
+
+    public static boolean validateTouchCoord(TouchCoord item1, TouchCoord item2) {
+        if (item1 == null) {
+            return (item2 == null);
         }
-        if(item2 == null){
-            return ( item1 == null );
+        if (item2 == null) {
+            return (item1 == null);
         }
-        
-        if(item1.getX() != item2.getX()){
+
+        if (item1.getX() != item2.getX()) {
             return false;
         }
-        if(item1.getY() != item2.getY()){
+        if (item1.getY() != item2.getY()) {
             return false;
         }
-        
+
         return true;
     }
 
-	public static boolean validateMassageModeData(MassageModeData item1, MassageModeData item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
+    public static boolean validateMassageModeData(MassageModeData item1, MassageModeData item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-		if (item1.getMassageMode() != item2.getMassageMode()) {
-			return false;
-		}
+        if (item1.getMassageMode() != item2.getMassageMode()) {
+            return false;
+        }
 
-		if (item1.getMassageZone() != item2.getMassageZone()) {
-			return false;
-		}
+        if (item1.getMassageZone() != item2.getMassageZone()) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public static boolean validateMassageModeDataList(List<MassageModeData> item1, List<MassageModeData> item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
+    public static boolean validateMassageModeDataList(List<MassageModeData> item1, List<MassageModeData> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-		if (item1.size() != item2.size()) {
-			return false;
-		}
+        if (item1.size() != item2.size()) {
+            return false;
+        }
 
-		for (int i = 0; i < item1.size(); i++) {
-			if (!validateMassageModeData(item1.get(i), item2.get(i))) {
-				return false;
-			}
-		}
+        for (int i = 0; i < item1.size(); i++) {
+            if (!validateMassageModeData(item1.get(i), item2.get(i))) {
+                return false;
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public static boolean validateMassageCushionFirmness(MassageCushionFirmness item1, MassageCushionFirmness item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
+    public static boolean validateMassageCushionFirmness(MassageCushionFirmness item1, MassageCushionFirmness item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-		if (item1.getCushion() != item2.getCushion()) {
-			return false;
-		}
+        if (item1.getCushion() != item2.getCushion()) {
+            return false;
+        }
 
-		if (item1.getFirmness() != item2.getFirmness()) {
-			return false;
-		}
+        if (item1.getFirmness() != item2.getFirmness()) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public static boolean validateMassageCushionFirmnessList(List<MassageCushionFirmness> item1, List<MassageCushionFirmness> item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
+    public static boolean validateMassageCushionFirmnessList(List<MassageCushionFirmness> item1, List<MassageCushionFirmness> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-		if (item1.size() != item2.size()) {
-			return false;
-		}
+        if (item1.size() != item2.size()) {
+            return false;
+        }
 
-		for (int i = 0; i < item1.size(); i++) {
-			if (!validateMassageCushionFirmness(item1.get(i), item2.get(i))) {
-				return false;
-			}
-		}
+        for (int i = 0; i < item1.size(); i++) {
+            if (!validateMassageCushionFirmness(item1.get(i), item2.get(i))) {
+                return false;
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-    public static void log(String tag, String msg){
+    public static void log(String tag, String msg) {
         Logger.log(tag, msg);
     }
-    
-    public static boolean validateSdlMsgVersion (SdlMsgVersion item1, SdlMsgVersion item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.getMajorVersion() != item2.getMajorVersion() ||
-    		item1.getMinorVersion() != item2.getMinorVersion()) {
-    		return false;
-    	}
-    	
-    	return true;
+
+    public static boolean validateSdlMsgVersion(SdlMsgVersion item1, SdlMsgVersion item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.getMajorVersion() != item2.getMajorVersion() ||
+                item1.getMinorVersion() != item2.getMinorVersion()) {
+            return false;
+        }
+
+        return true;
     }
 
-    public static boolean validateDeviceInfo (DeviceInfo item1, DeviceInfo item2) {
+    public static boolean validateDeviceInfo(DeviceInfo item1, DeviceInfo item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
         }
 
-        if (item1.getOs()                   != item2.getOs()          ||
-                item1.getCarrier()              != item2.getCarrier()     ||
-                item1.getHardware()             != item2.getHardware()    ||
-                item1.getOsVersion()            != item2.getOsVersion()   ||
-                item1.getFirmwareRev()          != item2.getFirmwareRev() ||
+        if (item1.getOs() != item2.getOs() ||
+                item1.getCarrier() != item2.getCarrier() ||
+                item1.getHardware() != item2.getHardware() ||
+                item1.getOsVersion() != item2.getOsVersion() ||
+                item1.getFirmwareRev() != item2.getFirmwareRev() ||
                 item1.getMaxNumberRFCOMMPorts() != item2.getMaxNumberRFCOMMPorts()) {
             return false;
         }
@@ -2619,30 +2621,30 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateAppInfo (AppInfo item1, AppInfo item2) {
+    public static boolean validateAppInfo(AppInfo item1, AppInfo item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
         }
 
         if (item1.getAppDisplayName() != item1.getAppDisplayName()
-        || item1.getAppBundleID() != item2.getAppBundleID()
-        || item1.getAppVersion() != item2.getAppVersion()
-        || item1.getAppIcon() != item2.getAppIcon()) {
+                || item1.getAppBundleID() != item2.getAppBundleID()
+                || item1.getAppVersion() != item2.getAppVersion()
+                || item1.getAppIcon() != item2.getAppIcon()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateTemplateColorScheme (TemplateColorScheme item1, TemplateColorScheme item2) {
+    public static boolean validateTemplateColorScheme(TemplateColorScheme item1, TemplateColorScheme item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
         }
 
         if (item1.getPrimaryColor().getRed() != item2.getPrimaryColor().getRed()
@@ -2655,7 +2657,7 @@ public class Validator{
                 || item1.getBackgroundColor().getGreen() != item2.getBackgroundColor().getGreen()
                 || item1.getBackgroundColor().getBlue() != item2.getBackgroundColor().getBlue()
 
-                ) {
+        ) {
             return false;
         }
 
@@ -2664,127 +2666,127 @@ public class Validator{
 
     public static boolean validateRGBColor(RGBColor item1, RGBColor item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
         }
 
         if (item1.getRed() != item2.getRed()
                 || item1.getGreen() != item2.getGreen()
-                || item1.getBlue() != item2.getBlue()    ) {
+                || item1.getBlue() != item2.getBlue()) {
             return false;
         }
 
         return true;
     }
 
-    public static boolean validateSupportedFormats (VideoStreamingFormat vsf1, VideoStreamingFormat vsf2) {
-		if(vsf1.getProtocol() != vsf2.getProtocol()){
-			return false;
-		}
+    public static boolean validateSupportedFormats(VideoStreamingFormat vsf1, VideoStreamingFormat vsf2) {
+        if (vsf1.getProtocol() != vsf2.getProtocol()) {
+            return false;
+        }
 
-	    if(vsf1.getCodec() != vsf2.getCodec()){
-		    return false;
-	    }
+        if (vsf1.getCodec() != vsf2.getCodec()) {
+            return false;
+        }
 
-	    return true;
+        return true;
     }
 
-    public static boolean validateDisplayCapabilities (DisplayCapabilities item1, DisplayCapabilities item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.getDisplayType() == null) {
-    		return ( item2.getDisplayType() == null );
-    	}
-    	
-    	if (item1.getDisplayType() != item2.getDisplayType()) {
-    		return false;
-    	}
+    public static boolean validateDisplayCapabilities(DisplayCapabilities item1, DisplayCapabilities item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
 
-        if (!item1.getDisplayName().equals(item2.getDisplayName())) {
+        if (item1.getDisplayType() == null) {
+            return (item2.getDisplayType() == null);
+        }
+
+        if (item1.getDisplayType() != item2.getDisplayType()) {
             return false;
         }
-    	
-    	if (item1.getGraphicSupported() != item2.getGraphicSupported()) {    		
-    		return false;
-    	}
-    	// Failing past here:
-    	// log("GS", item1.getGraphicSupported() + " : " + item2.getGraphicSupported());
-    	
-    	if (!validateStringList(item1.getTemplatesAvailable(),item2.getTemplatesAvailable())) {
-    		log("TA", item1.getTemplatesAvailable() + " | " + item2.getTemplatesAvailable());
-    		return false;
-    	}
-    	
-    	if (item1.getNumCustomPresetsAvailable() != item2.getNumCustomPresetsAvailable()) {
-    		return false;
-    	}
-    	
-    	if (item1.getMediaClockFormats() == null) {
-    		return ( item2.getMediaClockFormats() == null );
-    	}
-    	
-    	if (item1.getMediaClockFormats().size() != item2.getMediaClockFormats().size()) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < item1.getMediaClockFormats().size(); i++) {
-    		if (item1.getMediaClockFormats().get(i) == null && item2.getMediaClockFormats().get(i) != null) {
-        		return false;
-        	}
-    		
-    		if (item1.getMediaClockFormats().get(i) != item2.getMediaClockFormats().get(i)) {
-    			return false;
-    		}
-    	}
-    	    	
-    	if (item1.getTextFields() == null) {
-    		return ( item2.getTextFields() == null );
-    	}
-    	
-    	if (item1.getTextFields().size() != item2.getTextFields().size()) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < item1.getTextFields().size(); i++) {    		
-    		if (item1.getTextFields().get(i) == null && item2.getTextFields().get(i) != null) {
-        		return false;
-        	}
-    		
-    		if (!validateTextFields(item1.getTextFields().get(i), item2.getTextFields().get(i))) {
-    			return false;
-    		}
-    	}
-    	
-    	if (item1.getImageFields() == null) {
-    		return ( item2.getImageFields() == null );
-    	}
-    	
-    	if (item1.getImageFields().size() != item2.getImageFields().size()) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < item1.getImageFields().size(); i++) {
-    		if (item1.getImageFields().get(i) == null && item2.getImageFields().get(i) != null) {
-        		return false;
-        	}
-    		
-    		if (!validateImageFields(item1.getImageFields().get(i), item2.getImageFields().get(i))) {
-    			return false;
-    		}
-    	}
-    	
-    	if (!validateScreenParams(item1.getScreenParams(), item2.getScreenParams())) {
-    		return false;
-    	}
-    	  	
-    	return true;
+
+        if (!CompareUtils.areStringsEqual(item1.getDisplayName(), item2.getDisplayName(), true, true)) {
+            return false;
+        }
+
+        if (item1.getGraphicSupported() != item2.getGraphicSupported()) {
+            return false;
+        }
+        // Failing past here:
+        // log("GS", item1.getGraphicSupported() + " : " + item2.getGraphicSupported());
+
+        if (!validateStringList(item1.getTemplatesAvailable(), item2.getTemplatesAvailable())) {
+            log("TA", item1.getTemplatesAvailable() + " | " + item2.getTemplatesAvailable());
+            return false;
+        }
+
+        if (item1.getNumCustomPresetsAvailable() != item2.getNumCustomPresetsAvailable()) {
+            return false;
+        }
+
+        if (item1.getMediaClockFormats() == null) {
+            return (item2.getMediaClockFormats() == null);
+        }
+
+        if (item1.getMediaClockFormats().size() != item2.getMediaClockFormats().size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.getMediaClockFormats().size(); i++) {
+            if (item1.getMediaClockFormats().get(i) == null && item2.getMediaClockFormats().get(i) != null) {
+                return false;
+            }
+
+            if (item1.getMediaClockFormats().get(i) != item2.getMediaClockFormats().get(i)) {
+                return false;
+            }
+        }
+
+        if (item1.getTextFields() == null) {
+            return (item2.getTextFields() == null);
+        }
+
+        if (item1.getTextFields().size() != item2.getTextFields().size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.getTextFields().size(); i++) {
+            if (item1.getTextFields().get(i) == null && item2.getTextFields().get(i) != null) {
+                return false;
+            }
+
+            if (!validateTextFields(item1.getTextFields().get(i), item2.getTextFields().get(i))) {
+                return false;
+            }
+        }
+
+        if (item1.getImageFields() == null) {
+            return (item2.getImageFields() == null);
+        }
+
+        if (item1.getImageFields().size() != item2.getImageFields().size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.getImageFields().size(); i++) {
+            if (item1.getImageFields().get(i) == null && item2.getImageFields().get(i) != null) {
+                return false;
+            }
+
+            if (!validateImageFields(item1.getImageFields().get(i), item2.getImageFields().get(i))) {
+                return false;
+            }
+        }
+
+        if (!validateScreenParams(item1.getScreenParams(), item2.getScreenParams())) {
+            return false;
+        }
+
+        return true;
     }
 
     public static boolean validateDisplayCapabilityList(List<DisplayCapability> list1, List<DisplayCapability> list2) {
@@ -2942,72 +2944,72 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateButtonCapabilities (List<ButtonCapabilities> item1, List<ButtonCapabilities> item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.size() != item2.size()) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < item1.size(); i++) {
-    		if (item1.get(i).getName() != item2.get(i).getName()) {
-    			return false;
-    		}
-    		if (item1.get(i).getUpDownAvailable() != item2.get(i).getUpDownAvailable()) {
-    			return false;
-    		}
-    		if (item1.get(i).getLongPressAvailable() != item2.get(i).getLongPressAvailable()) {
-    			return false;
-    		}
-    		if (item1.get(i).getShortPressAvailable() != item2.get(i).getShortPressAvailable()) {
-    			return false;
-    		}
-    	}
-    	
-    	return true;
-    }
-    
-    public static boolean validateSoftButtonCapabilities (List<SoftButtonCapabilities> item1, List<SoftButtonCapabilities> item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.size() != item2.size()) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < item1.size(); i++) {
-    		if (item1.get(i).getImageSupported() != item2.get(i).getImageSupported()) {
-    			return false;
-    		}
-    		if (item1.get(i).getUpDownAvailable() != item2.get(i).getUpDownAvailable()) {
-    			return false;
-    		}
-    		if (item1.get(i).getLongPressAvailable() != item2.get(i).getLongPressAvailable()) {
-    			return false;
-    		}
-    		if (item1.get(i).getShortPressAvailable() != item2.get(i).getShortPressAvailable()) {
-    			return false;
-    		}
-    	}
-    	
-    	return true;
-    }
-
-    public static boolean validateRadioControlCapabilities (List<RadioControlCapabilities> item1, List<RadioControlCapabilities> item2) {
-        if (item1 == null) {
-            return ( item2 == null );
-        }
-        if (item2 == null) {
-            return ( item1 == null );
+    public static boolean validateButtonCapabilities(List<ButtonCapabilities> item1, List<ButtonCapabilities> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (item1.get(i).getName() != item2.get(i).getName()) {
+                return false;
+            }
+            if (item1.get(i).getUpDownAvailable() != item2.get(i).getUpDownAvailable()) {
+                return false;
+            }
+            if (item1.get(i).getLongPressAvailable() != item2.get(i).getLongPressAvailable()) {
+                return false;
+            }
+            if (item1.get(i).getShortPressAvailable() != item2.get(i).getShortPressAvailable()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateSoftButtonCapabilities(List<SoftButtonCapabilities> item1, List<SoftButtonCapabilities> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (item1.get(i).getImageSupported() != item2.get(i).getImageSupported()) {
+                return false;
+            }
+            if (item1.get(i).getUpDownAvailable() != item2.get(i).getUpDownAvailable()) {
+                return false;
+            }
+            if (item1.get(i).getLongPressAvailable() != item2.get(i).getLongPressAvailable()) {
+                return false;
+            }
+            if (item1.get(i).getShortPressAvailable() != item2.get(i).getShortPressAvailable()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateRadioControlCapabilities(List<RadioControlCapabilities> item1, List<RadioControlCapabilities> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
         }
 
         if (item1.size() != item2.size()) {
@@ -3050,12 +3052,12 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateClimateControlCapabilities (List<ClimateControlCapabilities> item1, List<ClimateControlCapabilities> item2) {
+    public static boolean validateClimateControlCapabilities(List<ClimateControlCapabilities> item1, List<ClimateControlCapabilities> item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
         }
 
         if (item1.size() != item2.size()) {
@@ -3091,7 +3093,7 @@ public class Validator{
                 return false;
             }
 
-            if(! (validateDefrostZones(item1.get(i).getDefrostZone(), item2.get(i).getDefrostZone()) )){
+            if (!(validateDefrostZones(item1.get(i).getDefrostZone(), item2.get(i).getDefrostZone()))) {
                 return false;
             }
 
@@ -3099,288 +3101,288 @@ public class Validator{
                 return false;
             }
 
-            if(! (validateVentilationModes(item1.get(i).getVentilationMode(), item2.get(i).getVentilationMode()) )){
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-	public static boolean validateSeatControlCapabilities(SeatControlCapabilities item1, SeatControlCapabilities item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (item1.getModuleName() != item2.getModuleName()) {
-			return false;
-		}
-		if (item1.getHeatingEnabledAvailable() != item2.getHeatingEnabledAvailable()) {
-			return false;
-		}
-		if (item1.getCoolingEnabledAvailable() != item2.getCoolingEnabledAvailable()) {
-			return false;
-		}
-		if (item1.getHeatingLevelAvailable() != item2.getHeatingLevelAvailable()) {
-			return false;
-		}
-		if (item1.getCoolingLevelAvailable() != item2.getCoolingLevelAvailable()) {
-			return false;
-		}
-		if (item1.getHorizontalPositionAvailable() != item2.getHorizontalPositionAvailable()) {
-			return false;
-		}
-		if (item1.getVerticalPositionAvailable() != item2.getVerticalPositionAvailable()) {
-			return false;
-		}
-		if (item1.getFrontVerticalPositionAvailable() != item2.getFrontVerticalPositionAvailable()) {
-			return false;
-		}
-		if (item1.getBackVerticalPositionAvailable() != item2.getBackVerticalPositionAvailable()) {
-			return false;
-		}
-		if (item1.getBackTiltAngleAvailable() != item2.getBackTiltAngleAvailable()) {
-			return false;
-		}
-		if (item1.getHeadSupportVerticalPositionAvailable() != item2.getHeadSupportVerticalPositionAvailable()) {
-			return false;
-		}
-		if (item1.getHeadSupportHorizontalPositionAvailable() != item2.getHeadSupportHorizontalPositionAvailable()) {
-			return false;
-		}
-		if (item1.getMassageEnabledAvailable() != item2.getMassageEnabledAvailable()) {
-			return false;
-		}
-		if (item1.getMassageModeAvailable() != item2.getMassageModeAvailable()) {
-			return false;
-		}
-		if (item1.getMassageCushionFirmnessAvailable() != item2.getMassageCushionFirmnessAvailable()) {
-			return false;
-		}
-		if (item1.getMemoryAvailable() != item2.getMemoryAvailable()) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateSeatControlCapabilitiesList(List<SeatControlCapabilities> item1, List<SeatControlCapabilities> item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (item1.size() != item2.size()) {
-			return false;
-		}
-
-		for (int i = 0; i < item1.size(); i++) {
-			if (!validateSeatControlCapabilities(item1.get(i), item2.get(i))) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public static boolean validateAudioControlCapabilities(AudioControlCapabilities item1, AudioControlCapabilities item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (item1.getModuleName() != item2.getModuleName()) {
-			return false;
-		}
-		if (item1.getSourceAvailable() != item2.getSourceAvailable()) {
-			return false;
-		}
-		if (item1.getKeepContextAvailable() != item2.getKeepContextAvailable()) {
-			return false;
-		}
-		if (item1.getVolumeAvailable() != item2.getVolumeAvailable()) {
-			return false;
-		}
-		if (item1.getEqualizerAvailable() != item2.getEqualizerAvailable()) {
-			return false;
-		}
-		if (item1.getEqualizerMaxChannelId() != item2.getEqualizerMaxChannelId()) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateEqualizerSettingsList(List<EqualizerSettings> item1, List<EqualizerSettings> item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (item1.size() != item2.size()) {
-			return false;
-		}
-
-		for (int i = 0; i < item1.size(); i++) {
-			if (!validateEqualizerSettings(item1.get(i), item2.get(i))) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public static boolean validateEqualizerSettings(EqualizerSettings item1, EqualizerSettings item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (item1.getChannelId() != item2.getChannelId()) {
-			return false;
-		}
-
-		if (item1.getChannelName() != item2.getChannelName()) {
-			return false;
-		}
-
-		if (item1.getChannelSetting() != item2.getChannelSetting()) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateLightStateList(List<LightState> item1, List<LightState> item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (item1.size() != item2.size()) {
-			return false;
-		}
-
-		for (int i = 0; i < item1.size(); i++) {
-			if (!validateLightState(item1.get(i), item2.get(i))) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public static boolean validateLightState(LightState item1, LightState item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (item1.getId() != item2.getId()) {
-			return false;
-		}
-
-		if (item1.getStatus() != item2.getStatus()) {
-			return false;
-		}
-
-		if (item1.getDensity() != item2.getDensity()) {
-			return false;
-		}
-
-		if (!(validateRGBColor(item1.getColor(), item2.getColor()))) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateLightCapabilitiesList(List<LightCapabilities> item1, List<LightCapabilities> item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (item1.size() != item2.size()) {
-			return false;
-		}
-
-		for (int i = 0; i < item1.size(); i++) {
-			if (!validateLightCapabilities(item1.get(i), item2.get(i))) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public static boolean validateLightCapabilities(LightCapabilities item1, LightCapabilities item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (item1.getName() != item2.getName()) {
-			return false;
-		}
-
-		if (item1.getDensityAvailable() != item2.getDensityAvailable()) {
-			return false;
-		}
-
-		if (item1.getRGBColorSpaceAvailable() != item2.getRGBColorSpaceAvailable()) {
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateAudioControlCapabilitiesList(List<AudioControlCapabilities> item1, List<AudioControlCapabilities> item2) {
-		if (item1 == null) {
-			return (item2 == null);
-		}
-		if (item2 == null) {
-			return (item1 == null);
-		}
-
-		if (item1.size() != item2.size()) {
-			return false;
-		}
-
-		for (int i = 0; i < item1.size(); i++) {
-			if (!validateAudioControlCapabilities(item1.get(i), item2.get(i))) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-    public static boolean validateDefrostZones (List<DefrostZone> item1, List<DefrostZone> item2) {
+            if (!(validateVentilationModes(item1.get(i).getVentilationMode(), item2.get(i).getVentilationMode()))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateSeatControlCapabilities(SeatControlCapabilities item1, SeatControlCapabilities item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
+        }
+
+        if (item1.getModuleName() != item2.getModuleName()) {
+            return false;
+        }
+        if (item1.getHeatingEnabledAvailable() != item2.getHeatingEnabledAvailable()) {
+            return false;
+        }
+        if (item1.getCoolingEnabledAvailable() != item2.getCoolingEnabledAvailable()) {
+            return false;
+        }
+        if (item1.getHeatingLevelAvailable() != item2.getHeatingLevelAvailable()) {
+            return false;
+        }
+        if (item1.getCoolingLevelAvailable() != item2.getCoolingLevelAvailable()) {
+            return false;
+        }
+        if (item1.getHorizontalPositionAvailable() != item2.getHorizontalPositionAvailable()) {
+            return false;
+        }
+        if (item1.getVerticalPositionAvailable() != item2.getVerticalPositionAvailable()) {
+            return false;
+        }
+        if (item1.getFrontVerticalPositionAvailable() != item2.getFrontVerticalPositionAvailable()) {
+            return false;
+        }
+        if (item1.getBackVerticalPositionAvailable() != item2.getBackVerticalPositionAvailable()) {
+            return false;
+        }
+        if (item1.getBackTiltAngleAvailable() != item2.getBackTiltAngleAvailable()) {
+            return false;
+        }
+        if (item1.getHeadSupportVerticalPositionAvailable() != item2.getHeadSupportVerticalPositionAvailable()) {
+            return false;
+        }
+        if (item1.getHeadSupportHorizontalPositionAvailable() != item2.getHeadSupportHorizontalPositionAvailable()) {
+            return false;
+        }
+        if (item1.getMassageEnabledAvailable() != item2.getMassageEnabledAvailable()) {
+            return false;
+        }
+        if (item1.getMassageModeAvailable() != item2.getMassageModeAvailable()) {
+            return false;
+        }
+        if (item1.getMassageCushionFirmnessAvailable() != item2.getMassageCushionFirmnessAvailable()) {
+            return false;
+        }
+        if (item1.getMemoryAvailable() != item2.getMemoryAvailable()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateSeatControlCapabilitiesList(List<SeatControlCapabilities> item1, List<SeatControlCapabilities> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (!validateSeatControlCapabilities(item1.get(i), item2.get(i))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateAudioControlCapabilities(AudioControlCapabilities item1, AudioControlCapabilities item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.getModuleName() != item2.getModuleName()) {
+            return false;
+        }
+        if (item1.getSourceAvailable() != item2.getSourceAvailable()) {
+            return false;
+        }
+        if (item1.getKeepContextAvailable() != item2.getKeepContextAvailable()) {
+            return false;
+        }
+        if (item1.getVolumeAvailable() != item2.getVolumeAvailable()) {
+            return false;
+        }
+        if (item1.getEqualizerAvailable() != item2.getEqualizerAvailable()) {
+            return false;
+        }
+        if (item1.getEqualizerMaxChannelId() != item2.getEqualizerMaxChannelId()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateEqualizerSettingsList(List<EqualizerSettings> item1, List<EqualizerSettings> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (!validateEqualizerSettings(item1.get(i), item2.get(i))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateEqualizerSettings(EqualizerSettings item1, EqualizerSettings item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.getChannelId() != item2.getChannelId()) {
+            return false;
+        }
+
+        if (item1.getChannelName() != item2.getChannelName()) {
+            return false;
+        }
+
+        if (item1.getChannelSetting() != item2.getChannelSetting()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateLightStateList(List<LightState> item1, List<LightState> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (!validateLightState(item1.get(i), item2.get(i))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateLightState(LightState item1, LightState item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.getId() != item2.getId()) {
+            return false;
+        }
+
+        if (item1.getStatus() != item2.getStatus()) {
+            return false;
+        }
+
+        if (item1.getDensity() != item2.getDensity()) {
+            return false;
+        }
+
+        if (!(validateRGBColor(item1.getColor(), item2.getColor()))) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateLightCapabilitiesList(List<LightCapabilities> item1, List<LightCapabilities> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (!validateLightCapabilities(item1.get(i), item2.get(i))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateLightCapabilities(LightCapabilities item1, LightCapabilities item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.getName() != item2.getName()) {
+            return false;
+        }
+
+        if (item1.getDensityAvailable() != item2.getDensityAvailable()) {
+            return false;
+        }
+
+        if (item1.getRGBColorSpaceAvailable() != item2.getRGBColorSpaceAvailable()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateAudioControlCapabilitiesList(List<AudioControlCapabilities> item1, List<AudioControlCapabilities> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (!validateAudioControlCapabilities(item1.get(i), item2.get(i))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateDefrostZones(List<DefrostZone> item1, List<DefrostZone> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
         }
 
         if (item1.size() != item2.size()) {
@@ -3396,12 +3398,12 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateVentilationModes (List<VentilationMode> item1, List<VentilationMode> item2) {
+    public static boolean validateVentilationModes(List<VentilationMode> item1, List<VentilationMode> item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
         }
 
         if (item1.size() != item2.size()) {
@@ -3417,411 +3419,411 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateTurnList (List<Turn> item1, List<Turn> item2) {
-    	if (item1 == null) {
-    		return (item2 == null);
-    	}
-    	if (item2 == null) {
-    		return (item1 == null);
-    	}
-    	
-    	if (item1.size() != item2.size()) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < item1.size(); i++) {
-    		if (!item1.get(i).getNavigationText().equals(item2.get(i).getNavigationText())) {
-    			return false;
-    		}
-    		if (!validateImage(item1.get(i).getTurnIcon(), item2.get(i).getTurnIcon())) {
-    			return false;
-    		}
-    	}
-    	    	
-    	return true;
-    }
-    
-    public static boolean validateAudioPassThruCapabilities (List<AudioPassThruCapabilities> item1, List<AudioPassThruCapabilities> item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.size() != item2.size()) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < item1.size(); i++) {
-    		if (item1.get(i).getAudioType() != item2.get(i).getAudioType()) {
-    			return false;
-    		}
-    		if (item1.get(i).getBitsPerSample() != item2.get(i).getBitsPerSample()) {
-    			return false;
-    		}
-    		if (item1.get(i).getSamplingRate() != item2.get(i).getSamplingRate()) {
-    			return false;
-    		}
-    	}
-    	
-    	return true;
-    }
-
-	public static boolean validatePcmStreamCapabilities (AudioPassThruCapabilities item1, AudioPassThruCapabilities item2) {
-		if (item1 == null) {
-			return ( item2 == null );
-		}
-		if (item2 == null) {
-			return ( item1 == null );
-		}
-
-		if (item1.getAudioType() != item2.getAudioType()) {
-			return false;
-		}
-
-		if (item1.getBitsPerSample() != item2.getBitsPerSample()) {
-			return false;
-		}
-
-		if (item1.getSamplingRate() != item2.getSamplingRate()) {
-			return false;
-		}
-
-		return true;
-	}
-    
-    public static boolean validatePresetBankCapabilities (PresetBankCapabilities item1, PresetBankCapabilities item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.onScreenPresetsAvailable() != item2.onScreenPresetsAvailable()) {
-    		return false;
-    	}
-    	
-    	return true;
-    }
-    
-    public static boolean validateVehicleType (VehicleType item1, VehicleType item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.getMake()      != item2.getMake()  ||
-    		item1.getModel()     != item2.getModel() ||
-    		item1.getTrim()      != item2.getTrim()  ||
-    		item1.getModelYear() != item2.getModelYear()) {
-    		return false;
-    	}
-    	
-    	return true;
-    }
-    
-    public static boolean validateKeyboardProperties (KeyboardProperties item1, KeyboardProperties item2) {
-    	if (item1 == null) {
-    		log("1", item2.toString());
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		log("2", item1.toString());
-    		return ( item1 == null );
-    	}
-    	
-    	if (!item1.getAutoCompleteText().equals(item2.getAutoCompleteText())) {
-    		log("ACT", item1.getAutoCompleteText().toString() + " | " + item2.getAutoCompleteText().toString());
-    		return false;
-    	}
-    	if (item1.getKeyboardLayout() != item2.getKeyboardLayout()) {
-    		log("KL", item1.getKeyboardLayout().toString() + " | " + item2.getKeyboardLayout().toString());
-    		return false;
-    	}
-    	if (item1.getKeypressMode() != item2.getKeypressMode()) {
-    		log("KM", item1.getKeypressMode() + " | " + item2.getKeypressMode());
-    		return false;
-    	}
-    	if (item1.getLanguage() != item2.getLanguage()) {
-    		log("L", item1.getLanguage().toString() + " | " + item2.getLanguage().toString());
-    		return false;
-    	}
-    	if (!validateStringList(item1.getLimitedCharacterList(), item2.getLimitedCharacterList())) {
-    		log("List",item1.getLimitedCharacterList().toString() + " | " + item2.getLimitedCharacterList().toString());
-    		return false;
-    	}
-    	
-    	return true;
-    }
-    
-    public static boolean validateStartTime (StartTime item1, StartTime item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.getHours() != item2.getHours()) {
-    		return false;
-    	}
-    	if (item1.getMinutes() != item2.getMinutes()) {
-    		return false;
-    	}
-    	if (item1.getSeconds() != item2.getSeconds()) {
-    		return false;
-    	}
-    	
-    	return true;
-    }
-    
-    public static boolean validateVrHelpItems (List<VrHelpItem> item1, List<VrHelpItem> item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.size() != item2.size()) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < item1.size(); i++) {
-    		if (!item1.get(i).getText().equals(item2.get(i).getText())) {
-    			return false;
-    		}
-    		if (!validateImage(item1.get(i).getImage(), item2.get(i).getImage())) {
-    			return false;
-    		}
-    		if ((int) item1.get(i).getPosition() != (int) item2.get(i).getPosition()) {
-    			return false;
-    		}
-    	}
-    	
-    	return true;
-    }
-    
-    public static boolean validateDIDResults (List<DIDResult> item1, List<DIDResult> item2) {
-    	if (item1 == null) {
-    		return ( item2 == null );
-    	}
-    	if (item2 == null) {
-    		return ( item1 == null );
-    	}
-    	
-    	if (item1.size() != item2.size()) {
-    		return false;
-    	}
-    	
-    	for (int i = 0; i < item1.size(); i++) {
-    		if (!item1.get(i).getData().equals(item2.get(i).getData())) {
-    			return false;
-    		}
-    		if (item1.get(i).getResultCode() != item2.get(i).getResultCode()) {
-    			return false;
-    		}
-    	}
-    	
-    	return true;
-    }
-    
-    public static boolean validateHeaders(Headers item1, Headers item2){
-        if (item1 == null) {
-            return ( item2 == null );
-        }
-        if (item2 == null) {
-            return ( item1 == null );
-        }
-        
-        if( ! item1.getDoInput().equals(item2.getDoInput()) ){
-            return false;
-        }
-        
-        if( ! item1.getDoOutput().equals(item2.getDoOutput()) ){
-            return false;
-        }
-        
-        if( ! item1.getInstanceFollowRedirects().equals(item2.getInstanceFollowRedirects()) ){
-            return false;
-        }
-        
-        if( ! item1.getUseCaches().equals(item2.getUseCaches()) ){
-            return false;
-        }
-        
-        if( ! item1.getCharset().equals(item2.getCharset()) ){
-            return false;
-        }
-        
-        if( ! item1.getConnectTimeout().equals(item2.getConnectTimeout()) ){
-            return false;
-        }
-        
-        if( ! item1.getContentLength().equals(item2.getContentLength()) ){
-            return false;
-        }
-        
-        if( ! item1.getContentType().equals(item2.getContentType()) ){
-            return false;
-        }
-        
-        if( ! item1.getReadTimeout().equals(item2.getReadTimeout()) ){
-            return false;
-        }
-        
-        if( ! item1.getRequestMethod().equals(item2.getRequestMethod()) ){
-            return false;
-        }
-        
-        return true;
-    }
-
-	public static boolean validateHMICapabilities(HMICapabilities hmiA, HMICapabilities hmiB){
-		if(hmiA.isPhoneCallAvailable() != hmiB.isPhoneCallAvailable()){
-			return false;
-		}
-
-		if(hmiA.isVideoStreamingAvailable() != hmiB.isVideoStreamingAvailable()){
-			return false;
-		}
-
-		if(hmiA.isNavigationAvailable() != hmiB.isNavigationAvailable()){
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateHMIZoneCapabilities(List<HmiZoneCapabilities> hmizA, List<HmiZoneCapabilities> hmizB){
-		for(int i = 0; i < hmizA.size(); i++){
-			if(!hmizA.get(i).equals(hmizB.get(i))){
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public static boolean validateSpeechCapabilities(List<SpeechCapabilities> spA, List<SpeechCapabilities> spB){
-		for(int i = 0; i < spA.size(); i++){
-			if(!spA.get(i).equals(spB.get(i))){
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public static boolean validatePreRecordedSpeechCapabilities(List<PrerecordedSpeech> spA, List<PrerecordedSpeech> spB){
-		for(int i = 0; i < spA.size(); i++){
-			if(!spA.get(i).equals(spB.get(i))){
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public static boolean validateVideoStreamingFormat(VideoStreamingFormat a, VideoStreamingFormat b){
-		if(!a.getCodec().equals(b.getCodec())){
-			return false;
-		}
-
-		if(!a.getProtocol().equals(b.getProtocol())){
-			return false;
-		}
-
-		return true;
-	}
-
-	public static boolean validateVideoStreamingCapability(VideoStreamingCapability a, VideoStreamingCapability b){
-		if(!validateImageResolution(a.getPreferredResolution(), b.getPreferredResolution())){
-			return false;
-		}
-
-		if(!a.getMaxBitrate().equals(b.getMaxBitrate())){
-			return false;
-		}
-
-		for(int i = 0; i < a.getSupportedFormats().size(); i++){
-			if(!validateVideoStreamingFormat(a.getSupportedFormats().get(i), b.getSupportedFormats().get(i))){
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	public static boolean validateGrid(Grid g1, Grid g2) {
-    	String tag = "validateGrid";
-    	if (g1 == null) {
-    		return (g2 == null);
-		}
-    	if (g2 == null) {
-    		return (g1 == null);
-		}
-    	if (g1.getCol() != g2.getCol()) {
-    		log(tag, "Columns do not match");
-    		return false;
-		}
-    	if (g1.getRow() != g2.getRow()) {
-    		log(tag, "Rows do not match");
-    		return false;
-		}
-		if (g1.getLevel() != g2.getLevel()) {
-			log(tag, "Levels do not match");
-			return false;
-		}
-    	if (g1.getColSpan() != g2.getColSpan()) {
-			log(tag, "Column spans do not match");
-    		return false;
-		}
-    	if (g1.getRowSpan() != g2.getRowSpan()) {
-    		log(tag, "Row spans do not match");
-    		return false;
-		}
-    	if (g1.getLevelSpan() != g2.getLevelSpan()) {
-    		log(tag, "Level spans do not match");
-    		return false;
-		}
-
-    	return true;
-	}
-
-	public static boolean validateModuleInfo(ModuleInfo m1, ModuleInfo m2) {
-		if (m1 == null) {
-			return (m2 == null);
-		}
-		if (m2 == null) {
-			return (m1 == null);
-		}
-		if (!m1.getModuleId().equals(m2.getModuleId())) {
-			return false;
-		}
-		if (!m1.getMultipleAccessAllowance().equals(m2.getMultipleAccessAllowance())) {
-			return false;
-		}
-		if (!validateGrid(m1.getModuleLocation(), m2.getModuleLocation())) {
-			return false;
-		}
-		if (!validateGrid(m1.getModuleServiceArea(), m2.getModuleServiceArea())) {
-			return false;
-		}
-
-    	return true;
-	}
-
-	public static boolean validateSeatLocation(SeatLocation cap1, SeatLocation cap2) {
-		if (cap1 == null) {
-			return (cap2 == null);
-		}
-		if (cap2 == null) {
-			return (cap1 == null);
-		}
-		return validateGrid(cap1.getGrid(), cap2.getGrid());
-	}
+    public static boolean validateTurnList(List<Turn> item1, List<Turn> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (!item1.get(i).getNavigationText().equals(item2.get(i).getNavigationText())) {
+                return false;
+            }
+            if (!validateImage(item1.get(i).getTurnIcon(), item2.get(i).getTurnIcon())) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateAudioPassThruCapabilities(List<AudioPassThruCapabilities> item1, List<AudioPassThruCapabilities> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (item1.get(i).getAudioType() != item2.get(i).getAudioType()) {
+                return false;
+            }
+            if (item1.get(i).getBitsPerSample() != item2.get(i).getBitsPerSample()) {
+                return false;
+            }
+            if (item1.get(i).getSamplingRate() != item2.get(i).getSamplingRate()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validatePcmStreamCapabilities(AudioPassThruCapabilities item1, AudioPassThruCapabilities item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.getAudioType() != item2.getAudioType()) {
+            return false;
+        }
+
+        if (item1.getBitsPerSample() != item2.getBitsPerSample()) {
+            return false;
+        }
+
+        if (item1.getSamplingRate() != item2.getSamplingRate()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validatePresetBankCapabilities(PresetBankCapabilities item1, PresetBankCapabilities item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.onScreenPresetsAvailable() != item2.onScreenPresetsAvailable()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateVehicleType(VehicleType item1, VehicleType item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.getMake() != item2.getMake() ||
+                item1.getModel() != item2.getModel() ||
+                item1.getTrim() != item2.getTrim() ||
+                item1.getModelYear() != item2.getModelYear()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateKeyboardProperties(KeyboardProperties item1, KeyboardProperties item2) {
+        if (item1 == null) {
+            log("1", item2.toString());
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            log("2", item1.toString());
+            return (item1 == null);
+        }
+
+        if (!item1.getAutoCompleteText().equals(item2.getAutoCompleteText())) {
+            log("ACT", item1.getAutoCompleteText().toString() + " | " + item2.getAutoCompleteText().toString());
+            return false;
+        }
+        if (item1.getKeyboardLayout() != item2.getKeyboardLayout()) {
+            log("KL", item1.getKeyboardLayout().toString() + " | " + item2.getKeyboardLayout().toString());
+            return false;
+        }
+        if (item1.getKeypressMode() != item2.getKeypressMode()) {
+            log("KM", item1.getKeypressMode() + " | " + item2.getKeypressMode());
+            return false;
+        }
+        if (item1.getLanguage() != item2.getLanguage()) {
+            log("L", item1.getLanguage().toString() + " | " + item2.getLanguage().toString());
+            return false;
+        }
+        if (!validateStringList(item1.getLimitedCharacterList(), item2.getLimitedCharacterList())) {
+            log("List", item1.getLimitedCharacterList().toString() + " | " + item2.getLimitedCharacterList().toString());
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateStartTime(StartTime item1, StartTime item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.getHours() != item2.getHours()) {
+            return false;
+        }
+        if (item1.getMinutes() != item2.getMinutes()) {
+            return false;
+        }
+        if (item1.getSeconds() != item2.getSeconds()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateVrHelpItems(List<VrHelpItem> item1, List<VrHelpItem> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (!item1.get(i).getText().equals(item2.get(i).getText())) {
+                return false;
+            }
+            if (!validateImage(item1.get(i).getImage(), item2.get(i).getImage())) {
+                return false;
+            }
+            if ((int) item1.get(i).getPosition() != (int) item2.get(i).getPosition()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateDIDResults(List<DIDResult> item1, List<DIDResult> item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (item1.size() != item2.size()) {
+            return false;
+        }
+
+        for (int i = 0; i < item1.size(); i++) {
+            if (!item1.get(i).getData().equals(item2.get(i).getData())) {
+                return false;
+            }
+            if (item1.get(i).getResultCode() != item2.get(i).getResultCode()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateHeaders(Headers item1, Headers item2) {
+        if (item1 == null) {
+            return (item2 == null);
+        }
+        if (item2 == null) {
+            return (item1 == null);
+        }
+
+        if (!item1.getDoInput().equals(item2.getDoInput())) {
+            return false;
+        }
+
+        if (!item1.getDoOutput().equals(item2.getDoOutput())) {
+            return false;
+        }
+
+        if (!item1.getInstanceFollowRedirects().equals(item2.getInstanceFollowRedirects())) {
+            return false;
+        }
+
+        if (!item1.getUseCaches().equals(item2.getUseCaches())) {
+            return false;
+        }
+
+        if (!item1.getCharset().equals(item2.getCharset())) {
+            return false;
+        }
+
+        if (!item1.getConnectTimeout().equals(item2.getConnectTimeout())) {
+            return false;
+        }
+
+        if (!item1.getContentLength().equals(item2.getContentLength())) {
+            return false;
+        }
+
+        if (!item1.getContentType().equals(item2.getContentType())) {
+            return false;
+        }
+
+        if (!item1.getReadTimeout().equals(item2.getReadTimeout())) {
+            return false;
+        }
+
+        if (!item1.getRequestMethod().equals(item2.getRequestMethod())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateHMICapabilities(HMICapabilities hmiA, HMICapabilities hmiB) {
+        if (hmiA.isPhoneCallAvailable() != hmiB.isPhoneCallAvailable()) {
+            return false;
+        }
+
+        if (hmiA.isVideoStreamingAvailable() != hmiB.isVideoStreamingAvailable()) {
+            return false;
+        }
+
+        if (hmiA.isNavigationAvailable() != hmiB.isNavigationAvailable()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateHMIZoneCapabilities(List<HmiZoneCapabilities> hmizA, List<HmiZoneCapabilities> hmizB) {
+        for (int i = 0; i < hmizA.size(); i++) {
+            if (!hmizA.get(i).equals(hmizB.get(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean validateSpeechCapabilities(List<SpeechCapabilities> spA, List<SpeechCapabilities> spB) {
+        for (int i = 0; i < spA.size(); i++) {
+            if (!spA.get(i).equals(spB.get(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean validatePreRecordedSpeechCapabilities(List<PrerecordedSpeech> spA, List<PrerecordedSpeech> spB) {
+        for (int i = 0; i < spA.size(); i++) {
+            if (!spA.get(i).equals(spB.get(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean validateVideoStreamingFormat(VideoStreamingFormat a, VideoStreamingFormat b) {
+        if (!a.getCodec().equals(b.getCodec())) {
+            return false;
+        }
+
+        if (!a.getProtocol().equals(b.getProtocol())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateVideoStreamingCapability(VideoStreamingCapability a, VideoStreamingCapability b) {
+        if (!validateImageResolution(a.getPreferredResolution(), b.getPreferredResolution())) {
+            return false;
+        }
+
+        if (!a.getMaxBitrate().equals(b.getMaxBitrate())) {
+            return false;
+        }
+
+        for (int i = 0; i < a.getSupportedFormats().size(); i++) {
+            if (!validateVideoStreamingFormat(a.getSupportedFormats().get(i), b.getSupportedFormats().get(i))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    public static boolean validateGrid(Grid g1, Grid g2) {
+        String tag = "validateGrid";
+        if (g1 == null) {
+            return (g2 == null);
+        }
+        if (g2 == null) {
+            return (g1 == null);
+        }
+        if (g1.getCol() != g2.getCol()) {
+            log(tag, "Columns do not match");
+            return false;
+        }
+        if (g1.getRow() != g2.getRow()) {
+            log(tag, "Rows do not match");
+            return false;
+        }
+        if (g1.getLevel() != g2.getLevel()) {
+            log(tag, "Levels do not match");
+            return false;
+        }
+        if (g1.getColSpan() != g2.getColSpan()) {
+            log(tag, "Column spans do not match");
+            return false;
+        }
+        if (g1.getRowSpan() != g2.getRowSpan()) {
+            log(tag, "Row spans do not match");
+            return false;
+        }
+        if (g1.getLevelSpan() != g2.getLevelSpan()) {
+            log(tag, "Level spans do not match");
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateModuleInfo(ModuleInfo m1, ModuleInfo m2) {
+        if (m1 == null) {
+            return (m2 == null);
+        }
+        if (m2 == null) {
+            return (m1 == null);
+        }
+        if (!m1.getModuleId().equals(m2.getModuleId())) {
+            return false;
+        }
+        if (!m1.getMultipleAccessAllowance().equals(m2.getMultipleAccessAllowance())) {
+            return false;
+        }
+        if (!validateGrid(m1.getModuleLocation(), m2.getModuleLocation())) {
+            return false;
+        }
+        if (!validateGrid(m1.getModuleServiceArea(), m2.getModuleServiceArea())) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static boolean validateSeatLocation(SeatLocation cap1, SeatLocation cap2) {
+        if (cap1 == null) {
+            return (cap2 == null);
+        }
+        if (cap2 == null) {
+            return (cap1 == null);
+        }
+        return validateGrid(cap1.getGrid(), cap2.getGrid());
+    }
 
     public static boolean validateGearStatuses(GearStatus status1, GearStatus status2) {
         if (status1 == null) {
@@ -3847,10 +3849,10 @@ public class Validator{
 
     public static boolean validateWindowStatuses(List<WindowStatus> item1, List<WindowStatus> item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
         }
 
         if (item1.size() != item2.size()) {
@@ -3860,11 +3862,11 @@ public class Validator{
         Iterator<WindowStatus> iterator1 = item1.iterator();
         Iterator<WindowStatus> iterator2 = item2.iterator();
 
-        while(iterator1.hasNext() && iterator2.hasNext()){
+        while (iterator1.hasNext() && iterator2.hasNext()) {
             WindowStatus windowStatus1 = iterator1.next();
             WindowStatus windowStatus2 = iterator2.next();
 
-            if(!validateWindowStatus(windowStatus1, windowStatus2)){
+            if (!validateWindowStatus(windowStatus1, windowStatus2)) {
                 return false;
             }
         }
@@ -3874,10 +3876,10 @@ public class Validator{
 
     public static boolean validateWindowStatus(WindowStatus item1, WindowStatus item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
         }
 
         if (!validateWindowStates(item1.getState(), item2.getState())) {
@@ -3890,12 +3892,12 @@ public class Validator{
         return true;
     }
 
-    public static boolean validateWindowStates (WindowState item1, WindowState item2) {
+    public static boolean validateWindowStates(WindowState item1, WindowState item2) {
         if (item1 == null) {
-            return ( item2 == null );
+            return (item2 == null);
         }
         if (item2 == null) {
-            return ( item1 == null );
+            return (item1 == null);
         }
 
         Integer approxPosition1 = item1.getApproximatePosition();
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
index 569b13b13..a13486983 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
@@ -52,399 +52,400 @@ import org.json.JSONException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class VehicleDataHelper{
-	//top level variables for OnVehicleData
+public class VehicleDataHelper {
+    //top level variables for OnVehicleData
     public static final double SPEED = 35.6;
-	public static final int RPM = 2500;
-	public static final double EXTERNAL_TEMPERATURE = 140.1;
-	public static final double FUEL_LEVEL = 3.7;
-	public static final String VIN = "FIUE4WHR3984579THIRU";
-	public static final PRNDL PRNDL_FINAL = PRNDL.SECOND;
-	public static final TireStatus TIRE_PRESSURE = new TireStatus();
-	public static final double ENGINE_TORQUE = 518.3;
-	public static final float ENGINE_OIL_LIFE = 19.3f;
-	public static final int ODOMETER = 140000;
-	public static final GPSData GPS = new GPSData();
-	public static final ComponentVolumeStatus FUEL_LEVEL_STATE = ComponentVolumeStatus.ALERT;
-	public static final double INSTANT_FUEL_CONSUMPTION = 2.76;
-	public static final BeltStatus BELT_STATUS = new BeltStatus();
-	public static final BodyInformation BODY_INFORMATION = new BodyInformation();
-	public static final DeviceStatus DEVICE_STATUS = new DeviceStatus();
-	public static final VehicleDataEventStatus DRIVER_BRAKING = VehicleDataEventStatus.NO;
-	public static final WiperStatus WIPER_STATUS = WiperStatus.COURTESYWIPE;
-	public static final HeadLampStatus HEAD_LAMP_STATUS = new HeadLampStatus();
-	public static final double ACC_PEDAL_POSITION = 28.29;
-	public static final double STEERING_WHEEL_ANGLE = 70.5;
-	public static final ECallInfo E_CALL_INFO = new ECallInfo();
-	public static final AirbagStatus AIRBAG_STATUS = new AirbagStatus();
-	public static final EmergencyEvent EMERGENCY_EVENT = new EmergencyEvent();
-	public static final ClusterModeStatus CLUSTER_MODE_STATUS = new ClusterModeStatus();
-	public static final WindowStatus WINDOW_STATUS = new WindowStatus();
-	public static final List<WindowStatus> WINDOW_STATUS_LIST = new ArrayList<>(1);
-	public static final MyKey MY_KEY = new MyKey();
-	public static final FuelRange FUEL_RANGE = new FuelRange();
-	public static final List<FuelRange> FUEL_RANGE_LIST = new ArrayList<FuelRange>(1);
-	public static final TurnSignal TURN_SIGNAL = TurnSignal.OFF;
-	public static final ElectronicParkBrakeStatus ELECTRONIC_PARK_BRAKE_STATUS = ElectronicParkBrakeStatus.CLOSED;
-	public static final StabilityControlsStatus STABILITY_CONTROLS_STATUS = new StabilityControlsStatus();
-	public static final String OEM_CUSTOM_VEHICLE_DATA_STATE = "oemCustomVehicleDataState";
-	public static final Boolean HANDS_OFF_STEERING = Boolean.TRUE;
-
-	//other variables inside some of the above objects
+    public static final int RPM = 2500;
+    public static final double EXTERNAL_TEMPERATURE = 140.1;
+    public static final double FUEL_LEVEL = 3.7;
+    public static final String VIN = "FIUE4WHR3984579THIRU";
+    public static final PRNDL PRNDL_FINAL = PRNDL.SECOND;
+    public static final TireStatus TIRE_PRESSURE = new TireStatus();
+    public static final double ENGINE_TORQUE = 518.3;
+    public static final float ENGINE_OIL_LIFE = 19.3f;
+    public static final int ODOMETER = 140000;
+    public static final GPSData GPS = new GPSData();
+    public static final ComponentVolumeStatus FUEL_LEVEL_STATE = ComponentVolumeStatus.ALERT;
+    public static final double INSTANT_FUEL_CONSUMPTION = 2.76;
+    public static final BeltStatus BELT_STATUS = new BeltStatus();
+    public static final BodyInformation BODY_INFORMATION = new BodyInformation();
+    public static final DeviceStatus DEVICE_STATUS = new DeviceStatus();
+    public static final VehicleDataEventStatus DRIVER_BRAKING = VehicleDataEventStatus.NO;
+    public static final WiperStatus WIPER_STATUS = WiperStatus.COURTESYWIPE;
+    public static final HeadLampStatus HEAD_LAMP_STATUS = new HeadLampStatus();
+    public static final double ACC_PEDAL_POSITION = 28.29;
+    public static final double STEERING_WHEEL_ANGLE = 70.5;
+    public static final ECallInfo E_CALL_INFO = new ECallInfo();
+    public static final AirbagStatus AIRBAG_STATUS = new AirbagStatus();
+    public static final EmergencyEvent EMERGENCY_EVENT = new EmergencyEvent();
+    public static final ClusterModeStatus CLUSTER_MODE_STATUS = new ClusterModeStatus();
+    public static final WindowStatus WINDOW_STATUS = new WindowStatus();
+    public static final List<WindowStatus> WINDOW_STATUS_LIST = new ArrayList<>(1);
+    public static final MyKey MY_KEY = new MyKey();
+    public static final FuelRange FUEL_RANGE = new FuelRange();
+    public static final List<FuelRange> FUEL_RANGE_LIST = new ArrayList<FuelRange>(1);
+    public static final TurnSignal TURN_SIGNAL = TurnSignal.OFF;
+    public static final ElectronicParkBrakeStatus ELECTRONIC_PARK_BRAKE_STATUS = ElectronicParkBrakeStatus.CLOSED;
+    public static final StabilityControlsStatus STABILITY_CONTROLS_STATUS = new StabilityControlsStatus();
+    public static final String OEM_CUSTOM_VEHICLE_DATA_STATE = "oemCustomVehicleDataState";
+    public static final Boolean HANDS_OFF_STEERING = Boolean.TRUE;
+
+    //other variables inside some of the above objects
     // tire status
-	public static final WarningLightStatus 	  TIRE_PRESSURE_TELL_TALE = WarningLightStatus.ON;
-	public static final ComponentVolumeStatus TIRE_PRESSURE_LEFT_FRONT = ComponentVolumeStatus.NORMAL;
-	public static final ComponentVolumeStatus TIRE_PRESSURE_RIGHT_FRONT = ComponentVolumeStatus.FAULT;
-	public static final ComponentVolumeStatus TIRE_PRESSURE_LEFT_REAR = ComponentVolumeStatus.LOW;
-	public static final ComponentVolumeStatus TIRE_PRESSURE_RIGHT_REAR = ComponentVolumeStatus.NORMAL;
-	public static final ComponentVolumeStatus TIRE_PRESSURE_INNER_LEFT_REAR = ComponentVolumeStatus.LOW;
-	public static final ComponentVolumeStatus TIRE_PRESSURE_INNER_RIGHT_REAR = ComponentVolumeStatus.ALERT;
-	
+    public static final WarningLightStatus TIRE_PRESSURE_TELL_TALE = WarningLightStatus.ON;
+    public static final ComponentVolumeStatus TIRE_PRESSURE_LEFT_FRONT = ComponentVolumeStatus.NORMAL;
+    public static final ComponentVolumeStatus TIRE_PRESSURE_RIGHT_FRONT = ComponentVolumeStatus.FAULT;
+    public static final ComponentVolumeStatus TIRE_PRESSURE_LEFT_REAR = ComponentVolumeStatus.LOW;
+    public static final ComponentVolumeStatus TIRE_PRESSURE_RIGHT_REAR = ComponentVolumeStatus.NORMAL;
+    public static final ComponentVolumeStatus TIRE_PRESSURE_INNER_LEFT_REAR = ComponentVolumeStatus.LOW;
+    public static final ComponentVolumeStatus TIRE_PRESSURE_INNER_RIGHT_REAR = ComponentVolumeStatus.ALERT;
+
     // GPS data
-	public static final Double GPS_LONGITUDE = 104.2;
-	public static final Double GPS_LATITUDE = 56.3;
-	public static final Integer GPS_YEAR = 2015;
-	public static final Integer GPS_MONTH = 7;
-	public static final Integer GPS_DAY = 14;
-	public static final Integer GPS_HOURS = 11;
-	public static final Integer GPS_MINUTES = 38;
-	public static final Integer GPS_SECONDS = 12;
-	public static final CompassDirection GPS_DIRECTION = CompassDirection.NORTHWEST;
-	public static final Double GPS_PDOP = 4.1;
-	public static final Double GPS_HDOP = 2.4;
-	public static final Double GPS_VDOP = 5.5;
-	public static final Boolean GPS_ACTUAL = true;
-	public static final Integer GPS_SATELLITES = 3;
-	public static final Dimension GPS_DIMENSION = Dimension._2D;
-	public static final Double GPS_ALTITUDE = 768.5;
-	public static final Double GPS_HEADING = 315.0;
-	public static final Double GPS_SPEED = 30.5;
-	public static final Boolean GPS_SHIFTED = true;
-	
+    public static final Double GPS_LONGITUDE = 104.2;
+    public static final Double GPS_LATITUDE = 56.3;
+    public static final Integer GPS_YEAR = 2015;
+    public static final Integer GPS_MONTH = 7;
+    public static final Integer GPS_DAY = 14;
+    public static final Integer GPS_HOURS = 11;
+    public static final Integer GPS_MINUTES = 38;
+    public static final Integer GPS_SECONDS = 12;
+    public static final CompassDirection GPS_DIRECTION = CompassDirection.NORTHWEST;
+    public static final Double GPS_PDOP = 4.1;
+    public static final Double GPS_HDOP = 2.4;
+    public static final Double GPS_VDOP = 5.5;
+    public static final Boolean GPS_ACTUAL = true;
+    public static final Integer GPS_SATELLITES = 3;
+    public static final Dimension GPS_DIMENSION = Dimension._2D;
+    public static final Double GPS_ALTITUDE = 768.5;
+    public static final Double GPS_HEADING = 315.0;
+    public static final Double GPS_SPEED = 30.5;
+    public static final Boolean GPS_SHIFTED = true;
+
     // belt status
-	public static final VehicleDataEventStatus BELT_STATUS_DRIVER_DEPLOYED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus BELT_STATUS_PASSENGER_DEPLOYED = VehicleDataEventStatus.YES;
-	public static final VehicleDataEventStatus BELT_STATUS_PASSENGER_BELTED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus BELT_STATUS_DRIVER_BELTED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus BELT_STATUS_LEFT_ROW_2_BELTED = VehicleDataEventStatus.NO_EVENT;
-	public static final VehicleDataEventStatus BELT_STATUS_PASSENGER_CHILD = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus BELT_STATUS_RIGHT_ROW_2_BELTED = VehicleDataEventStatus.NO_EVENT;
-	public static final VehicleDataEventStatus BELT_STATUS_MIDDLE_ROW_2_BELTED = VehicleDataEventStatus.YES;
-	public static final VehicleDataEventStatus BELT_STATUS_MIDDLE_ROW_3_BELTED = VehicleDataEventStatus.NO_EVENT;
-	public static final VehicleDataEventStatus BELT_STATUS_LEFT_ROW_3_BELTED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus BELT_STATUS_RIGHT_ROW_3_BELTED = VehicleDataEventStatus.NO_EVENT;
-	public static final VehicleDataEventStatus BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED = VehicleDataEventStatus.NO_EVENT;
-	public static final VehicleDataEventStatus BELT_STATUS_MIDDLE_ROW_1_DEPLOYED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus BELT_STATUS_MIDDLE_ROW_1_BELTED = VehicleDataEventStatus.YES;
-	
+    public static final VehicleDataEventStatus BELT_STATUS_DRIVER_DEPLOYED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus BELT_STATUS_PASSENGER_DEPLOYED = VehicleDataEventStatus.YES;
+    public static final VehicleDataEventStatus BELT_STATUS_PASSENGER_BELTED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus BELT_STATUS_DRIVER_BELTED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus BELT_STATUS_LEFT_ROW_2_BELTED = VehicleDataEventStatus.NO_EVENT;
+    public static final VehicleDataEventStatus BELT_STATUS_PASSENGER_CHILD = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus BELT_STATUS_RIGHT_ROW_2_BELTED = VehicleDataEventStatus.NO_EVENT;
+    public static final VehicleDataEventStatus BELT_STATUS_MIDDLE_ROW_2_BELTED = VehicleDataEventStatus.YES;
+    public static final VehicleDataEventStatus BELT_STATUS_MIDDLE_ROW_3_BELTED = VehicleDataEventStatus.NO_EVENT;
+    public static final VehicleDataEventStatus BELT_STATUS_LEFT_ROW_3_BELTED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus BELT_STATUS_RIGHT_ROW_3_BELTED = VehicleDataEventStatus.NO_EVENT;
+    public static final VehicleDataEventStatus BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED = VehicleDataEventStatus.NO_EVENT;
+    public static final VehicleDataEventStatus BELT_STATUS_MIDDLE_ROW_1_DEPLOYED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus BELT_STATUS_MIDDLE_ROW_1_BELTED = VehicleDataEventStatus.YES;
+
     // body information
-	public static final Boolean BODY_INFORMATION_PARK_BRAKE = false;
-	public static final IgnitionStableStatus BODY_INFORMATION_IGNITION_STATUS = IgnitionStableStatus.IGNITION_SWITCH_NOT_STABLE;
-	public static final IgnitionStatus BODY_INFORMATION_IGNITION_STABLE_STATUS = IgnitionStatus.ACCESSORY;
-	public static final Boolean BODY_INFORMATION_DRIVER_AJAR = true;
-	public static final Boolean BODY_INFORMATION_PASSENGER_AJAR = true;
-	public static final Boolean BODY_INFORMATION_REAR_LEFT_AJAR = false;
-	public static final Boolean BODY_INFORMATION_REAR_RIGHT_AJAR = true;
+    public static final Boolean BODY_INFORMATION_PARK_BRAKE = false;
+    public static final IgnitionStableStatus BODY_INFORMATION_IGNITION_STATUS = IgnitionStableStatus.IGNITION_SWITCH_NOT_STABLE;
+    public static final IgnitionStatus BODY_INFORMATION_IGNITION_STABLE_STATUS = IgnitionStatus.ACCESSORY;
+    public static final Boolean BODY_INFORMATION_DRIVER_AJAR = true;
+    public static final Boolean BODY_INFORMATION_PASSENGER_AJAR = true;
+    public static final Boolean BODY_INFORMATION_REAR_LEFT_AJAR = false;
+    public static final Boolean BODY_INFORMATION_REAR_RIGHT_AJAR = true;
 
     // device status
-	public static final Boolean DEVICE_STATUS_VOICE_REC = true;
-	public static final Boolean DEVICE_STATUS_BT_ICON = true;
-	public static final Boolean DEVICE_STATUS_CALL_ACTIVE = true;
-	public static final Boolean DEVICE_STATUS_PHONE_ROAMING = false;
-	public static final Boolean DEVICE_STATUS_TEXT_MSG_AVAILABLE = false;
-	public static final DeviceLevelStatus DEVICE_STATUS_BATT_LEVEL_STATUS = DeviceLevelStatus.TWO_LEVEL_BARS;
-	public static final Boolean DEVICE_STATUS_STEREO_MUTED = false;
-	public static final Boolean DEVICE_STATUS_MONO_MUTED = true;
-	public static final DeviceLevelStatus DEVICE_STATUS_SIGNAL_LEVEL_STATUS = DeviceLevelStatus.ONE_LEVEL_BARS;
-	public static final PrimaryAudioSource DEVICE_STATUS_PRIMARY_AUDIO = PrimaryAudioSource.BLUETOOTH_STEREO_BTST;
-	public static final Boolean DEVICE_STATUS_E_CALL_ACTIVE = false;
-	
-	// head lamp status
-	public static final AmbientLightStatus HEAD_LAMP_STATUS_AMBIENT_STATUS = AmbientLightStatus.TWILIGHT_3;
-	public static final Boolean HEAD_LAMP_HIGH_BEAMS = true;
-	public static final Boolean HEAD_LAMP_LOW_BEAMS = false;
-	
-	// e call info
-	public static final VehicleDataNotificationStatus E_CALL_INFO_E_CALL_NOTIFICATION_STATUS = VehicleDataNotificationStatus.NOT_SUPPORTED;
-	public static final VehicleDataNotificationStatus E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS = VehicleDataNotificationStatus.NOT_USED;
-	public static final ECallConfirmationStatus E_CALL_INFO_CONFIRMATION_STATUS = ECallConfirmationStatus.ECALL_CONFIGURED_OFF;
-	
-	// airbag status
-	public static final VehicleDataEventStatus AIRBAG_STATUS_DRIVER_DEPLOYED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED = VehicleDataEventStatus.YES;
-	public static final VehicleDataEventStatus AIRBAG_STATUS_PASSENGER_DEPLOYED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED = VehicleDataEventStatus.NO;
-	public static final VehicleDataEventStatus AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED = VehicleDataEventStatus.YES;
-	public static final VehicleDataEventStatus AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED = VehicleDataEventStatus.NO;
-
-	// emergency event
-	public static final EmergencyEventType EMERGENCY_EVENT_TYPE = EmergencyEventType.FRONTAL;
-	public static final FuelCutoffStatus EMERGENCY_EVENT_FUEL_CUTOFF_STATUS = FuelCutoffStatus.TERMINATE_FUEL;
-	public static final VehicleDataEventStatus EMERGENCY_EVENT_ROLLOVER_EVENT = VehicleDataEventStatus.YES;
-	public static final Integer EMERGENCY_EVENT_MAX_CHANGE_VELOCITY = 5;
-	public static final VehicleDataEventStatus EMERGENCY_EVENT_MULTIPLE_EVENTS = VehicleDataEventStatus.NO;
-	
-	// cluster mode status
-	public static final Boolean CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE = true;
-	public static final PowerModeQualificationStatus CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS = 
-			PowerModeQualificationStatus.POWER_MODE_EVALUATION_IN_PROGRESS;
-	public static final CarModeStatus CLUSTER_MODE_STATUS_CAR_MODE_STATUS = CarModeStatus.TRANSPORT;
-	public static final PowerModeStatus CLUSTER_MODE_STATUS_POWER_MODE_STATUS = PowerModeStatus.POST_ACCESORY_0;
-	
-	// my key
-	public static final VehicleDataStatus MY_KEY_E_911_OVERRIDE = VehicleDataStatus.NO_DATA_EXISTS;
-
-	// fuel range
-	public static final FuelType FUEL_RANGE_TYPE = FuelType.GASOLINE;
-	public static final Float FUEL_RANGE_RANGE = TestValues.GENERAL_FLOAT;
-	public static final Float FUEL_RANGE_CAPACITY = TestValues.GENERAL_FLOAT;
-	public static final CapacityUnit FUEL_RANGE_CAPACITY_UNIT = TestValues.GENERAL_CAPACITYUNIT;
-	public static final Float FUEL_RANGE_LEVEL = TestValues.GENERAL_FLOAT;
-	public static final ComponentVolumeStatus FUEL_RANGE_LEVEL_STATE = TestValues.GENERAL_COMPONENTVOLUMESTATUS;
-
-	// Gear status
-	public static final GearStatus GEAR_STATUS = new GearStatus();
-	public static final PRNDL USER_SELECTED_GEAR = PRNDL.FIRST;
-	public static final PRNDL ACTUAL_GEAR = PRNDL.SECOND;
-	public static final TransmissionType TRANSMISSION_TYPE = TransmissionType.ELECTRIC_VARIABLE;
-
-	// WindowStatus
-	public static final Grid LOCATION_GRID = TestValues.GENERAL_LOCATION_GRID;
-	public static final WindowState WINDOW_STATE = TestValues.GENERAL_WINDOW_STATE;
-
-	// stability control status
-	public static final VehicleDataStatus ESC_SYSTEM = VehicleDataStatus.ON;
-	public static final VehicleDataStatus S_WAY_TRAILER = VehicleDataStatus.OFF;
-
-	public static final JSONArray JSON_FUEL_RANGE = new JSONArray();
-
-	//the OnVehicleData which stores all the information above
-	public static final OnVehicleData VEHICLE_DATA = new OnVehicleData();
-	//GetVehicleDataResponse data which stores the same things
-	public static final GetVehicleDataResponse VEHICLE_DATA_RESPONSE = new GetVehicleDataResponse();
-	
-	static {
-    	//TIRE_PRESSURE set up    	
-    	TIRE_PRESSURE.setPressureTellTale(TIRE_PRESSURE_TELL_TALE);
-    	SingleTireStatus tireLeftFront = new SingleTireStatus();
-    	tireLeftFront.setStatus(TIRE_PRESSURE_LEFT_FRONT);
-    	TIRE_PRESSURE.setLeftFront(tireLeftFront);
-    	SingleTireStatus tireRightFront = new SingleTireStatus();
-    	tireRightFront.setStatus(TIRE_PRESSURE_RIGHT_FRONT);
-    	TIRE_PRESSURE.setRightFront(tireRightFront);
-    	SingleTireStatus tireLeftRear = new SingleTireStatus();
-    	tireLeftRear.setStatus(TIRE_PRESSURE_LEFT_REAR);
-    	TIRE_PRESSURE.setLeftRear(tireLeftRear);
-    	SingleTireStatus tireRightRear = new SingleTireStatus();
-    	tireRightRear.setStatus(TIRE_PRESSURE_RIGHT_REAR);
-    	TIRE_PRESSURE.setRightRear(tireRightRear);
-    	SingleTireStatus tireInnerLeftRear = new SingleTireStatus();
-    	tireInnerLeftRear.setStatus(TIRE_PRESSURE_INNER_LEFT_REAR);
-    	TIRE_PRESSURE.setInnerLeftRear(tireInnerLeftRear);
-    	SingleTireStatus tireInnerRightRear = new SingleTireStatus();
-    	tireInnerRightRear.setStatus(TIRE_PRESSURE_INNER_RIGHT_REAR);
-    	TIRE_PRESSURE.setInnerRightRear(tireInnerRightRear);
-    	
-    	//GPS set up
-    	GPS.setLongitudeDegrees(GPS_LONGITUDE);
-    	GPS.setLatitudeDegrees(GPS_LATITUDE);
-    	GPS.setUtcYear(GPS_YEAR);
-    	GPS.setUtcMonth(GPS_MONTH);
-    	GPS.setUtcDay(GPS_DAY);
-    	GPS.setUtcHours(GPS_HOURS);
-    	GPS.setUtcMinutes(GPS_MINUTES);
-    	GPS.setUtcSeconds(GPS_SECONDS);
-    	GPS.setCompassDirection(GPS_DIRECTION);
-    	GPS.setPdop(GPS_PDOP);
-    	GPS.setHdop(GPS_HDOP);
-    	GPS.setVdop(GPS_VDOP);
-    	GPS.setActual(GPS_ACTUAL);
-    	GPS.setSatellites(GPS_SATELLITES);
-    	GPS.setDimension(GPS_DIMENSION);
-    	GPS.setAltitude(GPS_ALTITUDE);
-    	GPS.setHeading(GPS_HEADING);
-    	GPS.setSpeed(GPS_SPEED);
-    	GPS.setShifted(GPS_SHIFTED);
-
-    	//BELT_STATUS set up
-    	BELT_STATUS.setDriverBeltDeployed(BELT_STATUS_DRIVER_DEPLOYED);
-    	BELT_STATUS.setPassengerBeltDeployed(BELT_STATUS_PASSENGER_DEPLOYED);
-    	BELT_STATUS.setPassengerBuckleBelted(BELT_STATUS_PASSENGER_BELTED);
-    	BELT_STATUS.setDriverBuckleBelted(BELT_STATUS_DRIVER_BELTED);
-    	BELT_STATUS.setLeftRow2BuckleBelted(BELT_STATUS_LEFT_ROW_2_BELTED);
-    	BELT_STATUS.setPassengerChildDetected(BELT_STATUS_PASSENGER_CHILD);
-    	BELT_STATUS.setRightRow2BuckleBelted(BELT_STATUS_RIGHT_ROW_2_BELTED);
-    	BELT_STATUS.setMiddleRow2BuckleBelted(BELT_STATUS_MIDDLE_ROW_2_BELTED);
-    	BELT_STATUS.setMiddleRow3BuckleBelted(BELT_STATUS_MIDDLE_ROW_3_BELTED);
-    	BELT_STATUS.setLeftRow3BuckleBelted(BELT_STATUS_LEFT_ROW_3_BELTED);
-    	BELT_STATUS.setRightRow3BuckleBelted(BELT_STATUS_RIGHT_ROW_3_BELTED);
-    	BELT_STATUS.setLeftRearInflatableBelted(BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED);
-    	BELT_STATUS.setRightRearInflatableBelted(BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED);
-    	BELT_STATUS.setMiddleRow1BeltDeployed(BELT_STATUS_MIDDLE_ROW_1_DEPLOYED);
-    	BELT_STATUS.setMiddleRow1BuckleBelted(BELT_STATUS_MIDDLE_ROW_1_BELTED);
-    	
-    	//BODY_INFORMATION set up
-    	BODY_INFORMATION.setParkBrakeActive(BODY_INFORMATION_PARK_BRAKE);
-    	BODY_INFORMATION.setIgnitionStableStatus(BODY_INFORMATION_IGNITION_STATUS);
-    	BODY_INFORMATION.setIgnitionStatus(BODY_INFORMATION_IGNITION_STABLE_STATUS);
-    	BODY_INFORMATION.setDriverDoorAjar(BODY_INFORMATION_DRIVER_AJAR);
-    	BODY_INFORMATION.setPassengerDoorAjar(BODY_INFORMATION_PASSENGER_AJAR);
-    	BODY_INFORMATION.setRearLeftDoorAjar(BODY_INFORMATION_REAR_LEFT_AJAR);
-    	BODY_INFORMATION.setRearRightDoorAjar(BODY_INFORMATION_REAR_RIGHT_AJAR);
-    	
-    	//DEVICE_STATUS set up
-    	DEVICE_STATUS.setVoiceRecOn(DEVICE_STATUS_VOICE_REC);
-    	DEVICE_STATUS.setBtIconOn(DEVICE_STATUS_BT_ICON);
-    	DEVICE_STATUS.setCallActive(DEVICE_STATUS_CALL_ACTIVE);
-    	DEVICE_STATUS.setPhoneRoaming(DEVICE_STATUS_PHONE_ROAMING);
-    	DEVICE_STATUS.setTextMsgAvailable(DEVICE_STATUS_TEXT_MSG_AVAILABLE);
-    	DEVICE_STATUS.setBattLevelStatus(DEVICE_STATUS_BATT_LEVEL_STATUS);
-    	DEVICE_STATUS.setStereoAudioOutputMuted(DEVICE_STATUS_STEREO_MUTED);
-    	DEVICE_STATUS.setMonoAudioOutputMuted(DEVICE_STATUS_MONO_MUTED);
-    	DEVICE_STATUS.setSignalLevelStatus(DEVICE_STATUS_SIGNAL_LEVEL_STATUS);
-    	DEVICE_STATUS.setPrimaryAudioSource(DEVICE_STATUS_PRIMARY_AUDIO);
-    	DEVICE_STATUS.setECallEventActive(DEVICE_STATUS_E_CALL_ACTIVE);
-    	
-    	//HEAD_LAMP_STATUS set up
-    	HEAD_LAMP_STATUS.setAmbientLightStatus(HEAD_LAMP_STATUS_AMBIENT_STATUS);
-    	HEAD_LAMP_STATUS.setHighBeamsOn(HEAD_LAMP_HIGH_BEAMS);
-    	HEAD_LAMP_STATUS.setLowBeamsOn(HEAD_LAMP_LOW_BEAMS);
-    	
-    	//E_CALL_INFO set up
-    	E_CALL_INFO.setECallNotificationStatus(E_CALL_INFO_E_CALL_NOTIFICATION_STATUS);
-    	E_CALL_INFO.setAuxECallNotificationStatus(E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS);
-    	E_CALL_INFO.setECallConfirmationStatus(E_CALL_INFO_CONFIRMATION_STATUS);
-    	
-    	//AIRBAG_STATUS set up
-    	AIRBAG_STATUS.setDriverAirbagDeployed(AIRBAG_STATUS_DRIVER_DEPLOYED);
-    	AIRBAG_STATUS.setDriverSideAirbagDeployed(AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED);
-    	AIRBAG_STATUS.setDriverCurtainAirbagDeployed(AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED);
-    	AIRBAG_STATUS.setPassengerAirbagDeployed(AIRBAG_STATUS_PASSENGER_DEPLOYED);
-    	AIRBAG_STATUS.setPassengerCurtainAirbagDeployed(AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED);
-    	AIRBAG_STATUS.setDriverKneeAirbagDeployed(AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED);
-    	AIRBAG_STATUS.setPassengerSideAirbagDeployed(AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED);
-    	AIRBAG_STATUS.setPassengerKneeAirbagDeployed(AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED);
-    	
-    	//EMERGENCY_EVENT set up
-    	EMERGENCY_EVENT.setEmergencyEventType(EMERGENCY_EVENT_TYPE);
-    	EMERGENCY_EVENT.setFuelCutoffStatus(EMERGENCY_EVENT_FUEL_CUTOFF_STATUS);
-    	EMERGENCY_EVENT.setRolloverEvent(EMERGENCY_EVENT_ROLLOVER_EVENT);
-    	EMERGENCY_EVENT.setMaximumChangeVelocity(EMERGENCY_EVENT_MAX_CHANGE_VELOCITY);
-    	EMERGENCY_EVENT.setMultipleEvents(EMERGENCY_EVENT_MULTIPLE_EVENTS);
-    	
-    	//CLUSTER_MODE_STATUS set up
-    	CLUSTER_MODE_STATUS.setPowerModeActive(CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE);
-    	CLUSTER_MODE_STATUS.setPowerModeQualificationStatus(CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS);
-    	CLUSTER_MODE_STATUS.setCarModeStatus(CLUSTER_MODE_STATUS_CAR_MODE_STATUS);
-    	CLUSTER_MODE_STATUS.setPowerModeStatus(CLUSTER_MODE_STATUS_POWER_MODE_STATUS);
-    	
-    	//MY_KEY set up
-    	MY_KEY.setE911Override(MY_KEY_E_911_OVERRIDE);
-
-		// FUEL_RANGE and FUEL_RANGE_LIST set up
-		FUEL_RANGE.setType(FUEL_RANGE_TYPE);
-		FUEL_RANGE.setRange(FUEL_RANGE_RANGE);
-		FUEL_RANGE.setCapacity(FUEL_RANGE_CAPACITY);
-		FUEL_RANGE.setCapacityUnit(FUEL_RANGE_CAPACITY_UNIT);
-		FUEL_RANGE.setLevel(FUEL_RANGE_LEVEL);
-		FUEL_RANGE.setLevelState(FUEL_RANGE_LEVEL_STATE);
-		FUEL_RANGE_LIST.add(FUEL_RANGE);
-
-		//WINDOW_STATUS and WINDOW_STATUS_LIST set up
-		WINDOW_STATUS.setLocation(LOCATION_GRID);
-		WINDOW_STATUS.setState(WINDOW_STATE);
-		WINDOW_STATUS_LIST.add(WINDOW_STATUS);
-		// FUEL_RANGE json array set up
-		try {
-			JSON_FUEL_RANGE.put(FUEL_RANGE.serializeJSON());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-
-		// STABILITY_CONTROLS_STATUS
-		STABILITY_CONTROLS_STATUS.setEscSystem(VehicleDataStatus.ON);
-		STABILITY_CONTROLS_STATUS.setTrailerSwayControl(VehicleDataStatus.OFF);
-
-		// GEAR_STATUS
-		GEAR_STATUS.setTransmissionType(TRANSMISSION_TYPE);
-		GEAR_STATUS.setUserSelectedGear(USER_SELECTED_GEAR);
-		GEAR_STATUS.setActualGear(ACTUAL_GEAR);
-
-		//set up the OnVehicleData object
-		VEHICLE_DATA.setSpeed(SPEED);
-		VEHICLE_DATA.setRpm(RPM);
-		VEHICLE_DATA.setExternalTemperature(EXTERNAL_TEMPERATURE);
-		VEHICLE_DATA.setFuelLevel(FUEL_LEVEL);
-		VEHICLE_DATA.setVin(VIN);
-		VEHICLE_DATA.setPrndl(PRNDL_FINAL);
-		VEHICLE_DATA.setTirePressure(TIRE_PRESSURE);
-		VEHICLE_DATA.setEngineTorque(ENGINE_TORQUE);
-		VEHICLE_DATA.setEngineOilLife(ENGINE_OIL_LIFE);
-		VEHICLE_DATA.setOdometer(ODOMETER);
-		VEHICLE_DATA.setGps(GPS);
-		VEHICLE_DATA.setFuelLevelState(FUEL_LEVEL_STATE);
-		VEHICLE_DATA.setInstantFuelConsumption(INSTANT_FUEL_CONSUMPTION);
-		VEHICLE_DATA.setBeltStatus(BELT_STATUS);
-		VEHICLE_DATA.setBodyInformation(BODY_INFORMATION);
-		VEHICLE_DATA.setDeviceStatus(DEVICE_STATUS);
-		VEHICLE_DATA.setDriverBraking(DRIVER_BRAKING);
-		VEHICLE_DATA.setWiperStatus(WIPER_STATUS);
-		VEHICLE_DATA.setHeadLampStatus(HEAD_LAMP_STATUS);
-		VEHICLE_DATA.setAccPedalPosition(ACC_PEDAL_POSITION);
-		VEHICLE_DATA.setSteeringWheelAngle(STEERING_WHEEL_ANGLE);
-		VEHICLE_DATA.setECallInfo(E_CALL_INFO);
-		VEHICLE_DATA.setAirbagStatus(AIRBAG_STATUS);
-		VEHICLE_DATA.setEmergencyEvent(EMERGENCY_EVENT);
-		VEHICLE_DATA.setClusterModeStatus(CLUSTER_MODE_STATUS);
-		VEHICLE_DATA.setMyKey(MY_KEY);
-		VEHICLE_DATA.setFuelRange(FUEL_RANGE_LIST);
-		VEHICLE_DATA.setTurnSignal(TURN_SIGNAL);
-		VEHICLE_DATA.setElectronicParkBrakeStatus(ELECTRONIC_PARK_BRAKE_STATUS);
-		VEHICLE_DATA.setGearStatus(GEAR_STATUS);
-		VEHICLE_DATA.setWindowStatus(WINDOW_STATUS_LIST);
-		VEHICLE_DATA.setStabilityControlsStatus(STABILITY_CONTROLS_STATUS);
-		VEHICLE_DATA.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, OEM_CUSTOM_VEHICLE_DATA_STATE);
-		VEHICLE_DATA.setHandsOffSteering(HANDS_OFF_STEERING);
-		//set up the GetVehicleDataResponse object
-		VEHICLE_DATA_RESPONSE.setSpeed(SPEED);
-		VEHICLE_DATA_RESPONSE.setRpm(RPM);
-		VEHICLE_DATA_RESPONSE.setExternalTemperature(EXTERNAL_TEMPERATURE);
-		VEHICLE_DATA_RESPONSE.setFuelLevel(FUEL_LEVEL);
-		VEHICLE_DATA_RESPONSE.setVin(VIN);
-		VEHICLE_DATA_RESPONSE.setPrndl(PRNDL_FINAL);
-		VEHICLE_DATA_RESPONSE.setTirePressure(TIRE_PRESSURE);
-		VEHICLE_DATA_RESPONSE.setEngineTorque(ENGINE_TORQUE);
-		VEHICLE_DATA_RESPONSE.setEngineOilLife(ENGINE_OIL_LIFE);
-		VEHICLE_DATA_RESPONSE.setOdometer(ODOMETER);
-		VEHICLE_DATA_RESPONSE.setGps(GPS);
-		VEHICLE_DATA_RESPONSE.setFuelLevelState(FUEL_LEVEL_STATE);
-		VEHICLE_DATA_RESPONSE.setInstantFuelConsumption(INSTANT_FUEL_CONSUMPTION);
-		VEHICLE_DATA_RESPONSE.setBeltStatus(BELT_STATUS);
-		VEHICLE_DATA_RESPONSE.setBodyInformation(BODY_INFORMATION);
-		VEHICLE_DATA_RESPONSE.setDeviceStatus(DEVICE_STATUS);
-		VEHICLE_DATA_RESPONSE.setDriverBraking(DRIVER_BRAKING);
-		VEHICLE_DATA_RESPONSE.setWiperStatus(WIPER_STATUS);
-		VEHICLE_DATA_RESPONSE.setHeadLampStatus(HEAD_LAMP_STATUS);
-		VEHICLE_DATA_RESPONSE.setAccPedalPosition(ACC_PEDAL_POSITION);
-		VEHICLE_DATA_RESPONSE.setSteeringWheelAngle(STEERING_WHEEL_ANGLE);
-		VEHICLE_DATA_RESPONSE.setECallInfo(E_CALL_INFO);
-		VEHICLE_DATA_RESPONSE.setAirbagStatus(AIRBAG_STATUS);
-		VEHICLE_DATA_RESPONSE.setEmergencyEvent(EMERGENCY_EVENT);
-		VEHICLE_DATA_RESPONSE.setClusterModeStatus(CLUSTER_MODE_STATUS);
-		VEHICLE_DATA_RESPONSE.setMyKey(MY_KEY);
-		VEHICLE_DATA_RESPONSE.setFuelRange(FUEL_RANGE_LIST);
-		VEHICLE_DATA_RESPONSE.setTurnSignal(TURN_SIGNAL);
-		VEHICLE_DATA_RESPONSE.setElectronicParkBrakeStatus(ELECTRONIC_PARK_BRAKE_STATUS);
-		VEHICLE_DATA_RESPONSE.setGearStatus(GEAR_STATUS);
-		VEHICLE_DATA_RESPONSE.setWindowStatus(WINDOW_STATUS_LIST);
-		VEHICLE_DATA_RESPONSE.setStabilityControlsStatus(STABILITY_CONTROLS_STATUS);
-		VEHICLE_DATA_RESPONSE.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, OEM_CUSTOM_VEHICLE_DATA_STATE);
-		VEHICLE_DATA_RESPONSE.setHandsOffSteering(HANDS_OFF_STEERING);
-	}
-	
-    private VehicleDataHelper(){}	
-	
+    public static final Boolean DEVICE_STATUS_VOICE_REC = true;
+    public static final Boolean DEVICE_STATUS_BT_ICON = true;
+    public static final Boolean DEVICE_STATUS_CALL_ACTIVE = true;
+    public static final Boolean DEVICE_STATUS_PHONE_ROAMING = false;
+    public static final Boolean DEVICE_STATUS_TEXT_MSG_AVAILABLE = false;
+    public static final DeviceLevelStatus DEVICE_STATUS_BATT_LEVEL_STATUS = DeviceLevelStatus.TWO_LEVEL_BARS;
+    public static final Boolean DEVICE_STATUS_STEREO_MUTED = false;
+    public static final Boolean DEVICE_STATUS_MONO_MUTED = true;
+    public static final DeviceLevelStatus DEVICE_STATUS_SIGNAL_LEVEL_STATUS = DeviceLevelStatus.ONE_LEVEL_BARS;
+    public static final PrimaryAudioSource DEVICE_STATUS_PRIMARY_AUDIO = PrimaryAudioSource.BLUETOOTH_STEREO_BTST;
+    public static final Boolean DEVICE_STATUS_E_CALL_ACTIVE = false;
+
+    // head lamp status
+    public static final AmbientLightStatus HEAD_LAMP_STATUS_AMBIENT_STATUS = AmbientLightStatus.TWILIGHT_3;
+    public static final Boolean HEAD_LAMP_HIGH_BEAMS = true;
+    public static final Boolean HEAD_LAMP_LOW_BEAMS = false;
+
+    // e call info
+    public static final VehicleDataNotificationStatus E_CALL_INFO_E_CALL_NOTIFICATION_STATUS = VehicleDataNotificationStatus.NOT_SUPPORTED;
+    public static final VehicleDataNotificationStatus E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS = VehicleDataNotificationStatus.NOT_USED;
+    public static final ECallConfirmationStatus E_CALL_INFO_CONFIRMATION_STATUS = ECallConfirmationStatus.ECALL_CONFIGURED_OFF;
+
+    // airbag status
+    public static final VehicleDataEventStatus AIRBAG_STATUS_DRIVER_DEPLOYED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED = VehicleDataEventStatus.YES;
+    public static final VehicleDataEventStatus AIRBAG_STATUS_PASSENGER_DEPLOYED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED = VehicleDataEventStatus.NO;
+    public static final VehicleDataEventStatus AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED = VehicleDataEventStatus.YES;
+    public static final VehicleDataEventStatus AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED = VehicleDataEventStatus.NO;
+
+    // emergency event
+    public static final EmergencyEventType EMERGENCY_EVENT_TYPE = EmergencyEventType.FRONTAL;
+    public static final FuelCutoffStatus EMERGENCY_EVENT_FUEL_CUTOFF_STATUS = FuelCutoffStatus.TERMINATE_FUEL;
+    public static final VehicleDataEventStatus EMERGENCY_EVENT_ROLLOVER_EVENT = VehicleDataEventStatus.YES;
+    public static final Integer EMERGENCY_EVENT_MAX_CHANGE_VELOCITY = 5;
+    public static final VehicleDataEventStatus EMERGENCY_EVENT_MULTIPLE_EVENTS = VehicleDataEventStatus.NO;
+
+    // cluster mode status
+    public static final Boolean CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE = true;
+    public static final PowerModeQualificationStatus CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS =
+            PowerModeQualificationStatus.POWER_MODE_EVALUATION_IN_PROGRESS;
+    public static final CarModeStatus CLUSTER_MODE_STATUS_CAR_MODE_STATUS = CarModeStatus.TRANSPORT;
+    public static final PowerModeStatus CLUSTER_MODE_STATUS_POWER_MODE_STATUS = PowerModeStatus.POST_ACCESORY_0;
+
+    // my key
+    public static final VehicleDataStatus MY_KEY_E_911_OVERRIDE = VehicleDataStatus.NO_DATA_EXISTS;
+
+    // fuel range
+    public static final FuelType FUEL_RANGE_TYPE = FuelType.GASOLINE;
+    public static final Float FUEL_RANGE_RANGE = TestValues.GENERAL_FLOAT;
+    public static final Float FUEL_RANGE_CAPACITY = TestValues.GENERAL_FLOAT;
+    public static final CapacityUnit FUEL_RANGE_CAPACITY_UNIT = TestValues.GENERAL_CAPACITYUNIT;
+    public static final Float FUEL_RANGE_LEVEL = TestValues.GENERAL_FLOAT;
+    public static final ComponentVolumeStatus FUEL_RANGE_LEVEL_STATE = TestValues.GENERAL_COMPONENTVOLUMESTATUS;
+
+    // Gear status
+    public static final GearStatus GEAR_STATUS = new GearStatus();
+    public static final PRNDL USER_SELECTED_GEAR = PRNDL.FIRST;
+    public static final PRNDL ACTUAL_GEAR = PRNDL.SECOND;
+    public static final TransmissionType TRANSMISSION_TYPE = TransmissionType.ELECTRIC_VARIABLE;
+
+    // WindowStatus
+    public static final Grid LOCATION_GRID = TestValues.GENERAL_LOCATION_GRID;
+    public static final WindowState WINDOW_STATE = TestValues.GENERAL_WINDOW_STATE;
+
+    // stability control status
+    public static final VehicleDataStatus ESC_SYSTEM = VehicleDataStatus.ON;
+    public static final VehicleDataStatus S_WAY_TRAILER = VehicleDataStatus.OFF;
+
+    public static final JSONArray JSON_FUEL_RANGE = new JSONArray();
+
+    //the OnVehicleData which stores all the information above
+    public static final OnVehicleData VEHICLE_DATA = new OnVehicleData();
+    //GetVehicleDataResponse data which stores the same things
+    public static final GetVehicleDataResponse VEHICLE_DATA_RESPONSE = new GetVehicleDataResponse();
+
+    static {
+        //TIRE_PRESSURE set up
+        TIRE_PRESSURE.setPressureTellTale(TIRE_PRESSURE_TELL_TALE);
+        SingleTireStatus tireLeftFront = new SingleTireStatus();
+        tireLeftFront.setStatus(TIRE_PRESSURE_LEFT_FRONT);
+        TIRE_PRESSURE.setLeftFront(tireLeftFront);
+        SingleTireStatus tireRightFront = new SingleTireStatus();
+        tireRightFront.setStatus(TIRE_PRESSURE_RIGHT_FRONT);
+        TIRE_PRESSURE.setRightFront(tireRightFront);
+        SingleTireStatus tireLeftRear = new SingleTireStatus();
+        tireLeftRear.setStatus(TIRE_PRESSURE_LEFT_REAR);
+        TIRE_PRESSURE.setLeftRear(tireLeftRear);
+        SingleTireStatus tireRightRear = new SingleTireStatus();
+        tireRightRear.setStatus(TIRE_PRESSURE_RIGHT_REAR);
+        TIRE_PRESSURE.setRightRear(tireRightRear);
+        SingleTireStatus tireInnerLeftRear = new SingleTireStatus();
+        tireInnerLeftRear.setStatus(TIRE_PRESSURE_INNER_LEFT_REAR);
+        TIRE_PRESSURE.setInnerLeftRear(tireInnerLeftRear);
+        SingleTireStatus tireInnerRightRear = new SingleTireStatus();
+        tireInnerRightRear.setStatus(TIRE_PRESSURE_INNER_RIGHT_REAR);
+        TIRE_PRESSURE.setInnerRightRear(tireInnerRightRear);
+
+        //GPS set up
+        GPS.setLongitudeDegrees(GPS_LONGITUDE);
+        GPS.setLatitudeDegrees(GPS_LATITUDE);
+        GPS.setUtcYear(GPS_YEAR);
+        GPS.setUtcMonth(GPS_MONTH);
+        GPS.setUtcDay(GPS_DAY);
+        GPS.setUtcHours(GPS_HOURS);
+        GPS.setUtcMinutes(GPS_MINUTES);
+        GPS.setUtcSeconds(GPS_SECONDS);
+        GPS.setCompassDirection(GPS_DIRECTION);
+        GPS.setPdop(GPS_PDOP);
+        GPS.setHdop(GPS_HDOP);
+        GPS.setVdop(GPS_VDOP);
+        GPS.setActual(GPS_ACTUAL);
+        GPS.setSatellites(GPS_SATELLITES);
+        GPS.setDimension(GPS_DIMENSION);
+        GPS.setAltitude(GPS_ALTITUDE);
+        GPS.setHeading(GPS_HEADING);
+        GPS.setSpeed(GPS_SPEED);
+        GPS.setShifted(GPS_SHIFTED);
+
+        //BELT_STATUS set up
+        BELT_STATUS.setDriverBeltDeployed(BELT_STATUS_DRIVER_DEPLOYED);
+        BELT_STATUS.setPassengerBeltDeployed(BELT_STATUS_PASSENGER_DEPLOYED);
+        BELT_STATUS.setPassengerBuckleBelted(BELT_STATUS_PASSENGER_BELTED);
+        BELT_STATUS.setDriverBuckleBelted(BELT_STATUS_DRIVER_BELTED);
+        BELT_STATUS.setLeftRow2BuckleBelted(BELT_STATUS_LEFT_ROW_2_BELTED);
+        BELT_STATUS.setPassengerChildDetected(BELT_STATUS_PASSENGER_CHILD);
+        BELT_STATUS.setRightRow2BuckleBelted(BELT_STATUS_RIGHT_ROW_2_BELTED);
+        BELT_STATUS.setMiddleRow2BuckleBelted(BELT_STATUS_MIDDLE_ROW_2_BELTED);
+        BELT_STATUS.setMiddleRow3BuckleBelted(BELT_STATUS_MIDDLE_ROW_3_BELTED);
+        BELT_STATUS.setLeftRow3BuckleBelted(BELT_STATUS_LEFT_ROW_3_BELTED);
+        BELT_STATUS.setRightRow3BuckleBelted(BELT_STATUS_RIGHT_ROW_3_BELTED);
+        BELT_STATUS.setLeftRearInflatableBelted(BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED);
+        BELT_STATUS.setRightRearInflatableBelted(BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED);
+        BELT_STATUS.setMiddleRow1BeltDeployed(BELT_STATUS_MIDDLE_ROW_1_DEPLOYED);
+        BELT_STATUS.setMiddleRow1BuckleBelted(BELT_STATUS_MIDDLE_ROW_1_BELTED);
+
+        //BODY_INFORMATION set up
+        BODY_INFORMATION.setParkBrakeActive(BODY_INFORMATION_PARK_BRAKE);
+        BODY_INFORMATION.setIgnitionStableStatus(BODY_INFORMATION_IGNITION_STATUS);
+        BODY_INFORMATION.setIgnitionStatus(BODY_INFORMATION_IGNITION_STABLE_STATUS);
+        BODY_INFORMATION.setDriverDoorAjar(BODY_INFORMATION_DRIVER_AJAR);
+        BODY_INFORMATION.setPassengerDoorAjar(BODY_INFORMATION_PASSENGER_AJAR);
+        BODY_INFORMATION.setRearLeftDoorAjar(BODY_INFORMATION_REAR_LEFT_AJAR);
+        BODY_INFORMATION.setRearRightDoorAjar(BODY_INFORMATION_REAR_RIGHT_AJAR);
+
+        //DEVICE_STATUS set up
+        DEVICE_STATUS.setVoiceRecOn(DEVICE_STATUS_VOICE_REC);
+        DEVICE_STATUS.setBtIconOn(DEVICE_STATUS_BT_ICON);
+        DEVICE_STATUS.setCallActive(DEVICE_STATUS_CALL_ACTIVE);
+        DEVICE_STATUS.setPhoneRoaming(DEVICE_STATUS_PHONE_ROAMING);
+        DEVICE_STATUS.setTextMsgAvailable(DEVICE_STATUS_TEXT_MSG_AVAILABLE);
+        DEVICE_STATUS.setBattLevelStatus(DEVICE_STATUS_BATT_LEVEL_STATUS);
+        DEVICE_STATUS.setStereoAudioOutputMuted(DEVICE_STATUS_STEREO_MUTED);
+        DEVICE_STATUS.setMonoAudioOutputMuted(DEVICE_STATUS_MONO_MUTED);
+        DEVICE_STATUS.setSignalLevelStatus(DEVICE_STATUS_SIGNAL_LEVEL_STATUS);
+        DEVICE_STATUS.setPrimaryAudioSource(DEVICE_STATUS_PRIMARY_AUDIO);
+        DEVICE_STATUS.setECallEventActive(DEVICE_STATUS_E_CALL_ACTIVE);
+
+        //HEAD_LAMP_STATUS set up
+        HEAD_LAMP_STATUS.setAmbientLightStatus(HEAD_LAMP_STATUS_AMBIENT_STATUS);
+        HEAD_LAMP_STATUS.setHighBeamsOn(HEAD_LAMP_HIGH_BEAMS);
+        HEAD_LAMP_STATUS.setLowBeamsOn(HEAD_LAMP_LOW_BEAMS);
+
+        //E_CALL_INFO set up
+        E_CALL_INFO.setECallNotificationStatus(E_CALL_INFO_E_CALL_NOTIFICATION_STATUS);
+        E_CALL_INFO.setAuxECallNotificationStatus(E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS);
+        E_CALL_INFO.setECallConfirmationStatus(E_CALL_INFO_CONFIRMATION_STATUS);
+
+        //AIRBAG_STATUS set up
+        AIRBAG_STATUS.setDriverAirbagDeployed(AIRBAG_STATUS_DRIVER_DEPLOYED);
+        AIRBAG_STATUS.setDriverSideAirbagDeployed(AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED);
+        AIRBAG_STATUS.setDriverCurtainAirbagDeployed(AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED);
+        AIRBAG_STATUS.setPassengerAirbagDeployed(AIRBAG_STATUS_PASSENGER_DEPLOYED);
+        AIRBAG_STATUS.setPassengerCurtainAirbagDeployed(AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED);
+        AIRBAG_STATUS.setDriverKneeAirbagDeployed(AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED);
+        AIRBAG_STATUS.setPassengerSideAirbagDeployed(AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED);
+        AIRBAG_STATUS.setPassengerKneeAirbagDeployed(AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED);
+
+        //EMERGENCY_EVENT set up
+        EMERGENCY_EVENT.setEmergencyEventType(EMERGENCY_EVENT_TYPE);
+        EMERGENCY_EVENT.setFuelCutoffStatus(EMERGENCY_EVENT_FUEL_CUTOFF_STATUS);
+        EMERGENCY_EVENT.setRolloverEvent(EMERGENCY_EVENT_ROLLOVER_EVENT);
+        EMERGENCY_EVENT.setMaximumChangeVelocity(EMERGENCY_EVENT_MAX_CHANGE_VELOCITY);
+        EMERGENCY_EVENT.setMultipleEvents(EMERGENCY_EVENT_MULTIPLE_EVENTS);
+
+        //CLUSTER_MODE_STATUS set up
+        CLUSTER_MODE_STATUS.setPowerModeActive(CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE);
+        CLUSTER_MODE_STATUS.setPowerModeQualificationStatus(CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS);
+        CLUSTER_MODE_STATUS.setCarModeStatus(CLUSTER_MODE_STATUS_CAR_MODE_STATUS);
+        CLUSTER_MODE_STATUS.setPowerModeStatus(CLUSTER_MODE_STATUS_POWER_MODE_STATUS);
+
+        //MY_KEY set up
+        MY_KEY.setE911Override(MY_KEY_E_911_OVERRIDE);
+
+        // FUEL_RANGE and FUEL_RANGE_LIST set up
+        FUEL_RANGE.setType(FUEL_RANGE_TYPE);
+        FUEL_RANGE.setRange(FUEL_RANGE_RANGE);
+        FUEL_RANGE.setCapacity(FUEL_RANGE_CAPACITY);
+        FUEL_RANGE.setCapacityUnit(FUEL_RANGE_CAPACITY_UNIT);
+        FUEL_RANGE.setLevel(FUEL_RANGE_LEVEL);
+        FUEL_RANGE.setLevelState(FUEL_RANGE_LEVEL_STATE);
+        FUEL_RANGE_LIST.add(FUEL_RANGE);
+
+        //WINDOW_STATUS and WINDOW_STATUS_LIST set up
+        WINDOW_STATUS.setLocation(LOCATION_GRID);
+        WINDOW_STATUS.setState(WINDOW_STATE);
+        WINDOW_STATUS_LIST.add(WINDOW_STATUS);
+        // FUEL_RANGE json array set up
+        try {
+            JSON_FUEL_RANGE.put(FUEL_RANGE.serializeJSON());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        // STABILITY_CONTROLS_STATUS
+        STABILITY_CONTROLS_STATUS.setEscSystem(VehicleDataStatus.ON);
+        STABILITY_CONTROLS_STATUS.setTrailerSwayControl(VehicleDataStatus.OFF);
+
+        // GEAR_STATUS
+        GEAR_STATUS.setTransmissionType(TRANSMISSION_TYPE);
+        GEAR_STATUS.setUserSelectedGear(USER_SELECTED_GEAR);
+        GEAR_STATUS.setActualGear(ACTUAL_GEAR);
+
+        //set up the OnVehicleData object
+        VEHICLE_DATA.setSpeed(SPEED);
+        VEHICLE_DATA.setRpm(RPM);
+        VEHICLE_DATA.setExternalTemperature(EXTERNAL_TEMPERATURE);
+        VEHICLE_DATA.setFuelLevel(FUEL_LEVEL);
+        VEHICLE_DATA.setVin(VIN);
+        VEHICLE_DATA.setPrndl(PRNDL_FINAL);
+        VEHICLE_DATA.setTirePressure(TIRE_PRESSURE);
+        VEHICLE_DATA.setEngineTorque(ENGINE_TORQUE);
+        VEHICLE_DATA.setEngineOilLife(ENGINE_OIL_LIFE);
+        VEHICLE_DATA.setOdometer(ODOMETER);
+        VEHICLE_DATA.setGps(GPS);
+        VEHICLE_DATA.setFuelLevelState(FUEL_LEVEL_STATE);
+        VEHICLE_DATA.setInstantFuelConsumption(INSTANT_FUEL_CONSUMPTION);
+        VEHICLE_DATA.setBeltStatus(BELT_STATUS);
+        VEHICLE_DATA.setBodyInformation(BODY_INFORMATION);
+        VEHICLE_DATA.setDeviceStatus(DEVICE_STATUS);
+        VEHICLE_DATA.setDriverBraking(DRIVER_BRAKING);
+        VEHICLE_DATA.setWiperStatus(WIPER_STATUS);
+        VEHICLE_DATA.setHeadLampStatus(HEAD_LAMP_STATUS);
+        VEHICLE_DATA.setAccPedalPosition(ACC_PEDAL_POSITION);
+        VEHICLE_DATA.setSteeringWheelAngle(STEERING_WHEEL_ANGLE);
+        VEHICLE_DATA.setECallInfo(E_CALL_INFO);
+        VEHICLE_DATA.setAirbagStatus(AIRBAG_STATUS);
+        VEHICLE_DATA.setEmergencyEvent(EMERGENCY_EVENT);
+        VEHICLE_DATA.setClusterModeStatus(CLUSTER_MODE_STATUS);
+        VEHICLE_DATA.setMyKey(MY_KEY);
+        VEHICLE_DATA.setFuelRange(FUEL_RANGE_LIST);
+        VEHICLE_DATA.setTurnSignal(TURN_SIGNAL);
+        VEHICLE_DATA.setElectronicParkBrakeStatus(ELECTRONIC_PARK_BRAKE_STATUS);
+        VEHICLE_DATA.setGearStatus(GEAR_STATUS);
+        VEHICLE_DATA.setWindowStatus(WINDOW_STATUS_LIST);
+        VEHICLE_DATA.setStabilityControlsStatus(STABILITY_CONTROLS_STATUS);
+        VEHICLE_DATA.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, OEM_CUSTOM_VEHICLE_DATA_STATE);
+        VEHICLE_DATA.setHandsOffSteering(HANDS_OFF_STEERING);
+        //set up the GetVehicleDataResponse object
+        VEHICLE_DATA_RESPONSE.setSpeed(SPEED);
+        VEHICLE_DATA_RESPONSE.setRpm(RPM);
+        VEHICLE_DATA_RESPONSE.setExternalTemperature(EXTERNAL_TEMPERATURE);
+        VEHICLE_DATA_RESPONSE.setFuelLevel(FUEL_LEVEL);
+        VEHICLE_DATA_RESPONSE.setVin(VIN);
+        VEHICLE_DATA_RESPONSE.setPrndl(PRNDL_FINAL);
+        VEHICLE_DATA_RESPONSE.setTirePressure(TIRE_PRESSURE);
+        VEHICLE_DATA_RESPONSE.setEngineTorque(ENGINE_TORQUE);
+        VEHICLE_DATA_RESPONSE.setEngineOilLife(ENGINE_OIL_LIFE);
+        VEHICLE_DATA_RESPONSE.setOdometer(ODOMETER);
+        VEHICLE_DATA_RESPONSE.setGps(GPS);
+        VEHICLE_DATA_RESPONSE.setFuelLevelState(FUEL_LEVEL_STATE);
+        VEHICLE_DATA_RESPONSE.setInstantFuelConsumption(INSTANT_FUEL_CONSUMPTION);
+        VEHICLE_DATA_RESPONSE.setBeltStatus(BELT_STATUS);
+        VEHICLE_DATA_RESPONSE.setBodyInformation(BODY_INFORMATION);
+        VEHICLE_DATA_RESPONSE.setDeviceStatus(DEVICE_STATUS);
+        VEHICLE_DATA_RESPONSE.setDriverBraking(DRIVER_BRAKING);
+        VEHICLE_DATA_RESPONSE.setWiperStatus(WIPER_STATUS);
+        VEHICLE_DATA_RESPONSE.setHeadLampStatus(HEAD_LAMP_STATUS);
+        VEHICLE_DATA_RESPONSE.setAccPedalPosition(ACC_PEDAL_POSITION);
+        VEHICLE_DATA_RESPONSE.setSteeringWheelAngle(STEERING_WHEEL_ANGLE);
+        VEHICLE_DATA_RESPONSE.setECallInfo(E_CALL_INFO);
+        VEHICLE_DATA_RESPONSE.setAirbagStatus(AIRBAG_STATUS);
+        VEHICLE_DATA_RESPONSE.setEmergencyEvent(EMERGENCY_EVENT);
+        VEHICLE_DATA_RESPONSE.setClusterModeStatus(CLUSTER_MODE_STATUS);
+        VEHICLE_DATA_RESPONSE.setMyKey(MY_KEY);
+        VEHICLE_DATA_RESPONSE.setFuelRange(FUEL_RANGE_LIST);
+        VEHICLE_DATA_RESPONSE.setTurnSignal(TURN_SIGNAL);
+        VEHICLE_DATA_RESPONSE.setElectronicParkBrakeStatus(ELECTRONIC_PARK_BRAKE_STATUS);
+        VEHICLE_DATA_RESPONSE.setGearStatus(GEAR_STATUS);
+        VEHICLE_DATA_RESPONSE.setWindowStatus(WINDOW_STATUS_LIST);
+        VEHICLE_DATA_RESPONSE.setStabilityControlsStatus(STABILITY_CONTROLS_STATUS);
+        VEHICLE_DATA_RESPONSE.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, OEM_CUSTOM_VEHICLE_DATA_STATE);
+        VEHICLE_DATA_RESPONSE.setHandsOffSteering(HANDS_OFF_STEERING);
+    }
+
+    private VehicleDataHelper() {
+    }
+
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/encoder/EncoderUtilsTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/encoder/EncoderUtilsTest.java
index 083a5dd3f..86a6452da 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/encoder/EncoderUtilsTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/encoder/EncoderUtilsTest.java
@@ -54,16 +54,16 @@ public class EncoderUtilsTest extends TestCase {
 
     public void testGetCodecSpecificDataForAVC() {
         // example of SPS NAL unit with 4-byte start code
-        byte[] sps = new byte[] {
+        byte[] sps = new byte[]{
                 0x00, 0x00, 0x00, 0x01,
-                0x67, 0x42, (byte)0xC0, 0x0A, (byte)0xA6, 0x11, 0x11, (byte)0xE8,
-                0x40, 0x00, 0x00, (byte)0xFA, 0x40, 0x00, 0x3A, (byte)0x98,
-                0x23, (byte)0xC4, (byte)0x89, (byte)0x84, 0x60
+                0x67, 0x42, (byte) 0xC0, 0x0A, (byte) 0xA6, 0x11, 0x11, (byte) 0xE8,
+                0x40, 0x00, 0x00, (byte) 0xFA, 0x40, 0x00, 0x3A, (byte) 0x98,
+                0x23, (byte) 0xC4, (byte) 0x89, (byte) 0x84, 0x60
         };
         // example of PPS NAL unit with 4-byte start code
-        byte[] pps = new byte[] {
+        byte[] pps = new byte[]{
                 0x00, 0x00, 0x00, 0x01,
-                0x68, (byte)0xC8, 0x42, 0x0F, 0x13, 0x20
+                0x68, (byte) 0xC8, 0x42, 0x0F, 0x13, 0x20
         };
 
         ByteBuffer spsByteBuffer = ByteBuffer.allocate(sps.length);
@@ -89,11 +89,11 @@ public class EncoderUtilsTest extends TestCase {
 
     public void testGetCodecSpecificDataWithInvalidAVCData() {
         // testing an error case when the encoder emits SPS only (which should not happen)
-        byte[] sps = new byte[] {
+        byte[] sps = new byte[]{
                 0x00, 0x00, 0x00, 0x01,
-                0x67, 0x42, (byte)0xC0, 0x0A, (byte)0xA6, 0x11, 0x11, (byte)0xE8,
-                0x40, 0x00, 0x00, (byte)0xFA, 0x40, 0x00, 0x3A, (byte)0x98,
-                0x23, (byte)0xC4, (byte)0x89, (byte)0x84, 0x60
+                0x67, 0x42, (byte) 0xC0, 0x0A, (byte) 0xA6, 0x11, 0x11, (byte) 0xE8,
+                0x40, 0x00, 0x00, (byte) 0xFA, 0x40, 0x00, 0x3A, (byte) 0x98,
+                0x23, (byte) 0xC4, (byte) 0x89, (byte) 0x84, 0x60
         };
 
         ByteBuffer spsByteBuffer = ByteBuffer.allocate(sps.length);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java
index 7284114ab..dd7a8e876 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java
@@ -13,45 +13,42 @@ import java.io.IOException;
 import java.io.InputStream;
 
 public class JsonFileReader {
-	private static final String PATH = "json/";
-	private static final String EXT = ".json";
-	
-	public static JSONObject readId (Context context, String id, String type) {
-		if(context == null){
-			return null;
-		}
-		String fileName = PATH + id + EXT;
-		
-		JSONObject commandJsonWithType = null;
-
-		try {
-			JSONObject commandJson = null;
-			//get the file which holds the desired object
-			InputStream fileStream = context.getAssets().open(fileName);
-			BufferedInputStream bufferStream = new BufferedInputStream(fileStream);
-			byte[] buffer = new byte[(int)fileStream.available()];
-			bufferStream.read(buffer);
-			fileStream.close();
-			commandJson = JsonUtils.createJsonObject(buffer);
-			
-			//now use the type parameter to get the specific message type
-			//it also makes sure to return it with the message type in the top level because that's needed to eventually make this into a class object
-			commandJson = JsonUtils.readJsonObjectFromJsonObject(commandJson, type);
-			commandJsonWithType = new JSONObject();
-			commandJsonWithType = commandJsonWithType.put(type, commandJson);
-		} 
-		catch (FileNotFoundException e) {
-			e.printStackTrace();
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-		catch (JSONException e) {
-			e.printStackTrace();
-		}
-		
-		return commandJsonWithType;
-
-	}
+    private static final String PATH = "json/";
+    private static final String EXT = ".json";
+
+    public static JSONObject readId(Context context, String id, String type) {
+        if (context == null) {
+            return null;
+        }
+        String fileName = PATH + id + EXT;
+
+        JSONObject commandJsonWithType = null;
+
+        try {
+            JSONObject commandJson = null;
+            //get the file which holds the desired object
+            InputStream fileStream = context.getAssets().open(fileName);
+            BufferedInputStream bufferStream = new BufferedInputStream(fileStream);
+            byte[] buffer = new byte[(int) fileStream.available()];
+            bufferStream.read(buffer);
+            fileStream.close();
+            commandJson = JsonUtils.createJsonObject(buffer);
+
+            //now use the type parameter to get the specific message type
+            //it also makes sure to return it with the message type in the top level because that's needed to eventually make this into a class object
+            commandJson = JsonUtils.readJsonObjectFromJsonObject(commandJson, type);
+            commandJsonWithType = new JSONObject();
+            commandJsonWithType = commandJsonWithType.put(type, commandJson);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return commandJsonWithType;
+
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
index 50f949e3d..a5177c68b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
@@ -19,102 +19,102 @@ import static junit.framework.TestCase.assertTrue;
 
 @RunWith(AndroidJUnit4.class)
 public class BinaryFrameHeaderTests {
-	
-	public static final byte RPC_TYPE_REQUEST 		= 0x00;
-	public static final byte RPC_TYPE_RESPONSE 		= 0x01;
-	public static final byte RPC_TYPE_NOTIFICAITON 	= 0x02;
-	
-	
-	public static BinaryFrameHeader createDummyBfh(){
-		BinaryFrameHeader bfh = new BinaryFrameHeader();
-		bfh.setCorrID(123);
-		bfh.setFunctionID(FunctionID.ON_HMI_STATUS.getId());
-		bfh.setRPCType(RPC_TYPE_NOTIFICAITON);
-		bfh.setBulkData(null);
-		//There is no check for null bfh.setJsonData(null);
-		bfh.setJsonSize(0);
-		return bfh;
-	}
-	
-	public BinaryFrameHeader safeParse(byte[] array){
-		try{
-			return BinaryFrameHeader.parseBinaryHeader(array);
-		}catch(Exception e){
-			return null;
-		}
-	}
-
-	@Test
-	public void testAssemblyAndParse(){
-		BinaryFrameHeader bfh = createDummyBfh();
-		
-		byte[] bfhBytes = bfh.assembleHeaderBytes();
-		assertNotNull(bfhBytes);
-		
-		BinaryFrameHeader parsedBfh = BinaryFrameHeader.parseBinaryHeader(bfhBytes);
-		assertNotNull(parsedBfh);
-		
-		assertTrue(bfh.getCorrID() == parsedBfh.getCorrID());
-		
-		assertTrue(bfh.getFunctionID() == parsedBfh.getFunctionID());
-		
-		assertTrue(bfh.getRPCType() == parsedBfh.getRPCType());
-		
-		assertTrue(bfh.getBulkData() == parsedBfh.getBulkData());
-		
-		assertTrue(bfh.getJsonData() == parsedBfh.getJsonData());
-		
-		assertTrue(bfh.getJsonSize() == parsedBfh.getJsonSize());
-		
-	}
-
-	@Test
-	public void testCorruptHeader(){
-		BinaryFrameHeader bfh = createDummyBfh();
-		bfh.setJsonSize(5);
-		bfh.setJsonData(new byte[5]);
-		bfh.setJsonSize(Integer.MAX_VALUE);
-		
-		assertFalse(bfh.getJsonData().length == bfh.getJsonSize());
-		
-		byte[] bfhBytes = bfh.assembleHeaderBytes();
-		
-		assertNull(safeParse(bfhBytes));
-
-		//Change bytes in the array manually
-		int size = bfhBytes.length;
-		for(int i =0; i<size;i++){
-			bfhBytes[i] = (byte) 0x99;
-		}
-
-		assertNull(safeParse(bfhBytes));
-		BinaryFrameHeader head = BinaryFrameHeader.parseBinaryHeader(bfhBytes);
-		assertNull(head);
-	}
-
-	@Test
-	public void testJsonSetException(){
-		try{
-			BinaryFrameHeader bfh = createDummyBfh();
-			bfh.setJsonData(null);
-			Assert.fail("Setting JSON data to null should have thrown an exception.");
-		}catch(Exception e){
-			//Pass
-		}
-	}
-
-	@Test
-	public void testAlteredDataInSampleRpc(){
-		SampleRpc sampleRpc = new SampleRpc(4);
-		//Create a corrupted header
-		BinaryFrameHeader header = sampleRpc.getBinaryFrameHeader(true);
-		header.setJsonSize(Integer.MAX_VALUE);
-		assertEquals(Integer.MAX_VALUE, header.getJsonSize());
-		sampleRpc.setBinaryFrameHeader(header);
-		
-		assertEquals(Integer.MAX_VALUE,sampleRpc.getBinaryFrameHeader(false).getJsonSize());
-		
-		
-	}
-	
+
+    public static final byte RPC_TYPE_REQUEST = 0x00;
+    public static final byte RPC_TYPE_RESPONSE = 0x01;
+    public static final byte RPC_TYPE_NOTIFICAITON = 0x02;
+
+
+    public static BinaryFrameHeader createDummyBfh() {
+        BinaryFrameHeader bfh = new BinaryFrameHeader();
+        bfh.setCorrID(123);
+        bfh.setFunctionID(FunctionID.ON_HMI_STATUS.getId());
+        bfh.setRPCType(RPC_TYPE_NOTIFICAITON);
+        bfh.setBulkData(null);
+        //There is no check for null bfh.setJsonData(null);
+        bfh.setJsonSize(0);
+        return bfh;
+    }
+
+    public BinaryFrameHeader safeParse(byte[] array) {
+        try {
+            return BinaryFrameHeader.parseBinaryHeader(array);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    @Test
+    public void testAssemblyAndParse() {
+        BinaryFrameHeader bfh = createDummyBfh();
+
+        byte[] bfhBytes = bfh.assembleHeaderBytes();
+        assertNotNull(bfhBytes);
+
+        BinaryFrameHeader parsedBfh = BinaryFrameHeader.parseBinaryHeader(bfhBytes);
+        assertNotNull(parsedBfh);
+
+        assertTrue(bfh.getCorrID() == parsedBfh.getCorrID());
+
+        assertTrue(bfh.getFunctionID() == parsedBfh.getFunctionID());
+
+        assertTrue(bfh.getRPCType() == parsedBfh.getRPCType());
+
+        assertTrue(bfh.getBulkData() == parsedBfh.getBulkData());
+
+        assertTrue(bfh.getJsonData() == parsedBfh.getJsonData());
+
+        assertTrue(bfh.getJsonSize() == parsedBfh.getJsonSize());
+
+    }
+
+    @Test
+    public void testCorruptHeader() {
+        BinaryFrameHeader bfh = createDummyBfh();
+        bfh.setJsonSize(5);
+        bfh.setJsonData(new byte[5]);
+        bfh.setJsonSize(Integer.MAX_VALUE);
+
+        assertFalse(bfh.getJsonData().length == bfh.getJsonSize());
+
+        byte[] bfhBytes = bfh.assembleHeaderBytes();
+
+        assertNull(safeParse(bfhBytes));
+
+        //Change bytes in the array manually
+        int size = bfhBytes.length;
+        for (int i = 0; i < size; i++) {
+            bfhBytes[i] = (byte) 0x99;
+        }
+
+        assertNull(safeParse(bfhBytes));
+        BinaryFrameHeader head = BinaryFrameHeader.parseBinaryHeader(bfhBytes);
+        assertNull(head);
+    }
+
+    @Test
+    public void testJsonSetException() {
+        try {
+            BinaryFrameHeader bfh = createDummyBfh();
+            bfh.setJsonData(null);
+            Assert.fail("Setting JSON data to null should have thrown an exception.");
+        } catch (Exception e) {
+            //Pass
+        }
+    }
+
+    @Test
+    public void testAlteredDataInSampleRpc() {
+        SampleRpc sampleRpc = new SampleRpc(4);
+        //Create a corrupted header
+        BinaryFrameHeader header = sampleRpc.getBinaryFrameHeader(true);
+        header.setJsonSize(Integer.MAX_VALUE);
+        assertEquals(Integer.MAX_VALUE, header.getJsonSize());
+        sampleRpc.setBinaryFrameHeader(header);
+
+        assertEquals(Integer.MAX_VALUE, sampleRpc.getBinaryFrameHeader(false).getJsonSize());
+
+
+    }
+
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
index d51bb6430..297748bcc 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
@@ -9,154 +9,154 @@ import java.util.Vector;
 
 
 public class FrameDataControlFrameTypeTests extends TestCase {
-	
-	private Vector<FrameDataControlFrameType> list = FrameDataControlFrameType.getList();
-	
-	// Verifies the values are not null upon valid assignment.
-	// These are not actual enums for packeting reasons so testing is different.
-	public void testValidEnums () {
-		
-		final byte   START_SESSION_BYTE   = (byte) 0x01;
-		final String START_SESSION_STRING = "StartSession";
-		
-		final byte   START_SESSION_ACK_BYTE   = (byte) 0x02;
-		final String START_SESSION_ACK_STRING = "StartSessionACK";
-		
-		final byte   START_SESSION_NACK_BYTE   = (byte) 0x03;
-		final String START_SESSION_NACK_STRING = "StartSessionNACK";
-		
-		final byte   END_SESSION_BYTE   = (byte) 0x04;
-		final String END_SESSION_STRING = "EndSession";
-		
-		final byte   END_SESSION_ACK_BYTE   = (byte) 0x05;
-		final String END_SESSION_ACK_STRING = "EndSessionACK";
-		
-		final byte   END_SESSION_NACK_BYTE   = (byte) 0x06;
-		final String END_SESSION_NACK_STRING = "EndSessionNACK";
-		
-		final byte   HEARTBEAT_BYTE   = (byte) 0x00;
-		final String HEARTBEAT_STRING = "Heartbeat";
-		
-		final byte   HEARTBEAT_ACK_BYTE   = (byte) 0xFF;
-		final String HEARTBEAT_ACK_STRING = "HeartbeatACK";
-		
-		try {
-			
-			assertNotNull("FrameDataControlFrameType list returned null", list);
-			
-			// Check the byte values
-			FrameDataControlFrameType enumSS     = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_BYTE);
-			FrameDataControlFrameType enumSSACK  = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_ACK_BYTE);
-			FrameDataControlFrameType enumSSNACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_NACK_BYTE);
-			FrameDataControlFrameType enumES     = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_BYTE);
-			FrameDataControlFrameType enumESACK  = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_ACK_BYTE);
-			FrameDataControlFrameType enumESNACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_NACK_BYTE);
-			FrameDataControlFrameType enumH      = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, HEARTBEAT_BYTE);
-			FrameDataControlFrameType enumHACK   = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, HEARTBEAT_ACK_BYTE);
-			
-			assertNotNull("Start session byte match returned null",      enumSS);
-			assertNotNull("Start session ack byte match returned null",  enumSSACK);
-			assertNotNull("Start session nack byte match returned null", enumSSNACK);
-			assertNotNull("End session byte match returned null",        enumES);
-			assertNotNull("End session ack byte match returned null",    enumESACK);
-			assertNotNull("End session nack byte match returned null",   enumESNACK);
-			assertNotNull("Heartbeat byte match returned null",          enumH);
-			assertNotNull("Heartbeat ack byte match returned null",      enumHACK);
-			
-			// Check the string values
-			enumSS     = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_STRING);
-			enumSSACK  = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_ACK_STRING);
-			enumSSNACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_NACK_STRING);
-			enumES     = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_STRING);
-			enumESACK  = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_ACK_STRING);
-			enumESNACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_NACK_STRING);
-			enumH      = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, HEARTBEAT_STRING);
-			enumHACK   = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, HEARTBEAT_ACK_STRING);
-			
-			assertNotNull("Start session string match returned null",      enumSS);
-			assertNotNull("Start session ack string match returned null",  enumSSACK);
-			assertNotNull("Start session nack string match returned null", enumSSNACK);
-			assertNotNull("End session string match returned null",        enumES);
-			assertNotNull("End session ack string match returned null",    enumESACK);
-			assertNotNull("End session nack string match returned null",   enumESNACK);
-			assertNotNull("Heartbeat string match returned null",          enumH);
-			assertNotNull("Heartbeat ack string match returned null",      enumHACK);
-			
-		} catch (NullPointerException exception) {
+
+    private Vector<FrameDataControlFrameType> list = FrameDataControlFrameType.getList();
+
+    // Verifies the values are not null upon valid assignment.
+    // These are not actual enums for packeting reasons so testing is different.
+    public void testValidEnums() {
+
+        final byte START_SESSION_BYTE = (byte) 0x01;
+        final String START_SESSION_STRING = "StartSession";
+
+        final byte START_SESSION_ACK_BYTE = (byte) 0x02;
+        final String START_SESSION_ACK_STRING = "StartSessionACK";
+
+        final byte START_SESSION_NACK_BYTE = (byte) 0x03;
+        final String START_SESSION_NACK_STRING = "StartSessionNACK";
+
+        final byte END_SESSION_BYTE = (byte) 0x04;
+        final String END_SESSION_STRING = "EndSession";
+
+        final byte END_SESSION_ACK_BYTE = (byte) 0x05;
+        final String END_SESSION_ACK_STRING = "EndSessionACK";
+
+        final byte END_SESSION_NACK_BYTE = (byte) 0x06;
+        final String END_SESSION_NACK_STRING = "EndSessionNACK";
+
+        final byte HEARTBEAT_BYTE = (byte) 0x00;
+        final String HEARTBEAT_STRING = "Heartbeat";
+
+        final byte HEARTBEAT_ACK_BYTE = (byte) 0xFF;
+        final String HEARTBEAT_ACK_STRING = "HeartbeatACK";
+
+        try {
+
+            assertNotNull("FrameDataControlFrameType list returned null", list);
+
+            // Check the byte values
+            FrameDataControlFrameType enumSS = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_BYTE);
+            FrameDataControlFrameType enumSSACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_ACK_BYTE);
+            FrameDataControlFrameType enumSSNACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_NACK_BYTE);
+            FrameDataControlFrameType enumES = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_BYTE);
+            FrameDataControlFrameType enumESACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_ACK_BYTE);
+            FrameDataControlFrameType enumESNACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_NACK_BYTE);
+            FrameDataControlFrameType enumH = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, HEARTBEAT_BYTE);
+            FrameDataControlFrameType enumHACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, HEARTBEAT_ACK_BYTE);
+
+            assertNotNull("Start session byte match returned null", enumSS);
+            assertNotNull("Start session ack byte match returned null", enumSSACK);
+            assertNotNull("Start session nack byte match returned null", enumSSNACK);
+            assertNotNull("End session byte match returned null", enumES);
+            assertNotNull("End session ack byte match returned null", enumESACK);
+            assertNotNull("End session nack byte match returned null", enumESNACK);
+            assertNotNull("Heartbeat byte match returned null", enumH);
+            assertNotNull("Heartbeat ack byte match returned null", enumHACK);
+
+            // Check the string values
+            enumSS = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_STRING);
+            enumSSACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_ACK_STRING);
+            enumSSNACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, START_SESSION_NACK_STRING);
+            enumES = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_STRING);
+            enumESACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_ACK_STRING);
+            enumESNACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, END_SESSION_NACK_STRING);
+            enumH = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, HEARTBEAT_STRING);
+            enumHACK = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, HEARTBEAT_ACK_STRING);
+
+            assertNotNull("Start session string match returned null", enumSS);
+            assertNotNull("Start session ack string match returned null", enumSSACK);
+            assertNotNull("Start session nack string match returned null", enumSSNACK);
+            assertNotNull("End session string match returned null", enumES);
+            assertNotNull("End session ack string match returned null", enumESACK);
+            assertNotNull("End session nack string match returned null", enumESNACK);
+            assertNotNull("Heartbeat string match returned null", enumH);
+            assertNotNull("Heartbeat ack string match returned null", enumHACK);
+
+        } catch (NullPointerException exception) {
             fail("Null enum list throws NullPointerException.");
-		}		
-	}
-	
-	// Verifies that an invalid assignment is null.
-	public void testInvalidEnum () {
-		
-		final byte   INVALID_BYTE   = (byte) 0xAB;
-		final String INVALID_STRING = "Invalid";
-		
-		try {
-			
-			// Check the byte value
-			FrameDataControlFrameType enumInvalid = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, INVALID_BYTE);
-			assertNull("Invalid byte match didn't return null", enumInvalid);
-			
-			// Check the string value
-			enumInvalid = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, INVALID_STRING);
-			assertNull("Invalid string match didn't return null", enumInvalid);
-			
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	// Verifies that a null assignment is invalid.
-	public void testNullEnum () {		
-		try {
-			
-			// Check null string lookup
-			FrameDataControlFrameType enumNull = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, null);
-			assertNull("Null lookup returns a value", enumNull);
-			
-		} catch (NullPointerException exception) {
+        }
+    }
+
+    // Verifies that an invalid assignment is null.
+    public void testInvalidEnum() {
+
+        final byte INVALID_BYTE = (byte) 0xAB;
+        final String INVALID_STRING = "Invalid";
+
+        try {
+
+            // Check the byte value
+            FrameDataControlFrameType enumInvalid = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, INVALID_BYTE);
+            assertNull("Invalid byte match didn't return null", enumInvalid);
+
+            // Check the string value
+            enumInvalid = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, INVALID_STRING);
+            assertNull("Invalid string match didn't return null", enumInvalid);
+
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
+
+    // Verifies that a null assignment is invalid.
+    public void testNullEnum() {
+        try {
+
+            // Check null string lookup
+            FrameDataControlFrameType enumNull = (FrameDataControlFrameType) FrameDataControlFrameType.get(list, null);
+            assertNull("Null lookup returns a value", enumNull);
+
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
-	
-	// Verifies the possible enum values of FrameType.
-	public void testListEnum () {
-		// Test Vector
-		Vector<FrameDataControlFrameType> enumTestList = new Vector<FrameDataControlFrameType>();
-		enumTestList.add(FrameDataControlFrameType.Heartbeat);
-		enumTestList.add(FrameDataControlFrameType.StartSession);
-		enumTestList.add(FrameDataControlFrameType.StartSessionACK);
-		enumTestList.add(FrameDataControlFrameType.StartSessionNACK);
-		enumTestList.add(FrameDataControlFrameType.EndSession);
-		enumTestList.add(FrameDataControlFrameType.EndSessionACK);
-		enumTestList.add(FrameDataControlFrameType.EndSessionNACK);
-		enumTestList.add(FrameDataControlFrameType.ServiceDataACK);
-		enumTestList.add(FrameDataControlFrameType.HeartbeatACK);
-		enumTestList.add(FrameDataControlFrameType.RegisterSecondaryTransport);
-		enumTestList.add(FrameDataControlFrameType.RegisterSecondaryTransportACK);
-		enumTestList.add(FrameDataControlFrameType.RegisterSecondaryTransportNACK);
-		enumTestList.add(FrameDataControlFrameType.TransportEventUpdate);
-
-		assertTrue("List does not match enum test list.",
-					list.containsAll(enumTestList) &&
-					enumTestList.containsAll(list));
-		
-		// Test Array
-		FrameDataControlFrameType[] enumValueArray = FrameDataControlFrameType.values();
-		FrameDataControlFrameType[] enumTestArray = { 
-				FrameDataControlFrameType.Heartbeat,						FrameDataControlFrameType.StartSession,
-				FrameDataControlFrameType.StartSessionACK,					FrameDataControlFrameType.StartSessionNACK,
-				FrameDataControlFrameType.EndSession,						FrameDataControlFrameType.EndSessionACK,
-				FrameDataControlFrameType.EndSessionNACK,					FrameDataControlFrameType.RegisterSecondaryTransport,
-				FrameDataControlFrameType.RegisterSecondaryTransportACK,	FrameDataControlFrameType.RegisterSecondaryTransportNACK,
-				FrameDataControlFrameType.TransportEventUpdate,				FrameDataControlFrameType.ServiceDataACK,
-				FrameDataControlFrameType.HeartbeatACK,
-		};
-		
-		assertTrue("Array does not match enum values array.",
-					Validator.validateFrameDataControlFrameTypeArray(enumValueArray, enumTestArray));
-	}
+        }
+    }
+
+    // Verifies the possible enum values of FrameType.
+    public void testListEnum() {
+        // Test Vector
+        Vector<FrameDataControlFrameType> enumTestList = new Vector<FrameDataControlFrameType>();
+        enumTestList.add(FrameDataControlFrameType.Heartbeat);
+        enumTestList.add(FrameDataControlFrameType.StartSession);
+        enumTestList.add(FrameDataControlFrameType.StartSessionACK);
+        enumTestList.add(FrameDataControlFrameType.StartSessionNACK);
+        enumTestList.add(FrameDataControlFrameType.EndSession);
+        enumTestList.add(FrameDataControlFrameType.EndSessionACK);
+        enumTestList.add(FrameDataControlFrameType.EndSessionNACK);
+        enumTestList.add(FrameDataControlFrameType.ServiceDataACK);
+        enumTestList.add(FrameDataControlFrameType.HeartbeatACK);
+        enumTestList.add(FrameDataControlFrameType.RegisterSecondaryTransport);
+        enumTestList.add(FrameDataControlFrameType.RegisterSecondaryTransportACK);
+        enumTestList.add(FrameDataControlFrameType.RegisterSecondaryTransportNACK);
+        enumTestList.add(FrameDataControlFrameType.TransportEventUpdate);
+
+        assertTrue("List does not match enum test list.",
+                list.containsAll(enumTestList) &&
+                        enumTestList.containsAll(list));
+
+        // Test Array
+        FrameDataControlFrameType[] enumValueArray = FrameDataControlFrameType.values();
+        FrameDataControlFrameType[] enumTestArray = {
+                FrameDataControlFrameType.Heartbeat, FrameDataControlFrameType.StartSession,
+                FrameDataControlFrameType.StartSessionACK, FrameDataControlFrameType.StartSessionNACK,
+                FrameDataControlFrameType.EndSession, FrameDataControlFrameType.EndSessionACK,
+                FrameDataControlFrameType.EndSessionNACK, FrameDataControlFrameType.RegisterSecondaryTransport,
+                FrameDataControlFrameType.RegisterSecondaryTransportACK, FrameDataControlFrameType.RegisterSecondaryTransportNACK,
+                FrameDataControlFrameType.TransportEventUpdate, FrameDataControlFrameType.ServiceDataACK,
+                FrameDataControlFrameType.HeartbeatACK,
+        };
+
+        assertTrue("Array does not match enum values array.",
+                Validator.validateFrameDataControlFrameTypeArray(enumValueArray, enumTestArray));
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
index 182287a39..2fe851bd5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
@@ -8,110 +8,110 @@ import junit.framework.TestCase;
 import java.util.Vector;
 
 public class FrameTypeTests extends TestCase {
-	
-	private Vector<FrameType> list = FrameType.getList();
-
-	// Verifies the values are not null upon valid assignment.
-	// These are not actual enums for packeting reasons so testing is different.
-	public void testValidEnums () {	
-		
-		final byte   CONTROL_BYTE   = (byte) 0x00;
-		final String CONTROL_STRING = "Control";
-		
-		final byte   SINGLE_BYTE   = (byte) 0x01;
-		final String SINGLE_STRING = "Single";
-		
-		final byte   FIRST_BYTE   = (byte) 0x02;
-		final String FIRST_STRING = "First";
-		
-		final byte   CONSECUTIVE_BYTE   = (byte) 0x03;
-		final String CONSECUTIVE_STRING = "Consecutive";
-		
-		try {
-			
-			assertNotNull("FrameType list returned null", list);
-			
-			// Check the byte values
-			FrameType enumControl = (FrameType) FrameType.get(list, CONTROL_BYTE);
-			FrameType enumSingle = (FrameType) FrameType.get(list, SINGLE_BYTE);
-			FrameType enumFirst = (FrameType) FrameType.get(list, FIRST_BYTE);
-			FrameType enumConsecutive = (FrameType) FrameType.get(list, CONSECUTIVE_BYTE);
-			
-			assertNotNull("Control byte match returned null", enumControl);
-			assertNotNull("Single byte match returned null", enumSingle);
-			assertNotNull("First byte match returned null", enumFirst);
-			assertNotNull("Consecutive byte match returned null", enumConsecutive);
-			
-			// Check the string values
-			enumControl = (FrameType) FrameType.get(list, CONTROL_STRING);
-			enumSingle = (FrameType) FrameType.get(list, SINGLE_STRING);
-			enumFirst = (FrameType) FrameType.get(list, FIRST_STRING);
-			enumConsecutive = (FrameType) FrameType.get(list, CONSECUTIVE_STRING);
-			
-			assertNotNull("Control string match returned null", enumControl);
-			assertNotNull("Single string match returned null", enumSingle);
-			assertNotNull("First string match returned null", enumFirst);
-			assertNotNull("Consecutive string match returned null", enumConsecutive);
-			
-		} catch (NullPointerException exception) {
+
+    private Vector<FrameType> list = FrameType.getList();
+
+    // Verifies the values are not null upon valid assignment.
+    // These are not actual enums for packeting reasons so testing is different.
+    public void testValidEnums() {
+
+        final byte CONTROL_BYTE = (byte) 0x00;
+        final String CONTROL_STRING = "Control";
+
+        final byte SINGLE_BYTE = (byte) 0x01;
+        final String SINGLE_STRING = "Single";
+
+        final byte FIRST_BYTE = (byte) 0x02;
+        final String FIRST_STRING = "First";
+
+        final byte CONSECUTIVE_BYTE = (byte) 0x03;
+        final String CONSECUTIVE_STRING = "Consecutive";
+
+        try {
+
+            assertNotNull("FrameType list returned null", list);
+
+            // Check the byte values
+            FrameType enumControl = (FrameType) FrameType.get(list, CONTROL_BYTE);
+            FrameType enumSingle = (FrameType) FrameType.get(list, SINGLE_BYTE);
+            FrameType enumFirst = (FrameType) FrameType.get(list, FIRST_BYTE);
+            FrameType enumConsecutive = (FrameType) FrameType.get(list, CONSECUTIVE_BYTE);
+
+            assertNotNull("Control byte match returned null", enumControl);
+            assertNotNull("Single byte match returned null", enumSingle);
+            assertNotNull("First byte match returned null", enumFirst);
+            assertNotNull("Consecutive byte match returned null", enumConsecutive);
+
+            // Check the string values
+            enumControl = (FrameType) FrameType.get(list, CONTROL_STRING);
+            enumSingle = (FrameType) FrameType.get(list, SINGLE_STRING);
+            enumFirst = (FrameType) FrameType.get(list, FIRST_STRING);
+            enumConsecutive = (FrameType) FrameType.get(list, CONSECUTIVE_STRING);
+
+            assertNotNull("Control string match returned null", enumControl);
+            assertNotNull("Single string match returned null", enumSingle);
+            assertNotNull("First string match returned null", enumFirst);
+            assertNotNull("Consecutive string match returned null", enumConsecutive);
+
+        } catch (NullPointerException exception) {
             fail("Null enum list throws NullPointerException.");
-		}	
-	}
-	
-	// Verifies that an invalid assignment is null.
-	public void testInvalidEnum () {
-		
-		final byte   INVALID_BYTE   = (byte) 0xAB;
-		final String INVALID_STRING = "Invalid";
-		
-		try {
-			
-			// Check the byte value
-			FrameType enumInvalid = (FrameType) FrameType.get(list, INVALID_BYTE);
-			assertNull("Invalid byte match didn't return null", enumInvalid);
-			
-			// Check the string value
-			enumInvalid = (FrameType) FrameType.get(list, INVALID_STRING);
-			assertNull("Invalid string match didn't return null", enumInvalid);
-			
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	// Verifies that a null assignment is invalid.
-	public void testNullEnum () {		
-		try {
-					
-			// Check null string lookup
-			FrameType enumNull = (FrameType) FrameType.get(list, null);
-			assertNull("Null lookup returns a value", enumNull);
-			
-		} catch (NullPointerException exception) {
+        }
+    }
+
+    // Verifies that an invalid assignment is null.
+    public void testInvalidEnum() {
+
+        final byte INVALID_BYTE = (byte) 0xAB;
+        final String INVALID_STRING = "Invalid";
+
+        try {
+
+            // Check the byte value
+            FrameType enumInvalid = (FrameType) FrameType.get(list, INVALID_BYTE);
+            assertNull("Invalid byte match didn't return null", enumInvalid);
+
+            // Check the string value
+            enumInvalid = (FrameType) FrameType.get(list, INVALID_STRING);
+            assertNull("Invalid string match didn't return null", enumInvalid);
+
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
+
+    // Verifies that a null assignment is invalid.
+    public void testNullEnum() {
+        try {
+
+            // Check null string lookup
+            FrameType enumNull = (FrameType) FrameType.get(list, null);
+            assertNull("Null lookup returns a value", enumNull);
+
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}		
-	}
-	
-	// Verifies the possible enum values of FrameType.
-	public void testListEnum () {
-		
-		// Test Vector
-		Vector<FrameType> enumTestList = new Vector<FrameType>();
-		enumTestList.add(FrameType.Control);
-		enumTestList.add(FrameType.Single);
-		enumTestList.add(FrameType.First);
-		enumTestList.add(FrameType.Consecutive);
-		
-		assertTrue("List does not match enum test list.",
-					list.containsAll(enumTestList) &&
-					enumTestList.containsAll(list));
-		
-		// Test Array
-		FrameType[] enumValueArray = FrameType.values();
-		FrameType[] enumTestArray = { FrameType.Control, FrameType.Single, 
-									  FrameType.First,   FrameType.Consecutive };
-		
-		assertTrue("Array does not match enum values array.",
-					Validator.validateFrameTypeArray(enumValueArray, enumTestArray));
-	}	
+        }
+    }
+
+    // Verifies the possible enum values of FrameType.
+    public void testListEnum() {
+
+        // Test Vector
+        Vector<FrameType> enumTestList = new Vector<FrameType>();
+        enumTestList.add(FrameType.Control);
+        enumTestList.add(FrameType.Single);
+        enumTestList.add(FrameType.First);
+        enumTestList.add(FrameType.Consecutive);
+
+        assertTrue("List does not match enum test list.",
+                list.containsAll(enumTestList) &&
+                        enumTestList.containsAll(list));
+
+        // Test Array
+        FrameType[] enumValueArray = FrameType.values();
+        FrameType[] enumTestArray = {FrameType.Control, FrameType.Single,
+                FrameType.First, FrameType.Consecutive};
+
+        assertTrue("Array does not match enum values array.",
+                Validator.validateFrameTypeArray(enumValueArray, enumTestArray));
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java
index 1a09a5b05..d8e7a80d2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java
@@ -8,54 +8,53 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class MessageTypeTests extends TestCase  {
-	
-	public void testValidEnums () {	
-		String example = "UNDEFINED";
-		MessageType enumUndefined = MessageType.valueForString(example);
-		example = "BULK";
-		MessageType enumBulk = MessageType.valueForString(example);
-		example = "RPC";
-		MessageType enumRpc = MessageType.valueForString(example);
-		
-		assertNotNull("UNDEFINED returned null", enumUndefined);
-		assertNotNull("BULK returned null", enumBulk);
-		assertNotNull("RPC returned null", enumRpc);
-	}
-	
-	public void testInvalidEnum () {
-		String example = "RpC";
-		
-		try {
-			MessageType temp = MessageType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException");
-		}
-	}
-	
-	public void testNullEnum () {
-		String example = null;
-		
-		try {
-			MessageType temp = MessageType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+public class MessageTypeTests extends TestCase {
+
+    public void testValidEnums() {
+        String example = "UNDEFINED";
+        MessageType enumUndefined = MessageType.valueForString(example);
+        example = "BULK";
+        MessageType enumBulk = MessageType.valueForString(example);
+        example = "RPC";
+        MessageType enumRpc = MessageType.valueForString(example);
+
+        assertNotNull("UNDEFINED returned null", enumUndefined);
+        assertNotNull("BULK returned null", enumBulk);
+        assertNotNull("RPC returned null", enumRpc);
+    }
+
+    public void testInvalidEnum() {
+        String example = "RpC";
+
+        try {
+            MessageType temp = MessageType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException");
+        }
+    }
+
+    public void testNullEnum() {
+        String example = null;
+
+        try {
+            MessageType temp = MessageType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
-	
-	public void testListEnum() {
- 		List<MessageType> enumValueList = Arrays.asList(MessageType.values());
-
-		List<MessageType> enumTestList = new ArrayList<MessageType>();
-		enumTestList.add(MessageType.UNDEFINED);
-		enumTestList.add(MessageType.BULK);
-		enumTestList.add(MessageType.RPC);
-
-		assertTrue("Enum value list does not match enum class list", 
-					enumValueList.containsAll(enumTestList) &&
-					enumTestList.containsAll(enumValueList));
-	}
+        }
+    }
+
+    public void testListEnum() {
+        List<MessageType> enumValueList = Arrays.asList(MessageType.values());
+
+        List<MessageType> enumTestList = new ArrayList<MessageType>();
+        enumTestList.add(MessageType.UNDEFINED);
+        enumTestList.add(MessageType.BULK);
+        enumTestList.add(MessageType.RPC);
+
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
index e96b6a5b5..051f158a9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
@@ -8,118 +8,118 @@ import junit.framework.TestCase;
 import java.util.Vector;
 
 public class SessionTypeTests extends TestCase {
-	
-	private Vector<SessionType> list = SessionType.getList();
-	
-	// Verifies the values are not null upon valid assignment.
-	// These are not actual enums for packeting reasons so testing is different.
-	public void testValidEnums () {
-		
-		final byte   HEARTBEAT_BYTE   = (byte) 0x00;
-		final String HEARTBEAT_STRING = "CONTROL";
-		
-		final byte   RPC_BYTE   = (byte) 0x07;
-		final String RPC_STRING = "RPC";
-		
-		final byte   PCM_BYTE   = (byte) 0x0A;
-		final String PCM_STRING = "PCM";
-		
-		final byte   NAV_BYTE   = (byte) 0x0B;
-		final String NAV_STRING = "NAV";
-		
-		final byte   BULK_DATA_BYTE   = (byte) 0x0F;
-		final String BULK_DATA_STRING = "BULK_DATA";
-		
-		try {
-			
-			assertNotNull("SessionType list returned null", list);
-			
-			// Check the byte values
-			SessionType enumHeartbeat = (SessionType) SessionType.get(list, HEARTBEAT_BYTE);
-			SessionType enumRPC       = (SessionType) SessionType.get(list, RPC_BYTE);
-			SessionType enumPCM       = (SessionType) SessionType.get(list, PCM_BYTE);
-			SessionType enumNAV       = (SessionType) SessionType.get(list, NAV_BYTE);
-			SessionType enumBulkData  = (SessionType) SessionType.get(list, BULK_DATA_BYTE);
-			
-			assertNotNull("Start session byte match returned null", enumHeartbeat);
-			assertNotNull("Single byte match returned null",        enumRPC);
-			assertNotNull("First byte match returned null",         enumPCM);
-			assertNotNull("Consecutive byte match returned null",   enumNAV);
-			assertNotNull("Consecutive byte match returned null",   enumBulkData);
-			
-			// Check the string values
-			enumHeartbeat = (SessionType) SessionType.get(list, HEARTBEAT_STRING);
-			enumRPC       = (SessionType) SessionType.get(list, RPC_STRING);
-			enumPCM       = (SessionType) SessionType.get(list, PCM_STRING);
-			enumNAV       = (SessionType) SessionType.get(list, NAV_STRING);
-			enumBulkData  = (SessionType) SessionType.get(list, BULK_DATA_STRING);
-			
-			assertNotNull("Start session string match returned null", enumHeartbeat);
-			assertNotNull("Single string match returned null",        enumRPC);
-			assertNotNull("First string match returned null",         enumPCM);
-			assertNotNull("Consecutive string match returned null",   enumNAV);
-			assertNotNull("Consecutive string match returned null",   enumBulkData);
-			
-		} catch (NullPointerException exception) {
+
+    private Vector<SessionType> list = SessionType.getList();
+
+    // Verifies the values are not null upon valid assignment.
+    // These are not actual enums for packeting reasons so testing is different.
+    public void testValidEnums() {
+
+        final byte HEARTBEAT_BYTE = (byte) 0x00;
+        final String HEARTBEAT_STRING = "CONTROL";
+
+        final byte RPC_BYTE = (byte) 0x07;
+        final String RPC_STRING = "RPC";
+
+        final byte PCM_BYTE = (byte) 0x0A;
+        final String PCM_STRING = "PCM";
+
+        final byte NAV_BYTE = (byte) 0x0B;
+        final String NAV_STRING = "NAV";
+
+        final byte BULK_DATA_BYTE = (byte) 0x0F;
+        final String BULK_DATA_STRING = "BULK_DATA";
+
+        try {
+
+            assertNotNull("SessionType list returned null", list);
+
+            // Check the byte values
+            SessionType enumHeartbeat = (SessionType) SessionType.get(list, HEARTBEAT_BYTE);
+            SessionType enumRPC = (SessionType) SessionType.get(list, RPC_BYTE);
+            SessionType enumPCM = (SessionType) SessionType.get(list, PCM_BYTE);
+            SessionType enumNAV = (SessionType) SessionType.get(list, NAV_BYTE);
+            SessionType enumBulkData = (SessionType) SessionType.get(list, BULK_DATA_BYTE);
+
+            assertNotNull("Start session byte match returned null", enumHeartbeat);
+            assertNotNull("Single byte match returned null", enumRPC);
+            assertNotNull("First byte match returned null", enumPCM);
+            assertNotNull("Consecutive byte match returned null", enumNAV);
+            assertNotNull("Consecutive byte match returned null", enumBulkData);
+
+            // Check the string values
+            enumHeartbeat = (SessionType) SessionType.get(list, HEARTBEAT_STRING);
+            enumRPC = (SessionType) SessionType.get(list, RPC_STRING);
+            enumPCM = (SessionType) SessionType.get(list, PCM_STRING);
+            enumNAV = (SessionType) SessionType.get(list, NAV_STRING);
+            enumBulkData = (SessionType) SessionType.get(list, BULK_DATA_STRING);
+
+            assertNotNull("Start session string match returned null", enumHeartbeat);
+            assertNotNull("Single string match returned null", enumRPC);
+            assertNotNull("First string match returned null", enumPCM);
+            assertNotNull("Consecutive string match returned null", enumNAV);
+            assertNotNull("Consecutive string match returned null", enumBulkData);
+
+        } catch (NullPointerException exception) {
             fail("Null enum list throws NullPointerException.");
-		}		
-	}
-		
-	// Verifies that an invalid assignment is null.
-	public void testInvalidEnum () {
-		
-		final byte   INVALID_BYTE   = (byte) 0xAB;
-		final String INVALID_STRING = "Invalid";
-		
-		try {
-			
-			// Check the byte value
-			SessionType enumInvalid = (SessionType) SessionType.get(list, INVALID_BYTE);
-			assertNull("Invalid byte match didn't return null", enumInvalid);
-			
-			// Check the string value
-			enumInvalid = (SessionType) SessionType.get(list, INVALID_STRING);
-			assertNull("Invalid string match didn't return null", enumInvalid);
-			
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	// Verifies that a null assignment is invalid.
-	public void testNullEnum () {		
-		try {
-			
-			// Check null string lookup
-			SessionType enumNull = (SessionType) SessionType.get(list, null);
-			assertNull("Null lookup returns a value", enumNull);
-			
-		} catch (NullPointerException exception) {
+        }
+    }
+
+    // Verifies that an invalid assignment is null.
+    public void testInvalidEnum() {
+
+        final byte INVALID_BYTE = (byte) 0xAB;
+        final String INVALID_STRING = "Invalid";
+
+        try {
+
+            // Check the byte value
+            SessionType enumInvalid = (SessionType) SessionType.get(list, INVALID_BYTE);
+            assertNull("Invalid byte match didn't return null", enumInvalid);
+
+            // Check the string value
+            enumInvalid = (SessionType) SessionType.get(list, INVALID_STRING);
+            assertNull("Invalid string match didn't return null", enumInvalid);
+
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
+
+    // Verifies that a null assignment is invalid.
+    public void testNullEnum() {
+        try {
+
+            // Check null string lookup
+            SessionType enumNull = (SessionType) SessionType.get(list, null);
+            assertNull("Null lookup returns a value", enumNull);
+
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
-	
-	// Verifies the possible enum values of SessionType.
-	public void testListEnum () {
-		// Test Vector
-		Vector<SessionType> enumTestList = new Vector<SessionType>();			
-		enumTestList.add(SessionType.RPC);
-		enumTestList.add(SessionType.PCM);
-		enumTestList.add(SessionType.NAV);
-		enumTestList.add(SessionType.BULK_DATA);
-		enumTestList.add(SessionType.CONTROL);
-		
-		assertTrue("List does not match enum test list.",
-					list.containsAll(enumTestList) &&
-					enumTestList.containsAll(list));
-		
-		// Test Array
-		SessionType[] enumValueArray = SessionType.values();
-		SessionType[] enumTestArray = { SessionType.RPC, SessionType.PCM, 
-									    SessionType.NAV, SessionType.BULK_DATA,
-									    SessionType.CONTROL };
-		
-		assertTrue("Array does not match enum values array.",
-					Validator.validateSessionTypeArray(enumValueArray, enumTestArray));
-	}
+        }
+    }
+
+    // Verifies the possible enum values of SessionType.
+    public void testListEnum() {
+        // Test Vector
+        Vector<SessionType> enumTestList = new Vector<SessionType>();
+        enumTestList.add(SessionType.RPC);
+        enumTestList.add(SessionType.PCM);
+        enumTestList.add(SessionType.NAV);
+        enumTestList.add(SessionType.BULK_DATA);
+        enumTestList.add(SessionType.CONTROL);
+
+        assertTrue("List does not match enum test list.",
+                list.containsAll(enumTestList) &&
+                        enumTestList.containsAll(list));
+
+        // Test Array
+        SessionType[] enumValueArray = SessionType.values();
+        SessionType[] enumTestArray = {SessionType.RPC, SessionType.PCM,
+                SessionType.NAV, SessionType.BULK_DATA,
+                SessionType.CONTROL};
+
+        assertTrue("Array does not match enum values array.",
+                Validator.validateSessionTypeArray(enumValueArray, enumTestArray));
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java
index de9d0a5fb..7f8a85c97 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java
@@ -10,58 +10,58 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.protocol.heartbeat.HeartbeatMonitor}
  */
 public class HeartbeatMonitorTests extends TestCase {
 
-	private HeartbeatMonitor monitor = new HeartbeatMonitor();
-	private Runnable testRunnable;
-	private Timer timer;
-	
-	public void testValues () {
-		assertNotNull(TestValues.NOT_NULL, monitor);
-		
-		testRunnable = monitor.getHeartbeatRunnable();
-		assertNotNull(TestValues.NOT_NULL, testRunnable);
-		
-		int testInterval = 100;
-		monitor.setInterval(testInterval);
-		assertEquals("Interval did not match expected value", monitor.getInterval(), testInterval);
-	}
-	
-	public void testThread () {
-		try {
-			Thread testThread = new Thread(testRunnable);
-			assertNotNull(TestValues.NOT_NULL, testThread);
-			setTimeout(5000, testThread); // Cannot leave thread hanging
-			
-			testThread.start();
-			testThread.join();
-		} catch (Exception e) {
-			fail("Thread exception was thrown");
-		}	
-	}
-	
-	private void setTimeout(int duration, final Thread thread) {
-		timer = new Timer();
-		timer.schedule(new TimerTask() {
-			@Override
-			public void run() {
-				thread.interrupt();
-			}
-		}, duration);
-	}
-	
-	public void testNull () {
-		// Testing a null value for listener instead of implementing and overriding
-		// IHeartbeatMonitorListener methods to test the getter/setter methods of HeartbeatMonitor.
-		monitor.setListener(null);
-		IHeartbeatMonitorListener testListener = monitor.getListener();
-		assertNull("Listener returned a value", testListener);
-		
-		// Interface testing issue >>
-		// monitor.heartbeatACKReceived(); // Sets the ack boolean flag
-		// assertTrue("ACK value was not true", monitor.getACKReceived());
-	}
+    private HeartbeatMonitor monitor = new HeartbeatMonitor();
+    private Runnable testRunnable;
+    private Timer timer;
+
+    public void testValues() {
+        assertNotNull(TestValues.NOT_NULL, monitor);
+
+        testRunnable = monitor.getHeartbeatRunnable();
+        assertNotNull(TestValues.NOT_NULL, testRunnable);
+
+        int testInterval = 100;
+        monitor.setInterval(testInterval);
+        assertEquals("Interval did not match expected value", monitor.getInterval(), testInterval);
+    }
+
+    public void testThread() {
+        try {
+            Thread testThread = new Thread(testRunnable);
+            assertNotNull(TestValues.NOT_NULL, testThread);
+            setTimeout(5000, testThread); // Cannot leave thread hanging
+
+            testThread.start();
+            testThread.join();
+        } catch (Exception e) {
+            fail("Thread exception was thrown");
+        }
+    }
+
+    private void setTimeout(int duration, final Thread thread) {
+        timer = new Timer();
+        timer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                thread.interrupt();
+            }
+        }, duration);
+    }
+
+    public void testNull() {
+        // Testing a null value for listener instead of implementing and overriding
+        // IHeartbeatMonitorListener methods to test the getter/setter methods of HeartbeatMonitor.
+        monitor.setListener(null);
+        IHeartbeatMonitorListener testListener = monitor.getListener();
+        assertNull("Listener returned a value", testListener);
+
+        // Interface testing issue >>
+        // monitor.heartbeatACKReceived(); // Sets the ack boolean flag
+        // assertTrue("ACK value was not true", monitor.getACKReceived());
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCMessageTests.java
index 6bc3011b8..b3fe0cb62 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCMessageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCMessageTests.java
@@ -38,7 +38,7 @@ public class RPCMessageTests extends TestCase {
         super.tearDown();
     }
 
-    public void testGeneralGettersAndSetters(){
+    public void testGeneralGettersAndSetters() {
         String testKey = TestValues.GENERAL_STRING;
         Integer testInt = TestValues.GENERAL_INT;
 
@@ -49,7 +49,7 @@ public class RPCMessageTests extends TestCase {
         assertNull(testMessage.getParameters(testKey));
     }
 
-    public void testCommonObjectGetters(){
+    public void testCommonObjectGetters() {
         String stringKey = "String";
         String testString = TestValues.GENERAL_STRING;
         testMessage.setParameters(stringKey, testString);
@@ -88,7 +88,7 @@ public class RPCMessageTests extends TestCase {
         assertNull(testMessage.getLong(longKey));
     }
 
-    public void testGetObject(){
+    public void testGetObject() {
         String keyIsEmpty = "EMPTY";
         assertNull(testMessage.getObject(Integer.class, keyIsEmpty));
 
@@ -117,7 +117,7 @@ public class RPCMessageTests extends TestCase {
         assertEquals(TestValues.MATCH, testTTSchunks, testMessage.getObject(TTSChunk.class, keyTTSchunks));
 
         List<Hashtable<String, Object>> testListTTSchunks = new ArrayList<>();
-        for(TTSChunk ttsChunk : testTTSchunks){
+        for (TTSChunk ttsChunk : testTTSchunks) {
             testListTTSchunks.add(ttsChunk.getStore());
         }
         testMessage.setParameters(keyTTSchunks, testListTTSchunks);
@@ -130,7 +130,7 @@ public class RPCMessageTests extends TestCase {
         assertEquals(TestValues.MATCH, testMediaClockFormats, testMessage.getObject(MediaClockFormat.class, keyMediaClockFormats));
 
         List<String> testListMediaClockFormats = new ArrayList<>();
-        for(MediaClockFormat mcFormat : testMediaClockFormats){
+        for (MediaClockFormat mcFormat : testMediaClockFormats) {
             testListMediaClockFormats.add(mcFormat.toString());
         }
         testMessage.setParameters(keyMediaClockFormats, testListMediaClockFormats);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
index 5972dc829..ee7896f86 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestTest.java
@@ -17,34 +17,34 @@ import static junit.framework.TestCase.assertNotNull;
 @RunWith(AndroidJUnit4.class)
 public class RPCRequestTest {
 
-    public static final int  SDL_VERSION_UNDER_TEST = Config.SDL_VERSION_UNDER_TEST;
+    public static final int SDL_VERSION_UNDER_TEST = Config.SDL_VERSION_UNDER_TEST;
 
     private static final int CORR_ID = 402;
 
     protected RPCRequest msg;
 
     @Before
-    public void setUp(){
+    public void setUp() {
         this.msg = new GetSystemCapability();
 
     }
 
     @Test
-    public void testCreation(){
+    public void testCreation() {
         assertNotNull("Object creation failed.", msg);
     }
 
     @Test
-    public void testGetCorrelationId(){
+    public void testGetCorrelationId() {
         assertNotNull(this.msg.getCorrelationID());
     }
 
     @Test
-    public void testSettingCorrelationId(){
+    public void testSettingCorrelationId() {
         assertNotNull(this.msg.getCorrelationID());
         msg.setCorrelationID(CORR_ID);
-        assertEquals("Correlation ID doesn't match expected ID.", CORR_ID, (int)msg.getCorrelationID());
-    
+        assertEquals("Correlation ID doesn't match expected ID.", CORR_ID, (int) msg.getCorrelationID());
+
     }
 
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCStructTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCStructTests.java
index 5542719ba..3cb7a1f3c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCStructTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCStructTests.java
@@ -37,7 +37,7 @@ public class RPCStructTests extends TestCase {
         super.tearDown();
     }
 
-    public void testGeneralGettersAndSetters(){
+    public void testGeneralGettersAndSetters() {
         String testKey = TestValues.GENERAL_STRING;
         Integer testInt = TestValues.GENERAL_INT;
 
@@ -48,7 +48,7 @@ public class RPCStructTests extends TestCase {
         assertNull(testStruct.getValue(testKey));
     }
 
-    public void testCommonObjectGetters(){
+    public void testCommonObjectGetters() {
         String stringKey = "String";
         String testString = TestValues.GENERAL_STRING;
         testStruct.setValue(stringKey, testString);
@@ -88,7 +88,7 @@ public class RPCStructTests extends TestCase {
         assertNull(testStruct.getLong(longKey));
     }
 
-    public void testGetObject(){
+    public void testGetObject() {
         String keyIsEmpty = "EMPTY";
         assertNull(testStruct.getObject(Integer.class, keyIsEmpty));
 
@@ -117,13 +117,13 @@ public class RPCStructTests extends TestCase {
         assertEquals(TestValues.MATCH, testImageFields, testStruct.getObject(ImageField.class, keyImageFields));
 
         List<Hashtable<String, Object>> testListImageFields = new ArrayList<>();
-        for(ImageField imgField : testImageFields){
+        for (ImageField imgField : testImageFields) {
             testListImageFields.add(imgField.getStore());
         }
         testStruct.setValue(keyImageFields, testListImageFields);
         List<ImageField> underTest = (List<ImageField>) testStruct.getObject(ImageField.class, keyImageFields);
         int index = 0;
-        for(ImageField imgField : testImageFields){
+        for (ImageField imgField : testImageFields) {
             assertTrue(Validator.validateImageFields(imgField, underTest.get(index++)));
         }
 
@@ -133,7 +133,7 @@ public class RPCStructTests extends TestCase {
         assertEquals(TestValues.MATCH, testMediaClockFormats, testStruct.getObject(MediaClockFormat.class, keyMediaClockFormats));
 
         List<String> testListMediaClockFormats = new ArrayList<>();
-        for(MediaClockFormat mcFormat : testMediaClockFormats){
+        for (MediaClockFormat mcFormat : testMediaClockFormats) {
             testListMediaClockFormats.add(mcFormat.toString());
         }
         testStruct.setValue(keyMediaClockFormats, testListMediaClockFormats);
@@ -142,7 +142,7 @@ public class RPCStructTests extends TestCase {
         assertNull(testStruct.getObject(Image.class, keyAirbag)); // Test incorrect class
     }
 
-    public void testGetObjectExceptions(){
+    public void testGetObjectExceptions() {
         String invalidKey = "invalid";
         testStruct.setValue(invalidKey, new Hashtable<>());
         assertNull(testStruct.getObject(Integer.class, invalidKey));
@@ -157,7 +157,7 @@ public class RPCStructTests extends TestCase {
     }
 
     public void testGetFloat() {
-        Hashtable <String, Object> map = new Hashtable<>();
+        Hashtable<String, Object> map = new Hashtable<>();
         String key = "test";
         Double value = 42.00;
         map.put(key, value);
@@ -171,7 +171,7 @@ public class RPCStructTests extends TestCase {
     }
 
     public void testGetDouble() {
-        Hashtable <String, Object> map = new Hashtable<>();
+        Hashtable<String, Object> map = new Hashtable<>();
         String key = "test";
         Integer value = 42;
         map.put(key, value);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java
index 06d0aeef0..04c12850b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java
@@ -108,7 +108,7 @@ public class RPCGenericTests {
     }
 
     @Before
-    public void setUp(){
+    public void setUp() {
         // Map that has keys correspond to the RPC names and values correspond to the params for that RPC.
         rpcMandatoryParamsMapFromXml = getRPCParamsMap(XML_FILE_NAME, true);
         rpcAllParamsMapFromXml = getRPCParamsMap(XML_FILE_NAME, false);
@@ -131,30 +131,30 @@ public class RPCGenericTests {
             String getterMethodName2;
             Class<?> javaParamType;
             boolean skipParam;
-            while (event != XmlPullParser.END_DOCUMENT)  {
+            while (event != XmlPullParser.END_DOCUMENT) {
                 String name = myParser.getName();
-                switch (event){
+                switch (event) {
                     case XmlPullParser.START_TAG:
                         // Store the RPC name in the map
-                        if(name.equals("function") || name.equals("struct")){
-                            rpcName = myParser.getAttributeValue(null,"name");
+                        if (name.equals("function") || name.equals("struct")) {
+                            rpcName = myParser.getAttributeValue(null, "name");
                             ignoreRPC = false;
-                            if (name.equals("function") && myParser.getAttributeValue(null, "messagetype").equals("response") && !rpcName.contains("Response")){
+                            if (name.equals("function") && myParser.getAttributeValue(null, "messagetype").equals("response") && !rpcName.contains("Response")) {
                                 rpcName += "Response";
                             }
 
                             // -------------- Exceptional cases because of mismatch between the RPC spec and the Android code --------------
-                                if(rpcName.equals("SyncMsgVersion")){
-                                    rpcName = "SdlMsgVersion";
-                                } else if(rpcName.equals("ShowConstantTBTResponse")){
-                                    rpcName = "ShowConstantTbtResponse";
-                                } else if(rpcName.equals("OASISAddress")) {
-                                    rpcName = "OasisAddress";
-                                } else if(rpcName.equals("ShowConstantTBT")) {
-                                    rpcName = "ShowConstantTbt";
-                                } else if (rpcName.equals("EncodedSyncPData") || rpcName.equals("OnEncodedSyncPData") || rpcName.equals("EncodedSyncPDataResponse")){
-                                    ignoreRPC = true;
-                                }
+                            if (rpcName.equals("SyncMsgVersion")) {
+                                rpcName = "SdlMsgVersion";
+                            } else if (rpcName.equals("ShowConstantTBTResponse")) {
+                                rpcName = "ShowConstantTbtResponse";
+                            } else if (rpcName.equals("OASISAddress")) {
+                                rpcName = "OasisAddress";
+                            } else if (rpcName.equals("ShowConstantTBT")) {
+                                rpcName = "ShowConstantTbt";
+                            } else if (rpcName.equals("EncodedSyncPData") || rpcName.equals("OnEncodedSyncPData") || rpcName.equals("EncodedSyncPDataResponse")) {
+                                ignoreRPC = true;
+                            }
                             // -------------------------------------------------------------------------------------------------------------
 
                             if (!ignoreRPC) {
@@ -162,38 +162,38 @@ public class RPCGenericTests {
                             }
                         }
                         // Store the params for the current RPC in the map
-                        if(name.equals("param") && myParser.getAttributeValue(null, "until") == null && !ignoreRPC){
+                        if (name.equals("param") && myParser.getAttributeValue(null, "until") == null && !ignoreRPC) {
                             setterMethodName = null;
                             getterMethodName1 = null;
                             getterMethodName2 = null;
                             javaParamType = null;
                             skipParam = false;
-                            boolean isMandatory = Boolean.valueOf(myParser.getAttributeValue(null,"mandatory"));
+                            boolean isMandatory = Boolean.valueOf(myParser.getAttributeValue(null, "mandatory"));
                             if (isMandatory || !includeMandatoryOnly) {
                                 String paramName = myParser.getAttributeValue(null, "name");
                                 String paramType = myParser.getAttributeValue(null, "type");
                                 boolean isArray = Boolean.valueOf(myParser.getAttributeValue(null, "array"));
 
                                 // -------------- Exceptional cases because of mismatch between the RPC spec and the Android code --------------
-                                if (paramName.equals("syncFileName")){
+                                if (paramName.equals("syncFileName")) {
                                     paramName = "sdlFileName";
-                                } else if (paramName.equals("syncMsgVersion")){
+                                } else if (paramName.equals("syncMsgVersion")) {
                                     paramName = "sdlMsgVersion";
-                                } else if (paramName.equals("hmiPermissions")){
+                                } else if (paramName.equals("hmiPermissions")) {
                                     paramName = "HMIPermissions";
-                                } else if (paramName.equals("resolution")){
+                                } else if (paramName.equals("resolution")) {
                                     paramName = "imageResolution";
                                 }
 
                                 setterMethodName = "set" + paramName.substring(0, 1).toUpperCase() + paramName.substring(1);
 
-                                if (paramType.equals("SyncMsgVersion")){
+                                if (paramType.equals("SyncMsgVersion")) {
                                     paramType = "SdlMsgVersion";
                                 } else if (paramType.equals("OASISAddress")) {
                                     paramType = "OasisAddress";
-                                } else if (rpcName.equals("TouchEvent") && paramType.equals("Integer") && isArray){
+                                } else if (rpcName.equals("TouchEvent") && paramType.equals("Integer") && isArray) {
                                     paramType = "Long";
-                                }  else if (Arrays.asList("GPSData", "VideoStreamingCapability").contains(rpcName) && paramType.equals("Float")){
+                                } else if (Arrays.asList("GPSData", "VideoStreamingCapability").contains(rpcName) && paramType.equals("Float")) {
                                     paramType = "Double";
                                 } else if (Arrays.asList("GetVehicleDataResponse", "OnVehicleData").contains(rpcName) && Arrays.asList("setInstantFuelConsumption", "setFuelLevel", "setSpeed", "setExternalTemperature", "setEngineTorque", "setAccPedalPosition", "setSteeringWheelAngle").contains(setterMethodName)) {
                                     paramType = "Double";
@@ -310,8 +310,7 @@ public class RPCGenericTests {
                                         .setSkip(skipParam)
                                         .setSetterName(setterMethodName)
                                         .setGetterName1(getterMethodName1)
-                                        .setGetterName2(getterMethodName2)
-                                        ;
+                                        .setGetterName2(getterMethodName2);
 
                                 rpcParamsMap.get(rpcName).add(param);
                             }
@@ -353,16 +352,16 @@ public class RPCGenericTests {
             for (Parameter param : rpcMandatoryParamsMapFromXml.get(rpcName)) {
                 String type = param.type;
                 // If the param is a list of objects, the type should be like "List<Object>"
-                if (param.isArray){
+                if (param.isArray) {
                     type = String.format("List<%s>", type);
                 }
                 mandatoryParamsListFromXML.add(type);
             }
             List<String> mandatoryParamsListFromCode = new ArrayList<>();
             boolean rpcHasValidConstructor = false;
-            for (Constructor constructor : aClass.getConstructors()){
+            for (Constructor constructor : aClass.getConstructors()) {
                 mandatoryParamsListFromCode.clear();
-                for (Type paramType : constructor.getGenericParameterTypes()){
+                for (Type paramType : constructor.getGenericParameterTypes()) {
                     String paramFullType = paramType.toString();
                     String paramSimpleType;
 
@@ -371,20 +370,19 @@ public class RPCGenericTests {
                         paramSimpleType = String.format("List<%s>", paramFullType.substring(paramFullType.lastIndexOf('.') + 1, paramFullType.length() - 1));
                     }
                     // If the param is a simple object for example "java.lang.String", the type should be the last part "String"
-                    else if (!paramFullType.contains(">")){
+                    else if (!paramFullType.contains(">")) {
                         paramSimpleType = paramFullType.substring(paramFullType.lastIndexOf('.') + 1, paramFullType.length());
-                    }
-                    else {
+                    } else {
                         paramSimpleType = paramFullType;
                     }
                     mandatoryParamsListFromCode.add(paramSimpleType);
                 }
-                if (mandatoryParamsListFromCode.containsAll(mandatoryParamsListFromXML) && mandatoryParamsListFromXML.containsAll(mandatoryParamsListFromCode)){
+                if (mandatoryParamsListFromCode.containsAll(mandatoryParamsListFromXML) && mandatoryParamsListFromXML.containsAll(mandatoryParamsListFromCode)) {
                     rpcHasValidConstructor = true;
                     break;
                 }
             }
-            if (!rpcHasValidConstructor){
+            if (!rpcHasValidConstructor) {
                 rpcsWithInvalidConstructor.add(rpcName);
             }
         }
@@ -496,14 +494,14 @@ public class RPCGenericTests {
                 try {
                     // --------------------------------------------- Exceptional cases ---------------------------------------------
                     // This case is exceptional because the setter changes the input if it is not all digits
-                    if (rpcName.equals("DialNumber") && param.type.equals("String")){
+                    if (rpcName.equals("DialNumber") && param.type.equals("String")) {
                         value = "5558675309";
                     }
                     // -------------------------------------------------------------------------------------------------------------
 
                     if (value == null) {
                         valueString = "GENERAL_" + param.type.toUpperCase();
-                        if (param.isArray){
+                        if (param.isArray) {
                             valueString += "_LIST";
                         }
                         value = Class.forName(TEST_VALUES_CLASS).getDeclaredField(valueString).get(null);
@@ -524,7 +522,7 @@ public class RPCGenericTests {
             try {
                 Constructor constructor = aClass.getConstructor(mandatoryParamsTypes.toArray(new Class<?>[mandatoryParamsTypes.size()]));
                 instance = constructor.newInstance(mandatoryParamsValues.toArray(new Object[mandatoryParamsValues.size()]));
-            } catch (NoSuchMethodException | IllegalAccessException |  InstantiationException | InvocationTargetException e) {
+            } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
                 e.printStackTrace();
                 fail("Constructor for RPC " + rpcName + " cannot be invoked. Make sure that the constructor parameters order and types are identical to the RPC specs");
             }
@@ -568,7 +566,7 @@ public class RPCGenericTests {
                 aClass = Class.forName(RPC_PACKAGE_PREFIX + rpcName);
             } catch (ClassNotFoundException e) {
                 e.printStackTrace();
-                errors.add("Class not found for rpc: "+ rpcName + ". \n");
+                errors.add("Class not found for rpc: " + rpcName + ". \n");
                 continue;
             }
 
@@ -603,7 +601,7 @@ public class RPCGenericTests {
                         getterMethod = getMethod(aClass, parameter, parameter.getterName2, true);
                     } catch (NoSuchMethodException ex) {
                         ex.printStackTrace();
-                        String errMsg = String.format(rpcName + "." + parameter.getterName1 + "()" + "%s" + " cannot be found. Make sure that the method exists. \n", parameter.type.equalsIgnoreCase("boolean")? "/" + parameter.getterName2 + "()" : "");
+                        String errMsg = String.format(rpcName + "." + parameter.getterName1 + "()" + "%s" + " cannot be found. Make sure that the method exists. \n", parameter.type.equalsIgnoreCase("boolean") ? "/" + parameter.getterName2 + "()" : "");
                         errors.add(errMsg);
                     }
                 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
index 2eff1f828..d82bed010 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
@@ -13,18 +13,18 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.AirbagStatus}
  */
-public class AirbagStatusTests extends TestCase{
+public class AirbagStatusTests extends TestCase {
 
     private AirbagStatus msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new AirbagStatus();
         assertNotNull(TestValues.NOT_NULL, msg);
-        
+
         msg.setDriverAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
         msg.setDriverCurtainAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
         msg.setDriverKneeAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
@@ -33,14 +33,14 @@ public class AirbagStatusTests extends TestCase{
         msg.setPassengerCurtainAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
         msg.setPassengerKneeAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
         msg.setPassengerSideAirbagDeployed(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
-        
+
     }
-    
+
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {       	
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         VehicleDataEventStatus airbagStatus = msg.getDriverAirbagDeployed();
         VehicleDataEventStatus curtainStatus = msg.getDriverCurtainAirbagDeployed();
         VehicleDataEventStatus kneeStatus = msg.getDriverKneeAirbagDeployed();
@@ -49,7 +49,7 @@ public class AirbagStatusTests extends TestCase{
         VehicleDataEventStatus passengerCurtainStatus = msg.getPassengerCurtainAirbagDeployed();
         VehicleDataEventStatus passengerKneeStatus = msg.getPassengerKneeAirbagDeployed();
         VehicleDataEventStatus passengerSideStatus = msg.getPassengerSideAirbagDeployed();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, airbagStatus);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, curtainStatus);
@@ -59,11 +59,11 @@ public class AirbagStatusTests extends TestCase{
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, passengerCurtainStatus);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, passengerKneeStatus);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, passengerSideStatus);
-    
+
         // Invalid/Null Tests
         AirbagStatus msg = new AirbagStatus();
         assertNotNull(TestValues.NOT_NULL, msg);
-        
+
         assertNull(TestValues.NULL, msg.getDriverAirbagDeployed());
         assertNull(TestValues.NULL, msg.getDriverSideAirbagDeployed());
         assertNull(TestValues.NULL, msg.getDriverCurtainAirbagDeployed());
@@ -74,10 +74,10 @@ public class AirbagStatusTests extends TestCase{
         assertNull(TestValues.NULL, msg.getPassengerKneeAirbagDeployed());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
             reference.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
             reference.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
@@ -91,12 +91,12 @@ public class AirbagStatusTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppInfoTests.java
index 1f143cb61..1c8fd568c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppInfoTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppInfoTests.java
@@ -49,64 +49,64 @@ import java.util.Iterator;
  */
 public class AppInfoTests extends TestCase {
 
-	private AppInfo msg;
-
-	@Override
-	public void setUp() {
-
-		msg = new AppInfo();
-		msg.setAppDisplayName(TestValues.GENERAL_STRING);
-		msg.setAppBundleID(TestValues.GENERAL_STRING);
-		msg.setAppVersion(TestValues.GENERAL_STRING);
-		msg.setAppIcon(TestValues.GENERAL_STRING);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		String appDisplayName = msg.getAppDisplayName();
-		String appBundleID = msg.getAppBundleID();
-		String appVersion = msg.getAppVersion();
-		String appIcon = msg.getAppIcon();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_STRING, appDisplayName);
-		assertEquals(TestValues.GENERAL_STRING, appBundleID);
-		assertEquals(TestValues.GENERAL_STRING, appVersion);
-		assertEquals(TestValues.GENERAL_STRING, appIcon);
-
-		// Invalid/Null Tests
-		AppInfo msg = new AppInfo();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getAppDisplayName());
-		assertNull(TestValues.NULL, msg.getAppBundleID());
-		assertNull(TestValues.NULL, msg.getAppVersion());
-		assertNull(TestValues.NULL, msg.getAppIcon());
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(AppInfo.KEY_APP_DISPLAY_NAME, TestValues.GENERAL_STRING);
-			reference.put(AppInfo.KEY_APP_BUNDLE_ID, TestValues.GENERAL_STRING);
-			reference.put(AppInfo.KEY_APP_VERSION, TestValues.GENERAL_STRING);
-			reference.put(AppInfo.KEY_APP_ICON, TestValues.GENERAL_STRING);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private AppInfo msg;
+
+    @Override
+    public void setUp() {
+
+        msg = new AppInfo();
+        msg.setAppDisplayName(TestValues.GENERAL_STRING);
+        msg.setAppBundleID(TestValues.GENERAL_STRING);
+        msg.setAppVersion(TestValues.GENERAL_STRING);
+        msg.setAppIcon(TestValues.GENERAL_STRING);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        String appDisplayName = msg.getAppDisplayName();
+        String appBundleID = msg.getAppBundleID();
+        String appVersion = msg.getAppVersion();
+        String appIcon = msg.getAppIcon();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_STRING, appDisplayName);
+        assertEquals(TestValues.GENERAL_STRING, appBundleID);
+        assertEquals(TestValues.GENERAL_STRING, appVersion);
+        assertEquals(TestValues.GENERAL_STRING, appIcon);
+
+        // Invalid/Null Tests
+        AppInfo msg = new AppInfo();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getAppDisplayName());
+        assertNull(TestValues.NULL, msg.getAppBundleID());
+        assertNull(TestValues.NULL, msg.getAppVersion());
+        assertNull(TestValues.NULL, msg.getAppIcon());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(AppInfo.KEY_APP_DISPLAY_NAME, TestValues.GENERAL_STRING);
+            reference.put(AppInfo.KEY_APP_BUNDLE_ID, TestValues.GENERAL_STRING);
+            reference.put(AppInfo.KEY_APP_VERSION, TestValues.GENERAL_STRING);
+            reference.put(AppInfo.KEY_APP_ICON, TestValues.GENERAL_STRING);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java
index 1579e1ec1..15f55dd6c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceCapabilityTest.java
@@ -28,107 +28,107 @@ import java.util.List;
  */
 public class AppServiceCapabilityTest extends TestCase {
 
-	private AppServiceCapability msg;
+    private AppServiceCapability msg;
 
-	@Override
-	public void setUp(){
+    @Override
+    public void setUp() {
 
-		msg = new AppServiceCapability();
-		msg.setUpdatedAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD);
-		msg.setUpdateReason(TestValues.GENERAL_SERVICE_UPDATE_REASON);
-	}
+        msg = new AppServiceCapability();
+        msg.setUpdatedAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD);
+        msg.setUpdateReason(TestValues.GENERAL_SERVICE_UPDATE_REASON);
+    }
 
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		AppServiceRecord serviceRecord = msg.getUpdatedAppServiceRecord();
-		ServiceUpdateReason updateReason = msg.getUpdateReason();
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        AppServiceRecord serviceRecord = msg.getUpdatedAppServiceRecord();
+        ServiceUpdateReason updateReason = msg.getUpdateReason();
 
-		// Valid Tests
-		assertEquals(TestValues.MATCH, serviceRecord, TestValues.GENERAL_APPSERVICERECORD);
-		assertEquals(TestValues.MATCH, updateReason, TestValues.GENERAL_SERVICE_UPDATE_REASON);
+        // Valid Tests
+        assertEquals(TestValues.MATCH, serviceRecord, TestValues.GENERAL_APPSERVICERECORD);
+        assertEquals(TestValues.MATCH, updateReason, TestValues.GENERAL_SERVICE_UPDATE_REASON);
 
-		// Invalid/Null Tests
-		AppServiceCapability msg = new AppServiceCapability();
-		assertNotNull(TestValues.NOT_NULL, msg);
+        // Invalid/Null Tests
+        AppServiceCapability msg = new AppServiceCapability();
+        assertNotNull(TestValues.NOT_NULL, msg);
 
-		assertNull(TestValues.NULL, msg.getUpdatedAppServiceRecord());
-		assertNull(TestValues.NULL, msg.getUpdateReason());
-	}
+        assertNull(TestValues.NULL, msg.getUpdatedAppServiceRecord());
+        assertNull(TestValues.NULL, msg.getUpdateReason());
+    }
 
-	public void testRequiredParamsConstructor(){
-		msg = new AppServiceCapability(TestValues.GENERAL_APPSERVICERECORD);
-		AppServiceRecord serviceRecord = msg.getUpdatedAppServiceRecord();
-		assertEquals(TestValues.MATCH, serviceRecord, TestValues.GENERAL_APPSERVICERECORD);
-	}
+    public void testRequiredParamsConstructor() {
+        msg = new AppServiceCapability(TestValues.GENERAL_APPSERVICERECORD);
+        AppServiceRecord serviceRecord = msg.getUpdatedAppServiceRecord();
+        assertEquals(TestValues.MATCH, serviceRecord, TestValues.GENERAL_APPSERVICERECORD);
+    }
 
-	public void testJson(){
-		JSONObject reference = new JSONObject();
+    public void testJson() {
+        JSONObject reference = new JSONObject();
 
-		try{
-			reference.put(AppServiceCapability.KEY_UPDATE_REASON, TestValues.GENERAL_SERVICE_UPDATE_REASON);
-			reference.put(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD, TestValues.GENERAL_APPSERVICERECORD);
+        try {
+            reference.put(AppServiceCapability.KEY_UPDATE_REASON, TestValues.GENERAL_SERVICE_UPDATE_REASON);
+            reference.put(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD, TestValues.GENERAL_APPSERVICERECORD);
 
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()) {
-				String key = (String) iterator.next();
-				if (key.equals(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD, new AppServiceRecord(hashTest)));
-				} else{
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                if (key.equals(AppServiceCapability.KEY_UPDATED_APP_SERVICE_RECORD)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD, new AppServiceRecord(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 
-	public void testMatchesAppService(){
+    public void testMatchesAppService() {
 
-		String baseName = "NavTest", baseID = "37F98053AE";
+        String baseName = "NavTest", baseID = "37F98053AE";
 
-		AppServiceCapability capability1 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null);
-		AppServiceCapability capability2 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null);
+        AppServiceCapability capability1 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null);
+        AppServiceCapability capability2 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null);
 
-		assertTrue(capability1.matchesAppService(capability2));
+        assertTrue(capability1.matchesAppService(capability2));
 
-		//Remove the service id from record 2
-		capability2.getUpdatedAppServiceRecord().setServiceID(null);
-		assertNull(capability2.getUpdatedAppServiceRecord().getServiceID());
-		assertTrue(capability1.matchesAppService(capability2));
+        //Remove the service id from record 2
+        capability2.getUpdatedAppServiceRecord().setServiceID(null);
+        assertNull(capability2.getUpdatedAppServiceRecord().getServiceID());
+        assertTrue(capability1.matchesAppService(capability2));
 
-		/* UPDATE WITH NEW SERVICE MANIFEST CHANGES */
+        /* UPDATE WITH NEW SERVICE MANIFEST CHANGES */
 
-		AppServiceManifest appServiceManifest2 = capability2.getUpdatedAppServiceRecord().getServiceManifest();
+        AppServiceManifest appServiceManifest2 = capability2.getUpdatedAppServiceRecord().getServiceManifest();
 
-		List<FunctionID> handledRPCs2 = new ArrayList<>();
-		handledRPCs2.add(FunctionID.SEND_LOCATION);
-		handledRPCs2.add(FunctionID.GET_WAY_POINTS);
-		appServiceManifest2.setHandledRpcsUsingFunctionIDs(handledRPCs2);
-		capability2.getUpdatedAppServiceRecord().setServiceManifest(appServiceManifest2);
+        List<FunctionID> handledRPCs2 = new ArrayList<>();
+        handledRPCs2.add(FunctionID.SEND_LOCATION);
+        handledRPCs2.add(FunctionID.GET_WAY_POINTS);
+        appServiceManifest2.setHandledRpcsUsingFunctionIDs(handledRPCs2);
+        capability2.getUpdatedAppServiceRecord().setServiceManifest(appServiceManifest2);
 
-		assertTrue(capability1.matchesAppService(capability2));
+        assertTrue(capability1.matchesAppService(capability2));
 
 
-		/* UPDATE WITH NEW SERVICE MANIFEST APP NAME */
-		capability2.getUpdatedAppServiceRecord().getServiceManifest().setServiceName("Nav-Test");
-		assertFalse(capability1.matchesAppService(capability2));
+        /* UPDATE WITH NEW SERVICE MANIFEST APP NAME */
+        capability2.getUpdatedAppServiceRecord().getServiceManifest().setServiceName("Nav-Test");
+        assertFalse(capability1.matchesAppService(capability2));
 
 
-		/* UPDATE WITH NEW SERVICE ID */
-		//Reset name
-		capability2.getUpdatedAppServiceRecord().getServiceManifest().setServiceName(baseName);
+        /* UPDATE WITH NEW SERVICE ID */
+        //Reset name
+        capability2.getUpdatedAppServiceRecord().getServiceManifest().setServiceName(baseName);
 
-		capability2.getUpdatedAppServiceRecord().setServiceID("EEEEEEEEEE");
-		assertFalse(capability1.matchesAppService(capability2));
-	}
+        capability2.getUpdatedAppServiceRecord().setServiceID("EEEEEEEEEE");
+        assertFalse(capability1.matchesAppService(capability2));
+    }
 
 
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java
index d909d0d5d..7e18554c5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceDataTests.java
@@ -23,96 +23,96 @@ import java.util.Iterator;
  */
 public class AppServiceDataTests extends TestCase {
 
-	private AppServiceData msg;
-
-	@Override
-	public void setUp() {
-
-		msg = new AppServiceData();
-		msg.setServiceType(TestValues.GENERAL_STRING);
-		msg.setServiceID(TestValues.GENERAL_STRING);
-		msg.setMediaServiceData(TestValues.GENERAL_MEDIASERVICEDATA);
-		msg.setWeatherServiceData(TestValues.GENERAL_WEATHERSERVICEDATA);
-		msg.setNavigationServiceData(TestValues.GENERAL_NAVIGATIONSERVICEDATA);
-
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		String appServiceType = msg.getServiceType();
-		String serviceId = msg.getServiceID();
-		MediaServiceData mediaServiceData = msg.getMediaServiceData();
-		WeatherServiceData weatherServiceData = msg.getWeatherServiceData();
-		NavigationServiceData navigationServiceData = msg.getNavigationServiceData();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_STRING, appServiceType);
-		assertEquals(TestValues.GENERAL_STRING, serviceId);
-		assertEquals(TestValues.GENERAL_MEDIASERVICEDATA, mediaServiceData);
-		assertEquals(TestValues.GENERAL_WEATHERSERVICEDATA, weatherServiceData);
-		assertEquals(TestValues.GENERAL_NAVIGATIONSERVICEDATA, navigationServiceData);
-
-		// Invalid/Null Tests
-		AppServiceData msg = new AppServiceData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getServiceType());
-		assertNull(TestValues.NULL, msg.getServiceID());
-		assertNull(TestValues.NULL, msg.getMediaServiceData());
-		assertNull(TestValues.NULL, msg.getWeatherServiceData());
-		assertNull(TestValues.NULL, msg.getNavigationServiceData());
-
-	}
-
-	public void testRequiredParamsConstructor(){
-
-		msg = new AppServiceData(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING);
-		String appServiceType = msg.getServiceType();
-		String serviceId = msg.getServiceID();
-		assertEquals(TestValues.GENERAL_STRING, appServiceType);
-		assertEquals(TestValues.GENERAL_STRING, serviceId);
-
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(AppServiceData.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING);
-			reference.put(AppServiceData.KEY_SERVICE_ID, TestValues.GENERAL_STRING);
-			reference.put(AppServiceData.KEY_MEDIA_SERVICE_DATA, TestValues.GENERAL_MEDIASERVICEDATA);
-			reference.put(AppServiceData.KEY_WEATHER_SERVICE_DATA, TestValues.GENERAL_WEATHERSERVICEDATA);
-			reference.put(AppServiceData.KEY_NAVIGATION_SERVICE_DATA, TestValues.GENERAL_NAVIGATIONSERVICEDATA);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-
-				if (key.equals(AppServiceData.KEY_MEDIA_SERVICE_DATA)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateMediaServiceData(TestValues.GENERAL_MEDIASERVICEDATA, new MediaServiceData(hashTest)));
-				} else if (key.equals(AppServiceData.KEY_WEATHER_SERVICE_DATA)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateWeatherServiceData(TestValues.GENERAL_WEATHERSERVICEDATA, new WeatherServiceData(hashTest)));
-				} else if (key.equals(AppServiceData.KEY_NAVIGATION_SERVICE_DATA)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateNavigationServiceData(TestValues.GENERAL_NAVIGATIONSERVICEDATA, new NavigationServiceData(hashTest)));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private AppServiceData msg;
+
+    @Override
+    public void setUp() {
+
+        msg = new AppServiceData();
+        msg.setServiceType(TestValues.GENERAL_STRING);
+        msg.setServiceID(TestValues.GENERAL_STRING);
+        msg.setMediaServiceData(TestValues.GENERAL_MEDIASERVICEDATA);
+        msg.setWeatherServiceData(TestValues.GENERAL_WEATHERSERVICEDATA);
+        msg.setNavigationServiceData(TestValues.GENERAL_NAVIGATIONSERVICEDATA);
+
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        String appServiceType = msg.getServiceType();
+        String serviceId = msg.getServiceID();
+        MediaServiceData mediaServiceData = msg.getMediaServiceData();
+        WeatherServiceData weatherServiceData = msg.getWeatherServiceData();
+        NavigationServiceData navigationServiceData = msg.getNavigationServiceData();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_STRING, appServiceType);
+        assertEquals(TestValues.GENERAL_STRING, serviceId);
+        assertEquals(TestValues.GENERAL_MEDIASERVICEDATA, mediaServiceData);
+        assertEquals(TestValues.GENERAL_WEATHERSERVICEDATA, weatherServiceData);
+        assertEquals(TestValues.GENERAL_NAVIGATIONSERVICEDATA, navigationServiceData);
+
+        // Invalid/Null Tests
+        AppServiceData msg = new AppServiceData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getServiceType());
+        assertNull(TestValues.NULL, msg.getServiceID());
+        assertNull(TestValues.NULL, msg.getMediaServiceData());
+        assertNull(TestValues.NULL, msg.getWeatherServiceData());
+        assertNull(TestValues.NULL, msg.getNavigationServiceData());
+
+    }
+
+    public void testRequiredParamsConstructor() {
+
+        msg = new AppServiceData(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING);
+        String appServiceType = msg.getServiceType();
+        String serviceId = msg.getServiceID();
+        assertEquals(TestValues.GENERAL_STRING, appServiceType);
+        assertEquals(TestValues.GENERAL_STRING, serviceId);
+
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(AppServiceData.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING);
+            reference.put(AppServiceData.KEY_SERVICE_ID, TestValues.GENERAL_STRING);
+            reference.put(AppServiceData.KEY_MEDIA_SERVICE_DATA, TestValues.GENERAL_MEDIASERVICEDATA);
+            reference.put(AppServiceData.KEY_WEATHER_SERVICE_DATA, TestValues.GENERAL_WEATHERSERVICEDATA);
+            reference.put(AppServiceData.KEY_NAVIGATION_SERVICE_DATA, TestValues.GENERAL_NAVIGATIONSERVICEDATA);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(AppServiceData.KEY_MEDIA_SERVICE_DATA)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateMediaServiceData(TestValues.GENERAL_MEDIASERVICEDATA, new MediaServiceData(hashTest)));
+                } else if (key.equals(AppServiceData.KEY_WEATHER_SERVICE_DATA)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateWeatherServiceData(TestValues.GENERAL_WEATHERSERVICEDATA, new WeatherServiceData(hashTest)));
+                } else if (key.equals(AppServiceData.KEY_NAVIGATION_SERVICE_DATA)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateNavigationServiceData(TestValues.GENERAL_NAVIGATIONSERVICEDATA, new NavigationServiceData(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java
index 8a9f2b0ff..94b1b799c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceManifestTests.java
@@ -26,123 +26,123 @@ import java.util.List;
  */
 public class AppServiceManifestTests extends TestCase {
 
-	private AppServiceManifest msg;
-
-	@Override
-	public void setUp(){
-
-		msg = new AppServiceManifest();
-		msg.setServiceType(TestValues.GENERAL_STRING);
-		msg.setAllowAppConsumers(TestValues.GENERAL_BOOLEAN);
-		msg.setHandledRpcs(TestValues.GENERAL_FUNCTION_ID_LIST);
-		msg.setMediaServiceManifest(TestValues.GENERAL_MEDIA_SERVICE_MANIFEST);
-		msg.setRpcSpecVersion(TestValues.GENERAL_SDLMSGVERSION);
-		msg.setServiceIcon(TestValues.GENERAL_IMAGE);
-		msg.setServiceName(TestValues.GENERAL_STRING);
-		msg.setWeatherServiceManifest(TestValues.GENERAL_WEATHER_SERVICE_MANIFEST);
-		msg.setNavigationServiceManifest(TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		Image serviceIcon = msg.getServiceIcon();
-		String serviceName = msg.getServiceName();
-		String appServiceType = msg.getServiceType();
-		boolean allowAppConsumers = msg.getAllowAppConsumers();
-		SdlMsgVersion version = msg.getRpcSpecVersion();
-		List<Integer> handledRPCs = msg.getHandledRpcs();
-		WeatherServiceManifest weatherServiceManifestTest = msg.getWeatherServiceManifest();
-		MediaServiceManifest mediaServiceManifestTest = msg.getMediaServiceManifest();
-		NavigationServiceManifest navigationServiceManifest = msg.getNavigationServiceManifest();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_BOOLEAN, allowAppConsumers);
-		assertEquals(TestValues.GENERAL_IMAGE, serviceIcon);
-		assertEquals(TestValues.GENERAL_STRING, serviceName);
-		assertEquals(TestValues.GENERAL_STRING, appServiceType);
-		assertEquals(TestValues.GENERAL_SDLMSGVERSION, version);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FUNCTION_ID_LIST, handledRPCs);
-		assertEquals(TestValues.GENERAL_WEATHER_SERVICE_MANIFEST, weatherServiceManifestTest);
-		assertEquals(TestValues.GENERAL_MEDIA_SERVICE_MANIFEST, mediaServiceManifestTest);
-		assertEquals(TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST, navigationServiceManifest);
-
-		// Invalid/Null Tests
-		AppServiceManifest msg = new AppServiceManifest();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getServiceIcon());
-		assertNull(TestValues.NULL, msg.getServiceName());
-		assertNull(TestValues.NULL, msg.getServiceType());
-		assertNull(TestValues.NULL, msg.getAllowAppConsumers());
-		assertNull(TestValues.NULL, msg.getRpcSpecVersion());
-		assertNull(TestValues.NULL, msg.getHandledRpcs());
-		assertNull(TestValues.NULL, msg.getWeatherServiceManifest());
-		assertNull(TestValues.NULL, msg.getMediaServiceManifest());
-		assertNull(TestValues.NULL, msg.getNavigationServiceManifest());
-	}
-
-	public void testRequiredParamsConstructor(){
-		msg = new AppServiceManifest(TestValues.GENERAL_STRING);
-		String appServiceType = msg.getServiceType();
-		assertEquals(TestValues.GENERAL_STRING, appServiceType);
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(AppServiceManifest.KEY_SERVICE_NAME, TestValues.GENERAL_STRING);
-			reference.put(AppServiceManifest.KEY_SERVICE_ICON, TestValues.GENERAL_IMAGE);
-			reference.put(AppServiceManifest.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING);
-			reference.put(AppServiceManifest.KEY_ALLOW_APP_CONSUMERS, TestValues.GENERAL_BOOLEAN);
-			reference.put(AppServiceManifest.KEY_RPC_SPEC_VERSION, TestValues.GENERAL_SDLMSGVERSION.serializeJSON());
-			reference.put(AppServiceManifest.KEY_HANDLED_RPCS, TestValues.GENERAL_FUNCTION_ID_LIST);
-			reference.put(AppServiceManifest.KEY_WEATHER_SERVICE_MANIFEST, TestValues.GENERAL_WEATHER_SERVICE_MANIFEST);
-			reference.put(AppServiceManifest.KEY_MEDIA_SERVICE_MANIFEST, TestValues.GENERAL_MEDIA_SERVICE_MANIFEST);
-			reference.put(AppServiceManifest.KEY_NAVIGATION_SERVICE_MANIFEST, TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-
-				if(key.equals(AppServiceManifest.KEY_RPC_SPEC_VERSION)){
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion( new SdlMsgVersion(hashReference), new SdlMsgVersion(hashTest)));
-				}else if(key.equals(AppServiceManifest.KEY_HANDLED_RPCS)){
-					List<Integer> list1 = TestValues.GENERAL_FUNCTION_ID_LIST;
-					List<Integer> list2 = JsonUtils.readIntegerListFromJsonObject(underTest, key);
-					assertTrue(TestValues.TRUE, Validator.validateIntegerList(list1,list2));
-				}else if(key.equals(AppServiceManifest.KEY_WEATHER_SERVICE_MANIFEST)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateWeatherServiceManifest( TestValues.GENERAL_WEATHER_SERVICE_MANIFEST, new WeatherServiceManifest(hashTest)));
-				}else if(key.equals(AppServiceManifest.KEY_MEDIA_SERVICE_MANIFEST)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateMediaServiceManifest( TestValues.GENERAL_MEDIA_SERVICE_MANIFEST, new MediaServiceManifest(hashTest)));
-				} else if(key.equals(AppServiceManifest.KEY_NAVIGATION_SERVICE_MANIFEST)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateNavigationServiceManifest( TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST, new NavigationServiceManifest(hashTest)));
-				}else if(key.equals(AppServiceManifest.KEY_SERVICE_ICON)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(testEquals));
-					assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, msg.getServiceIcon()));
-				}else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private AppServiceManifest msg;
+
+    @Override
+    public void setUp() {
+
+        msg = new AppServiceManifest();
+        msg.setServiceType(TestValues.GENERAL_STRING);
+        msg.setAllowAppConsumers(TestValues.GENERAL_BOOLEAN);
+        msg.setHandledRpcs(TestValues.GENERAL_FUNCTION_ID_LIST);
+        msg.setMediaServiceManifest(TestValues.GENERAL_MEDIA_SERVICE_MANIFEST);
+        msg.setRpcSpecVersion(TestValues.GENERAL_SDLMSGVERSION);
+        msg.setServiceIcon(TestValues.GENERAL_IMAGE);
+        msg.setServiceName(TestValues.GENERAL_STRING);
+        msg.setWeatherServiceManifest(TestValues.GENERAL_WEATHER_SERVICE_MANIFEST);
+        msg.setNavigationServiceManifest(TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Image serviceIcon = msg.getServiceIcon();
+        String serviceName = msg.getServiceName();
+        String appServiceType = msg.getServiceType();
+        boolean allowAppConsumers = msg.getAllowAppConsumers();
+        SdlMsgVersion version = msg.getRpcSpecVersion();
+        List<Integer> handledRPCs = msg.getHandledRpcs();
+        WeatherServiceManifest weatherServiceManifestTest = msg.getWeatherServiceManifest();
+        MediaServiceManifest mediaServiceManifestTest = msg.getMediaServiceManifest();
+        NavigationServiceManifest navigationServiceManifest = msg.getNavigationServiceManifest();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_BOOLEAN, allowAppConsumers);
+        assertEquals(TestValues.GENERAL_IMAGE, serviceIcon);
+        assertEquals(TestValues.GENERAL_STRING, serviceName);
+        assertEquals(TestValues.GENERAL_STRING, appServiceType);
+        assertEquals(TestValues.GENERAL_SDLMSGVERSION, version);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FUNCTION_ID_LIST, handledRPCs);
+        assertEquals(TestValues.GENERAL_WEATHER_SERVICE_MANIFEST, weatherServiceManifestTest);
+        assertEquals(TestValues.GENERAL_MEDIA_SERVICE_MANIFEST, mediaServiceManifestTest);
+        assertEquals(TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST, navigationServiceManifest);
+
+        // Invalid/Null Tests
+        AppServiceManifest msg = new AppServiceManifest();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getServiceIcon());
+        assertNull(TestValues.NULL, msg.getServiceName());
+        assertNull(TestValues.NULL, msg.getServiceType());
+        assertNull(TestValues.NULL, msg.getAllowAppConsumers());
+        assertNull(TestValues.NULL, msg.getRpcSpecVersion());
+        assertNull(TestValues.NULL, msg.getHandledRpcs());
+        assertNull(TestValues.NULL, msg.getWeatherServiceManifest());
+        assertNull(TestValues.NULL, msg.getMediaServiceManifest());
+        assertNull(TestValues.NULL, msg.getNavigationServiceManifest());
+    }
+
+    public void testRequiredParamsConstructor() {
+        msg = new AppServiceManifest(TestValues.GENERAL_STRING);
+        String appServiceType = msg.getServiceType();
+        assertEquals(TestValues.GENERAL_STRING, appServiceType);
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(AppServiceManifest.KEY_SERVICE_NAME, TestValues.GENERAL_STRING);
+            reference.put(AppServiceManifest.KEY_SERVICE_ICON, TestValues.GENERAL_IMAGE);
+            reference.put(AppServiceManifest.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING);
+            reference.put(AppServiceManifest.KEY_ALLOW_APP_CONSUMERS, TestValues.GENERAL_BOOLEAN);
+            reference.put(AppServiceManifest.KEY_RPC_SPEC_VERSION, TestValues.GENERAL_SDLMSGVERSION.serializeJSON());
+            reference.put(AppServiceManifest.KEY_HANDLED_RPCS, TestValues.GENERAL_FUNCTION_ID_LIST);
+            reference.put(AppServiceManifest.KEY_WEATHER_SERVICE_MANIFEST, TestValues.GENERAL_WEATHER_SERVICE_MANIFEST);
+            reference.put(AppServiceManifest.KEY_MEDIA_SERVICE_MANIFEST, TestValues.GENERAL_MEDIA_SERVICE_MANIFEST);
+            reference.put(AppServiceManifest.KEY_NAVIGATION_SERVICE_MANIFEST, TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(AppServiceManifest.KEY_RPC_SPEC_VERSION)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(new SdlMsgVersion(hashReference), new SdlMsgVersion(hashTest)));
+                } else if (key.equals(AppServiceManifest.KEY_HANDLED_RPCS)) {
+                    List<Integer> list1 = TestValues.GENERAL_FUNCTION_ID_LIST;
+                    List<Integer> list2 = JsonUtils.readIntegerListFromJsonObject(underTest, key);
+                    assertTrue(TestValues.TRUE, Validator.validateIntegerList(list1, list2));
+                } else if (key.equals(AppServiceManifest.KEY_WEATHER_SERVICE_MANIFEST)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateWeatherServiceManifest(TestValues.GENERAL_WEATHER_SERVICE_MANIFEST, new WeatherServiceManifest(hashTest)));
+                } else if (key.equals(AppServiceManifest.KEY_MEDIA_SERVICE_MANIFEST)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateMediaServiceManifest(TestValues.GENERAL_MEDIA_SERVICE_MANIFEST, new MediaServiceManifest(hashTest)));
+                } else if (key.equals(AppServiceManifest.KEY_NAVIGATION_SERVICE_MANIFEST)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateNavigationServiceManifest(TestValues.GENERAL_NAVIGATION_SERVICE_MANIFEST, new NavigationServiceManifest(hashTest)));
+                } else if (key.equals(AppServiceManifest.KEY_SERVICE_ICON)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(testEquals));
+                    assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, msg.getServiceIcon()));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java
index c8c70f0de..af0b20f91 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServiceRecordTests.java
@@ -21,87 +21,87 @@ import java.util.Iterator;
  */
 public class AppServiceRecordTests extends TestCase {
 
-	private AppServiceRecord msg;
-
-	@Override
-	public void setUp(){
-
-		msg = new AppServiceRecord();
-		msg.setServicePublished(TestValues.GENERAL_BOOLEAN);
-		msg.setServiceActive(TestValues.GENERAL_BOOLEAN);
-		msg.setServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST);
-		msg.setServiceID(TestValues.GENERAL_STRING);
-
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-
-		boolean isServicePublished = msg.getServicePublished();
-		boolean isServiceActive = msg.getServiceActive();
-		AppServiceManifest serviceManifest = msg.getServiceManifest();
-		String serviceID = msg.getServiceID();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_BOOLEAN, isServicePublished);
-		assertEquals(TestValues.GENERAL_BOOLEAN, isServiceActive);
-		assertEquals(TestValues.GENERAL_APPSERVICEMANIFEST, serviceManifest);
-		assertEquals(TestValues.GENERAL_STRING, serviceID);
-
-		// Invalid/Null Tests
-		AppServiceRecord msg = new AppServiceRecord();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getServicePublished());
-		assertNull(TestValues.NULL, msg.getServiceActive());
-		assertNull(TestValues.NULL, msg.getServiceManifest());
-		assertNull(TestValues.NULL, msg.getServiceID());
-	}
-
-	public void testRequiredParamsConstructor(){
-		msg = new AppServiceRecord(TestValues.GENERAL_STRING, TestValues.GENERAL_APPSERVICEMANIFEST, TestValues.GENERAL_BOOLEAN, TestValues.GENERAL_BOOLEAN);
-
-		boolean isServicePublished = msg.getServicePublished();
-		boolean isServiceActive = msg.getServiceActive();
-		AppServiceManifest serviceManifest = msg.getServiceManifest();
-		String serviceID = msg.getServiceID();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_BOOLEAN, isServicePublished);
-		assertEquals(TestValues.GENERAL_BOOLEAN, isServiceActive);
-		assertEquals(TestValues.GENERAL_APPSERVICEMANIFEST, serviceManifest);
-		assertEquals(TestValues.GENERAL_STRING, serviceID);
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(AppServiceRecord.KEY_SERVICE_ACTIVE, TestValues.GENERAL_BOOLEAN);
-			reference.put(AppServiceRecord.KEY_SERVICE_PUBLISHED, TestValues.GENERAL_BOOLEAN);
-			reference.put(AppServiceRecord.KEY_SERVICE_ID, TestValues.GENERAL_STRING);
-			reference.put(AppServiceRecord.KEY_SERVICE_MANIFEST, TestValues.GENERAL_APPSERVICEMANIFEST);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-
-				if(key.equals(AppServiceRecord.KEY_SERVICE_MANIFEST)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateAppServiceManifest( TestValues.GENERAL_APPSERVICEMANIFEST, new AppServiceManifest(hashTest)));
-				}else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private AppServiceRecord msg;
+
+    @Override
+    public void setUp() {
+
+        msg = new AppServiceRecord();
+        msg.setServicePublished(TestValues.GENERAL_BOOLEAN);
+        msg.setServiceActive(TestValues.GENERAL_BOOLEAN);
+        msg.setServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST);
+        msg.setServiceID(TestValues.GENERAL_STRING);
+
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+
+        boolean isServicePublished = msg.getServicePublished();
+        boolean isServiceActive = msg.getServiceActive();
+        AppServiceManifest serviceManifest = msg.getServiceManifest();
+        String serviceID = msg.getServiceID();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_BOOLEAN, isServicePublished);
+        assertEquals(TestValues.GENERAL_BOOLEAN, isServiceActive);
+        assertEquals(TestValues.GENERAL_APPSERVICEMANIFEST, serviceManifest);
+        assertEquals(TestValues.GENERAL_STRING, serviceID);
+
+        // Invalid/Null Tests
+        AppServiceRecord msg = new AppServiceRecord();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getServicePublished());
+        assertNull(TestValues.NULL, msg.getServiceActive());
+        assertNull(TestValues.NULL, msg.getServiceManifest());
+        assertNull(TestValues.NULL, msg.getServiceID());
+    }
+
+    public void testRequiredParamsConstructor() {
+        msg = new AppServiceRecord(TestValues.GENERAL_STRING, TestValues.GENERAL_APPSERVICEMANIFEST, TestValues.GENERAL_BOOLEAN, TestValues.GENERAL_BOOLEAN);
+
+        boolean isServicePublished = msg.getServicePublished();
+        boolean isServiceActive = msg.getServiceActive();
+        AppServiceManifest serviceManifest = msg.getServiceManifest();
+        String serviceID = msg.getServiceID();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_BOOLEAN, isServicePublished);
+        assertEquals(TestValues.GENERAL_BOOLEAN, isServiceActive);
+        assertEquals(TestValues.GENERAL_APPSERVICEMANIFEST, serviceManifest);
+        assertEquals(TestValues.GENERAL_STRING, serviceID);
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(AppServiceRecord.KEY_SERVICE_ACTIVE, TestValues.GENERAL_BOOLEAN);
+            reference.put(AppServiceRecord.KEY_SERVICE_PUBLISHED, TestValues.GENERAL_BOOLEAN);
+            reference.put(AppServiceRecord.KEY_SERVICE_ID, TestValues.GENERAL_STRING);
+            reference.put(AppServiceRecord.KEY_SERVICE_MANIFEST, TestValues.GENERAL_APPSERVICEMANIFEST);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(AppServiceRecord.KEY_SERVICE_MANIFEST)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST, new AppServiceManifest(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java
index f39df464a..f9195f85d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AppServicesCapabilitiesTests.java
@@ -25,119 +25,119 @@ import java.util.List;
  */
 public class AppServicesCapabilitiesTests extends TestCase {
 
-	private AppServicesCapabilities msg;
+    private AppServicesCapabilities msg;
 
-	@Override
-	public void setUp(){
+    @Override
+    public void setUp() {
 
-		msg = new AppServicesCapabilities();
-		msg.setAppServices(TestValues.GENERAL_APPSERVICECAPABILITY_LIST);
-	}
+        msg = new AppServicesCapabilities();
+        msg.setAppServices(TestValues.GENERAL_APPSERVICECAPABILITY_LIST);
+    }
 
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		List<AppServiceCapability> serviceCapabilityList = msg.getAppServices();
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        List<AppServiceCapability> serviceCapabilityList = msg.getAppServices();
 
-		// Valid Tests
-		assertEquals(TestValues.MATCH, serviceCapabilityList, TestValues.GENERAL_APPSERVICECAPABILITY_LIST);
+        // Valid Tests
+        assertEquals(TestValues.MATCH, serviceCapabilityList, TestValues.GENERAL_APPSERVICECAPABILITY_LIST);
 
-		// Invalid/Null Tests
-		AppServicesCapabilities msg = new AppServicesCapabilities();
-		assertNotNull(TestValues.NOT_NULL, msg);
+        // Invalid/Null Tests
+        AppServicesCapabilities msg = new AppServicesCapabilities();
+        assertNotNull(TestValues.NOT_NULL, msg);
 
-		assertNull(TestValues.NULL, msg.getAppServices());
-	}
+        assertNull(TestValues.NULL, msg.getAppServices());
+    }
 
-	public void testJson(){
-		JSONObject reference = new JSONObject();
+    public void testJson() {
+        JSONObject reference = new JSONObject();
 
-		try{
-			reference.put(AppServicesCapabilities.KEY_APP_SERVICES, TestValues.GENERAL_APPSERVICETYPE_LIST);
+        try {
+            reference.put(AppServicesCapabilities.KEY_APP_SERVICES, TestValues.GENERAL_APPSERVICETYPE_LIST);
 
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()) {
-				String key = (String) iterator.next();
-				if (key.equals(AppServicesCapabilities.KEY_APP_SERVICES)) {
-					List<AppServiceCapability> list1 = TestValues.GENERAL_APPSERVICECAPABILITY_LIST;
-					List<AppServiceCapability> list2 = JsonUtils.readAppServiceCapabilityListFromJsonObject(underTest, key);
-					assertTrue(TestValues.TRUE, Validator.validateAppServiceCapabilityList(list1,list2));
-				}else{
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                if (key.equals(AppServicesCapabilities.KEY_APP_SERVICES)) {
+                    List<AppServiceCapability> list1 = TestValues.GENERAL_APPSERVICECAPABILITY_LIST;
+                    List<AppServiceCapability> list2 = JsonUtils.readAppServiceCapabilityListFromJsonObject(underTest, key);
+                    assertTrue(TestValues.TRUE, Validator.validateAppServiceCapabilityList(list1, list2));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 
-	public void testUpdate(){
-		String baseName = "NavTest", baseID = "37F98053AE";
-		AppServiceCapability capability1 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, null, true, null);
-		AppServicesCapabilities capabilities1 = new AppServicesCapabilities();
-		capabilities1.setAppServices(Collections.singletonList(capability1));
+    public void testUpdate() {
+        String baseName = "NavTest", baseID = "37F98053AE";
+        AppServiceCapability capability1 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, null, true, null);
+        AppServicesCapabilities capabilities1 = new AppServicesCapabilities();
+        capabilities1.setAppServices(Collections.singletonList(capability1));
 
-		assertNotNull(capabilities1.getAppServices());
-		assertEquals(capabilities1.getAppServices().size(), 1);
-		/* TEST TO ENSURE A THE RECORD HAS THE CORRECT "NULL" VALUE FOR SERVICE ID */
-		assertNull(capabilities1.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID());
+        assertNotNull(capabilities1.getAppServices());
+        assertEquals(capabilities1.getAppServices().size(), 1);
+        /* TEST TO ENSURE A THE RECORD HAS THE CORRECT "NULL" VALUE FOR SERVICE ID */
+        assertNull(capabilities1.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID());
 
-		/* TEST TO ENSURE THAT THE LIST DOES NOT GET UPDATED FOR NULL OR EMPTY LISTS */
-		assertFalse(capabilities1.updateAppServices(null));
-		assertFalse(capabilities1.updateAppServices(new ArrayList<AppServiceCapability>()));
+        /* TEST TO ENSURE THAT THE LIST DOES NOT GET UPDATED FOR NULL OR EMPTY LISTS */
+        assertFalse(capabilities1.updateAppServices(null));
+        assertFalse(capabilities1.updateAppServices(new ArrayList<AppServiceCapability>()));
 
 
-		AppServiceCapability capability2 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null);
+        AppServiceCapability capability2 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, baseName, baseID, true, null);
 
-		/* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */
-		assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability2)));
+        /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */
+        assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability2)));
 
-		/* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */
-		assertEquals(capabilities1.getAppServices().size(), 1);
+        /* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */
+        assertEquals(capabilities1.getAppServices().size(), 1);
 
-		assertTrue(capabilities1.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID().equals(baseID));
+        assertTrue(capabilities1.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID().equals(baseID));
 
-		AppServiceCapability capability3 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", null, true, null);
+        AppServiceCapability capability3 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", null, true, null);
 
-		/* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */
-		assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability3)));
+        /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */
+        assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability3)));
 
-		/* TEST TO ENSURE A NEW RECORD WAS ADDED */
-		assertEquals(capabilities1.getAppServices().size(), 2);
+        /* TEST TO ENSURE A NEW RECORD WAS ADDED */
+        assertEquals(capabilities1.getAppServices().size(), 2);
 
-		AppServiceCapability capability4 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "eeeeeeeee", true, null);
+        AppServiceCapability capability4 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "eeeeeeeee", true, null);
 
-		/* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */
-		assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability4)));
+        /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */
+        assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability4)));
 
-		/* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */
-		assertEquals(capabilities1.getAppServices().size(), 2);
+        /* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */
+        assertEquals(capabilities1.getAppServices().size(), 2);
 
-		AppServiceCapability capability5 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "fffffff", true, null);
+        AppServiceCapability capability5 = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "NewNav", "fffffff", true, null);
 
-		/* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */
-		assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability5)));
+        /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */
+        assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability5)));
 
-		/* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */
-		assertEquals(capabilities1.getAppServices().size(), 3);
+        /* TEST TO ENSURE A NEW RECORD WAS NOT ADDED */
+        assertEquals(capabilities1.getAppServices().size(), 3);
 
 
-		capability5.setUpdateReason(ServiceUpdateReason.REMOVED);
+        capability5.setUpdateReason(ServiceUpdateReason.REMOVED);
 
-		/* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */
-		assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability5)));
+        /* TEST TO ENSURE A THE LIST BEING STORED WAS MODIFIED */
+        assertTrue(capabilities1.updateAppServices(Collections.singletonList(capability5)));
 
-		/* TEST TO ENSURE THE RECORD WAS REMOVED */
-		assertEquals(capabilities1.getAppServices().size(), 2);
+        /* TEST TO ENSURE THE RECORD WAS REMOVED */
+        assertEquals(capabilities1.getAppServices().size(), 2);
 
-		/* TEST TO ENSURE THE RECORD REMOVED WAS THE CORRECT ONE */
-		assertFalse(capabilities1.getAppServices().contains(capability5));
+        /* TEST TO ENSURE THE RECORD REMOVED WAS THE CORRECT ONE */
+        assertFalse(capabilities1.getAppServices().contains(capability5));
 
 
-	}
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java
index 905c568c9..cf2b88604 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlCapabilitiesTests.java
@@ -21,89 +21,89 @@ import java.util.Iterator;
  */
 public class AudioControlCapabilitiesTests extends TestCase {
 
-	private AudioControlCapabilities msg;
-
-	@Override
-	public void setUp() {
-		msg = new AudioControlCapabilities();
-
-		msg.setModuleName(TestValues.GENERAL_STRING);
-		msg.setSourceAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setKeepContextAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setVolumeAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setEqualizerAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setVolumeAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setEqualizerMaxChannelId(TestValues.GENERAL_INT);
-		msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-
-		String moduleName = msg.getModuleName();
-		Boolean sourceAvailable = msg.getSourceAvailable();
-		Boolean keepContextAvailable = msg.getKeepContextAvailable();
-		Boolean volumeAvailable = msg.getVolumeAvailable();
-		Boolean equalizerAvailable = msg.getEqualizerAvailable();
-		int equalizerMaxChannelId = msg.getEqualizerMaxChannelId();
-		ModuleInfo info = msg.getModuleInfo();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) sourceAvailable);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) keepContextAvailable);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) volumeAvailable);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) equalizerAvailable);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, equalizerMaxChannelId);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info);
-
-		// Invalid/Null Tests
-		AudioControlCapabilities msg = new AudioControlCapabilities();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getModuleName());
-		assertNull(TestValues.NULL, msg.getSourceAvailable());
-		assertNull(TestValues.NULL, msg.getKeepContextAvailable());
-		assertNull(TestValues.NULL, msg.getVolumeAvailable());
-		assertNull(TestValues.NULL, msg.getEqualizerAvailable());
-		assertNull(TestValues.NULL, msg.getEqualizerMaxChannelId());
-		assertNull(TestValues.NULL, msg.getModuleInfo());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-
-			reference.put(AudioControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
-			reference.put(AudioControlCapabilities.KEY_SOURCE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(AudioControlCapabilities.KEY_KEEP_CONTEXT_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(AudioControlCapabilities.KEY_VOLUME_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(AudioControlCapabilities.KEY_EQUALIZER_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(AudioControlCapabilities.KEY_EQUALIZER_MAX_CHANNEL_ID, TestValues.GENERAL_INT);
-			reference.put(AudioControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				if (key.equals(AudioControlCapabilities.KEY_MODULE_INFO)) {
-					JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1);
-					Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2);
-					assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2)));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private AudioControlCapabilities msg;
+
+    @Override
+    public void setUp() {
+        msg = new AudioControlCapabilities();
+
+        msg.setModuleName(TestValues.GENERAL_STRING);
+        msg.setSourceAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setKeepContextAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setVolumeAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setEqualizerAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setVolumeAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setEqualizerMaxChannelId(TestValues.GENERAL_INT);
+        msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+
+        String moduleName = msg.getModuleName();
+        Boolean sourceAvailable = msg.getSourceAvailable();
+        Boolean keepContextAvailable = msg.getKeepContextAvailable();
+        Boolean volumeAvailable = msg.getVolumeAvailable();
+        Boolean equalizerAvailable = msg.getEqualizerAvailable();
+        int equalizerMaxChannelId = msg.getEqualizerMaxChannelId();
+        ModuleInfo info = msg.getModuleInfo();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) sourceAvailable);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) keepContextAvailable);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) volumeAvailable);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) equalizerAvailable);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, equalizerMaxChannelId);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info);
+
+        // Invalid/Null Tests
+        AudioControlCapabilities msg = new AudioControlCapabilities();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getModuleName());
+        assertNull(TestValues.NULL, msg.getSourceAvailable());
+        assertNull(TestValues.NULL, msg.getKeepContextAvailable());
+        assertNull(TestValues.NULL, msg.getVolumeAvailable());
+        assertNull(TestValues.NULL, msg.getEqualizerAvailable());
+        assertNull(TestValues.NULL, msg.getEqualizerMaxChannelId());
+        assertNull(TestValues.NULL, msg.getModuleInfo());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+
+            reference.put(AudioControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
+            reference.put(AudioControlCapabilities.KEY_SOURCE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(AudioControlCapabilities.KEY_KEEP_CONTEXT_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(AudioControlCapabilities.KEY_VOLUME_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(AudioControlCapabilities.KEY_EQUALIZER_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(AudioControlCapabilities.KEY_EQUALIZER_MAX_CHANNEL_ID, TestValues.GENERAL_INT);
+            reference.put(AudioControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                if (key.equals(AudioControlCapabilities.KEY_MODULE_INFO)) {
+                    JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1);
+                    Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2);
+                    assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java
index 8975c898d..8a09342db 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioControlDataTests.java
@@ -23,76 +23,76 @@ import java.util.List;
  */
 public class AudioControlDataTests extends TestCase {
 
-	private AudioControlData msg;
-
-	@Override
-	public void setUp() {
-		msg = new AudioControlData();
-
-		msg.setSource(TestValues.GENERAL_PRIMARYAUDIOSOURCE);
-		msg.setKeepContext(TestValues.GENERAL_BOOLEAN);
-		msg.setVolume(TestValues.GENERAL_INT);
-		msg.setEqualizerSettings(TestValues.GENERAL_EQUALIZERSETTINGS_LIST);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		PrimaryAudioSource source = msg.getSource();
-		Boolean keepContext = msg.getKeepContext();
-		int volume = msg.getVolume();
-		List<EqualizerSettings> equalizerSettings = msg.getEqualizerSettings();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_PRIMARYAUDIOSOURCE, source);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) keepContext);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, volume);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_EQUALIZERSETTINGS_LIST.size(), equalizerSettings.size());
-
-		assertTrue(TestValues.TRUE, Validator.validateEqualizerSettingsList(TestValues.GENERAL_EQUALIZERSETTINGS_LIST, equalizerSettings));
-
-		// Invalid/Null Tests
-		AudioControlData msg = new AudioControlData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getSource());
-		assertNull(TestValues.NULL, msg.getVolume());
-		assertNull(TestValues.NULL, msg.getKeepContext());
-		assertNull(TestValues.NULL, msg.getEqualizerSettings());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(AudioControlData.KEY_SOURCE, TestValues.GENERAL_PRIMARYAUDIOSOURCE);
-			reference.put(AudioControlData.KEY_KEEP_CONTEXT, TestValues.GENERAL_BOOLEAN);
-			reference.put(AudioControlData.KEY_VOLUME, TestValues.GENERAL_INT);
-			reference.put(AudioControlData.KEY_EQUALIZER_SETTINGS, TestValues.GENERAL_EQUALIZERSETTINGS_LIST);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				if (key.equals(AudioControlData.KEY_EQUALIZER_SETTINGS)) {
-					List<EqualizerSettings> esReference = (List<EqualizerSettings>) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONArray esArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					int i = 0;
-					for (EqualizerSettings es : esReference) {
-						assertTrue(Validator.validateEqualizerSettings(es, new EqualizerSettings(JsonRPCMarshaller.deserializeJSONObject(esArray.getJSONObject(i++)))));
-					}
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private AudioControlData msg;
+
+    @Override
+    public void setUp() {
+        msg = new AudioControlData();
+
+        msg.setSource(TestValues.GENERAL_PRIMARYAUDIOSOURCE);
+        msg.setKeepContext(TestValues.GENERAL_BOOLEAN);
+        msg.setVolume(TestValues.GENERAL_INT);
+        msg.setEqualizerSettings(TestValues.GENERAL_EQUALIZERSETTINGS_LIST);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        PrimaryAudioSource source = msg.getSource();
+        Boolean keepContext = msg.getKeepContext();
+        int volume = msg.getVolume();
+        List<EqualizerSettings> equalizerSettings = msg.getEqualizerSettings();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_PRIMARYAUDIOSOURCE, source);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) keepContext);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, volume);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_EQUALIZERSETTINGS_LIST.size(), equalizerSettings.size());
+
+        assertTrue(TestValues.TRUE, Validator.validateEqualizerSettingsList(TestValues.GENERAL_EQUALIZERSETTINGS_LIST, equalizerSettings));
+
+        // Invalid/Null Tests
+        AudioControlData msg = new AudioControlData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getSource());
+        assertNull(TestValues.NULL, msg.getVolume());
+        assertNull(TestValues.NULL, msg.getKeepContext());
+        assertNull(TestValues.NULL, msg.getEqualizerSettings());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(AudioControlData.KEY_SOURCE, TestValues.GENERAL_PRIMARYAUDIOSOURCE);
+            reference.put(AudioControlData.KEY_KEEP_CONTEXT, TestValues.GENERAL_BOOLEAN);
+            reference.put(AudioControlData.KEY_VOLUME, TestValues.GENERAL_INT);
+            reference.put(AudioControlData.KEY_EQUALIZER_SETTINGS, TestValues.GENERAL_EQUALIZERSETTINGS_LIST);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(AudioControlData.KEY_EQUALIZER_SETTINGS)) {
+                    List<EqualizerSettings> esReference = (List<EqualizerSettings>) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONArray esArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    int i = 0;
+                    for (EqualizerSettings es : esReference) {
+                        assertTrue(Validator.validateEqualizerSettings(es, new EqualizerSettings(JsonRPCMarshaller.deserializeJSONObject(esArray.getJSONObject(i++)))));
+                    }
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
index 6af615dd4..4940391cc 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
@@ -15,37 +15,37 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities}
  */
-public class AudioPassThruCapabilitiesTest extends TestCase{
+public class AudioPassThruCapabilitiesTest extends TestCase {
 
-    private AudioPassThruCapabilities  msg;
+    private AudioPassThruCapabilities msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new AudioPassThruCapabilities();
         assertNotNull(TestValues.NOT_NULL, msg);
-        
+
         msg.setAudioType(TestValues.GENERAL_AUDIOTYPE);
         msg.setBitsPerSample(TestValues.GENERAL_BITSPERSAMPLE);
         msg.setSamplingRate(TestValues.GENERAL_SAMPLINGRATE);
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () { 
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         SamplingRate samplingRate = msg.getSamplingRate();
         BitsPerSample bitsPerSample = msg.getBitsPerSample();
         AudioType audioType = msg.getAudioType();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_SAMPLINGRATE, samplingRate);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BITSPERSAMPLE, bitsPerSample);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIOTYPE, audioType);
-    
+
         // Invalid/Null Tests
         AudioPassThruCapabilities msg = new AudioPassThruCapabilities();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -54,11 +54,11 @@ public class AudioPassThruCapabilitiesTest extends TestCase{
         assertNull(TestValues.NULL, msg.getBitsPerSample());
         assertNull(TestValues.NULL, msg.getSamplingRate());
     }
-    
-    public void testJson(){
+
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(AudioPassThruCapabilities.KEY_AUDIO_TYPE, TestValues.GENERAL_AUDIOTYPE);
             reference.put(AudioPassThruCapabilities.KEY_BITS_PER_SAMPLE, TestValues.GENERAL_BITSPERSAMPLE);
             reference.put(AudioPassThruCapabilities.KEY_SAMPLING_RATE, TestValues.GENERAL_SAMPLINGRATE);
@@ -67,12 +67,12 @@ public class AudioPassThruCapabilitiesTest extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
index 2d1607be0..72bf52a7d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
@@ -13,18 +13,18 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.BeltStatus}
  */
-public class BeltStatusTests extends TestCase{
-	
-    private BeltStatus                          msg;
+public class BeltStatusTests extends TestCase {
+
+    private BeltStatus msg;
 
     @Override
-    protected void setUp() throws Exception{
+    protected void setUp() throws Exception {
         msg = new BeltStatus();
         assertNotNull(TestValues.NOT_NULL, msg);
-        
+
         msg.setLeftRearInflatableBelted(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
         msg.setPassengerChildDetected(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
         msg.setRightRearInflatableBelted(TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
@@ -43,46 +43,46 @@ public class BeltStatusTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () { 
-    	// Valid Tests
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Valid Tests
         VehicleDataEventStatus leftRearInflatable = msg.getLeftRearInflatableBelted();
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, leftRearInflatable);
-   
+
         VehicleDataEventStatus rightRearInflatable = msg.getRightRearInflatableBelted();
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, rightRearInflatable);
-    
+
         VehicleDataEventStatus passengerChild = msg.getPassengerChildDetected();
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, passengerChild);
-   
-    	VehicleDataEventStatus driverBuckled = msg.getDriverBuckleBelted();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
-    	driverBuckled = msg.getPassengerBuckleBelted();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
-    	driverBuckled = msg.getRightRow2BuckleBelted();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
-    	driverBuckled = msg.getMiddleRow1BuckleBelted();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
-    	driverBuckled = msg.getLeftRow2BuckleBelted();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
-    	driverBuckled = msg.getMiddleRow2BuckleBelted();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
-    	driverBuckled = msg.getMiddleRow3BuckleBelted();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
-    	driverBuckled = msg.getLeftRow3BuckleBelted();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
-    	driverBuckled = msg.getRightRow3BuckleBelted();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
-    
-    	VehicleDataEventStatus driverBeltDeployed = msg.getDriverBeltDeployed();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed);
-    	driverBeltDeployed = msg.getPassengerBeltDeployed();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed);
-    	driverBeltDeployed = msg.getMiddleRow1BeltDeployed();
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed);
-    
-    	// Invalid/Null Tests
+
+        VehicleDataEventStatus driverBuckled = msg.getDriverBuckleBelted();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
+        driverBuckled = msg.getPassengerBuckleBelted();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
+        driverBuckled = msg.getRightRow2BuckleBelted();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
+        driverBuckled = msg.getMiddleRow1BuckleBelted();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
+        driverBuckled = msg.getLeftRow2BuckleBelted();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
+        driverBuckled = msg.getMiddleRow2BuckleBelted();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
+        driverBuckled = msg.getMiddleRow3BuckleBelted();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
+        driverBuckled = msg.getLeftRow3BuckleBelted();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
+        driverBuckled = msg.getRightRow3BuckleBelted();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBuckled);
+
+        VehicleDataEventStatus driverBeltDeployed = msg.getDriverBeltDeployed();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed);
+        driverBeltDeployed = msg.getPassengerBeltDeployed();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed);
+        driverBeltDeployed = msg.getMiddleRow1BeltDeployed();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, driverBeltDeployed);
+
+        // Invalid/Null Tests
         BeltStatus msg = new BeltStatus();
         assertNotNull(TestValues.NOT_NULL, msg);
 
@@ -102,10 +102,10 @@ public class BeltStatusTests extends TestCase{
         assertNull(TestValues.NULL, msg.getMiddleRow1BeltDeployed());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
             reference.put(BeltStatus.KEY_LEFT_REAR_INFLATABLE_BELTED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
             reference.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
@@ -122,16 +122,16 @@ public class BeltStatusTests extends TestCase{
             reference.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
             reference.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
 
-            JSONObject underTest = msg.serializeJSON();            
+            JSONObject underTest = msg.serializeJSON();
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
index 0a090606a..1db5aa77a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
@@ -14,15 +14,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.BodyInformation}
  */
-public class BodyInformationTests extends TestCase{
-	
-    private BodyInformation                   msg;
+public class BodyInformationTests extends TestCase {
+
+    private BodyInformation msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new BodyInformation();
         msg.setParkBrakeActive(TestValues.GENERAL_BOOLEAN);
         msg.setIgnitionStatus(TestValues.GENERAL_IGNITIONSTATUS);
@@ -35,25 +35,25 @@ public class BodyInformationTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {       	
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         boolean parkBrake = msg.getParkBrakeActive();
         IgnitionStatus ignitionStatus = msg.getIgnitionStatus();
         IgnitionStableStatus ignitionStable = msg.getIgnitionStableStatus();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, parkBrake);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_IGNITIONSTATUS, ignitionStatus);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_IGNITIONSTABLESTATUS, ignitionStable);
-   
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getDriverDoorAjar());
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getPassengerDoorAjar());
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getRearLeftDoorAjar());
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getRearRightDoorAjar());
-    
-    	// Invalid/Null Tests
+
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getDriverDoorAjar());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getPassengerDoorAjar());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getRearLeftDoorAjar());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) msg.getRearRightDoorAjar());
+
+        // Invalid/Null Tests
         BodyInformation msg = new BodyInformation();
         assertNotNull(TestValues.NOT_NULL, msg);
 
@@ -66,10 +66,10 @@ public class BodyInformationTests extends TestCase{
         assertNull(TestValues.NULL, msg.getRearRightDoorAjar());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, TestValues.GENERAL_BOOLEAN);
             reference.put(BodyInformation.KEY_IGNITION_STATUS, TestValues.GENERAL_IGNITIONSTATUS);
             reference.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, TestValues.GENERAL_IGNITIONSTABLESTATUS);
@@ -78,16 +78,16 @@ public class BodyInformationTests extends TestCase{
             reference.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, TestValues.GENERAL_BOOLEAN);
             reference.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, TestValues.GENERAL_BOOLEAN);
 
-            JSONObject underTest = msg.serializeJSON();            
+            JSONObject underTest = msg.serializeJSON();
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
index ef9b8ec69..99c80fe39 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
@@ -17,15 +17,15 @@ import java.util.Hashtable;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ButtonCapabilities}
  */
-public class ButtonCapabilitiesTests extends TestCase{
+public class ButtonCapabilitiesTests extends TestCase {
 
     private ButtonCapabilities msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new ButtonCapabilities();
 
         msg.setLongPressAvailable(TestValues.GENERAL_BOOLEAN);
@@ -37,23 +37,23 @@ public class ButtonCapabilitiesTests extends TestCase{
 
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         boolean shortPress = msg.getShortPressAvailable();
         boolean longPress = msg.getLongPressAvailable();
         boolean upDown = msg.getUpDownAvailable();
         ButtonName buttonName = msg.getName();
         ModuleInfo info = msg.getModuleInfo();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, shortPress);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, longPress);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, upDown);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, buttonName);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info);
-        
+
         // Invalid/Null Tests
         ButtonCapabilities msg = new ButtonCapabilities();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -64,10 +64,10 @@ public class ButtonCapabilitiesTests extends TestCase{
         assertNull(TestValues.NULL, msg.getName());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(ButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
             reference.put(ButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
             reference.put(ButtonCapabilities.KEY_UP_DOWN_AVAILABLE, TestValues.GENERAL_BOOLEAN);
@@ -91,8 +91,8 @@ public class ButtonCapabilitiesTests extends TestCase{
                     assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
                 }
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
-    }    
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
index 6eecece4e..d4f24e186 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
@@ -17,15 +17,15 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.Choice}
  */
-public class ChoiceTests extends TestCase{
-	
+public class ChoiceTests extends TestCase {
+
     private Choice msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new Choice();
 
         msg.setChoiceID(TestValues.GENERAL_INT);
@@ -38,10 +38,10 @@ public class ChoiceTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         String text3 = msg.getTertiaryText();
         String text2 = msg.getSecondaryText();
         String menuName = msg.getMenuName();
@@ -49,7 +49,7 @@ public class ChoiceTests extends TestCase{
         List<String> vrCommands = msg.getVrCommands();
         Image image2 = msg.getSecondaryImage();
         Image image = msg.getImage();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text3);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text2);
@@ -58,7 +58,7 @@ public class ChoiceTests extends TestCase{
         assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, vrCommands));
         assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image2));
         assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image));
-        
+
         // Invalid/Null Tests
         Choice msg = new Choice();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -72,10 +72,10 @@ public class ChoiceTests extends TestCase{
         assertNull(TestValues.NULL, msg.getVrCommands());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(Choice.KEY_CHOICE_ID, TestValues.GENERAL_INT);
             reference.put(Choice.KEY_MENU_NAME, TestValues.GENERAL_STRING);
             reference.put(Choice.KEY_SECONDARY_TEXT, TestValues.GENERAL_STRING);
@@ -83,31 +83,31 @@ public class ChoiceTests extends TestCase{
             reference.put(Choice.KEY_IMAGE, TestValues.JSON_IMAGE);
             reference.put(Choice.KEY_SECONDARY_IMAGE, TestValues.JSON_IMAGE);
             reference.put(Choice.KEY_VR_COMMANDS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
-            
+
             JSONObject underTest = msg.serializeJSON();
 
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
-                if(key.equals(Choice.KEY_VR_COMMANDS)){
+                if (key.equals(Choice.KEY_VR_COMMANDS)) {
                     assertTrue(TestValues.TRUE,
                             Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key),
                                     JsonUtils.readStringListFromJsonObject(underTest, key)));
-                } else if(key.equals(Choice.KEY_IMAGE) || key.equals(Choice.KEY_SECONDARY_IMAGE)){
-                	JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-                	JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-                	Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-                	Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-                	
+                } else if (key.equals(Choice.KEY_IMAGE) || key.equals(Choice.KEY_SECONDARY_IMAGE)) {
+                    JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+
                     assertTrue(TestValues.TRUE, Validator.validateImage(new Image(hashReference), new Image(hashTest)));
-                } else{
+                } else {
                     assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
                 }
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java
index d0ce94de1..22cdc427e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java
@@ -24,12 +24,12 @@ import java.util.List;
  * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ClimateControlCapabilities}
  */
-public class ClimateControlCapabilitiesTests extends TestCase{
-	
+public class ClimateControlCapabilitiesTests extends TestCase {
+
     private ClimateControlCapabilities msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new ClimateControlCapabilities();
 
         msg.setModuleName(TestValues.GENERAL_STRING);
@@ -54,9 +54,9 @@ public class ClimateControlCapabilitiesTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
         // Test Values
         String moduleName = msg.getModuleName();
         boolean fanSpeedAvailable = msg.getFanSpeedAvailable();
@@ -95,10 +95,10 @@ public class ClimateControlCapabilitiesTests extends TestCase{
         assertEquals(TestValues.MATCH, TestValues.GENERAL_DEFROSTZONE_LIST.size(), defrostZone.size());
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VENTILATIONMODE_LIST.size(), ventilationMode.size());
 
-        for(int i = 0; i < TestValues.GENERAL_DEFROSTZONE_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_DEFROSTZONE_LIST.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_DEFROSTZONE_LIST.get(i), defrostZone.get(i));
         }
-        for(int i = 0; i < TestValues.GENERAL_VENTILATIONMODE_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_VENTILATIONMODE_LIST.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_VENTILATIONMODE_LIST.get(i), ventilationMode.get(i));
         }
 
@@ -132,10 +132,10 @@ public class ClimateControlCapabilitiesTests extends TestCase{
         assertNull(TestValues.NULL, msg.getClimateEnableAvailable());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(ClimateControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
             reference.put(ClimateControlCapabilities.KEY_FAN_SPEED_AVAILABLE, TestValues.GENERAL_BOOLEAN);
             reference.put(ClimateControlCapabilities.KEY_DESIRED_TEMPERATURE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
@@ -160,10 +160,10 @@ public class ClimateControlCapabilitiesTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
-                if(key.equals(ClimateControlCapabilities.KEY_DEFROST_ZONE)) {
+                if (key.equals(ClimateControlCapabilities.KEY_DEFROST_ZONE)) {
                     JSONArray defrostZoneArrayReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
                     JSONArray defrostZoneArrayTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
                     List<DefrostZone> defrostZoneListReference = new ArrayList<DefrostZone>();
@@ -171,12 +171,12 @@ public class ClimateControlCapabilitiesTests extends TestCase{
 
                     assertEquals(TestValues.MATCH, defrostZoneArrayReference.length(), defrostZoneArrayTest.length());
 
-                    for (int index = 0 ; index < defrostZoneArrayReference.length(); index++) {
-                        defrostZoneListReference.add( (DefrostZone)defrostZoneArrayReference.get(index) );
-                        defrostZoneListTest.add( (DefrostZone)defrostZoneArrayTest.get(index) );
+                    for (int index = 0; index < defrostZoneArrayReference.length(); index++) {
+                        defrostZoneListReference.add((DefrostZone) defrostZoneArrayReference.get(index));
+                        defrostZoneListTest.add((DefrostZone) defrostZoneArrayTest.get(index));
                     }
                     assertTrue(TestValues.TRUE, defrostZoneListReference.containsAll(defrostZoneListTest) && defrostZoneListTest.containsAll(defrostZoneListReference));
-                } else if(key.equals(ClimateControlCapabilities.KEY_VENTILATION_MODE)) {
+                } else if (key.equals(ClimateControlCapabilities.KEY_VENTILATION_MODE)) {
                     JSONArray ventilationModeArrayReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
                     JSONArray ventilationModeArrayTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
                     List<VentilationMode> ventilationModeListReference = new ArrayList<VentilationMode>();
@@ -184,9 +184,9 @@ public class ClimateControlCapabilitiesTests extends TestCase{
 
                     assertEquals(TestValues.MATCH, ventilationModeArrayReference.length(), ventilationModeArrayTest.length());
 
-                    for (int index = 0 ; index < ventilationModeArrayReference.length(); index++) {
-                        ventilationModeListReference.add( (VentilationMode)ventilationModeArrayReference.get(index) );
-                        ventilationModeListTest.add( (VentilationMode)ventilationModeArrayTest.get(index) );
+                    for (int index = 0; index < ventilationModeArrayReference.length(); index++) {
+                        ventilationModeListReference.add((VentilationMode) ventilationModeArrayReference.get(index));
+                        ventilationModeListTest.add((VentilationMode) ventilationModeArrayTest.get(index));
                     }
                     assertTrue(TestValues.TRUE, ventilationModeListReference.containsAll(ventilationModeListTest) && ventilationModeListTest.containsAll(ventilationModeListReference));
                 } else if (key.equals(ClimateControlCapabilities.KEY_MODULE_INFO)) {
@@ -195,12 +195,12 @@ public class ClimateControlCapabilitiesTests extends TestCase{
                     Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1);
                     Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2);
                     assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2)));
-                } else{
+                } else {
                     assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
                 }
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java
index 53af43a48..81c654c43 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlDataTests.java
@@ -21,12 +21,12 @@ import java.util.Iterator;
  * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ClimateControlData}
  */
-public class ClimateControlDataTests extends TestCase{
-	
+public class ClimateControlDataTests extends TestCase {
+
     private ClimateControlData msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new ClimateControlData();
 
         msg.setFanSpeed(TestValues.GENERAL_INT);
@@ -47,9 +47,9 @@ public class ClimateControlDataTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
         // Test Values
         int fanSpeed = msg.getFanSpeed();
         Temperature currentTemperature = msg.getCurrentTemperature();
@@ -105,10 +105,10 @@ public class ClimateControlDataTests extends TestCase{
         assertNull(TestValues.NULL, msg.getClimateEnable());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(ClimateControlData.KEY_FAN_SPEED, TestValues.GENERAL_INT);
             reference.put(ClimateControlData.KEY_CURRENT_TEMPERATURE, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_TEMPERATURE.getStore()));
             reference.put(ClimateControlData.KEY_DESIRED_TEMPERATURE, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_TEMPERATURE.getStore()));
@@ -129,27 +129,27 @@ public class ClimateControlDataTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
-                if(key.equals(ClimateControlData.KEY_CURRENT_TEMPERATURE)){
+                if (key.equals(ClimateControlData.KEY_CURRENT_TEMPERATURE)) {
                     JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
                     JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
                     Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
                     Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-                    assertTrue(TestValues.TRUE, Validator.validateTemperature( new Temperature(hashReference), new Temperature(hashTest)));
-                } else if(key.equals(ClimateControlData.KEY_DESIRED_TEMPERATURE)){
+                    assertTrue(TestValues.TRUE, Validator.validateTemperature(new Temperature(hashReference), new Temperature(hashTest)));
+                } else if (key.equals(ClimateControlData.KEY_DESIRED_TEMPERATURE)) {
                     JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
                     JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
                     Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
                     Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-                    assertTrue(TestValues.TRUE, Validator.validateTemperature( new Temperature(hashReference), new Temperature(hashTest)));
-                } else{
+                    assertTrue(TestValues.TRUE, Validator.validateTemperature(new Temperature(hashReference), new Temperature(hashTest)));
+                } else {
                     assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
                 }
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java
index 5b1ac322d..121f988f7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CloudAppPropertiesTests.java
@@ -18,87 +18,87 @@ import java.util.List;
  * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.CloudAppProperties}
  */
-public class CloudAppPropertiesTests extends TestCase{
-
-	private CloudAppProperties msg;
-
-	@Override
-	public void setUp(){
-		msg = new CloudAppProperties();
-
-		msg.setNicknames(TestValues.GENERAL_STRING_LIST);
-		msg.setAppID(TestValues.GENERAL_STRING);
-		msg.setEnabled(TestValues.GENERAL_BOOLEAN);
-		msg.setAuthToken(TestValues.GENERAL_STRING);
-		msg.setCloudTransportType(TestValues.GENERAL_STRING);
-		msg.setHybridAppPreference(TestValues.GENERAL_HYBRID_APP_PREFERENCE);
-		msg.setEndpoint(TestValues.GENERAL_STRING);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		List<String> nicknames = msg.getNicknames();
-		String appID = msg.getAppID();
-		boolean enabled = msg.isEnabled();
-		String authToken = msg.getAuthToken();
-		String cloudTransportType = msg.getCloudTransportType();
-		HybridAppPreference hybridAppPreference = msg.getHybridAppPreference();
-		String endpoint = msg.getEndpoint();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, nicknames);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appID);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, enabled);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, authToken);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, cloudTransportType);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_HYBRID_APP_PREFERENCE, hybridAppPreference);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, endpoint);
-
-		// Invalid/Null Tests
-		CloudAppProperties msg = new CloudAppProperties();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getNicknames());
-		assertNull(TestValues.NULL, msg.getAppID());
-		assertNull(TestValues.NULL, msg.isEnabled());
-		assertNull(TestValues.NULL, msg.getAuthToken());
-		assertNull(TestValues.NULL, msg.getCloudTransportType());
-		assertNull(TestValues.NULL, msg.getHybridAppPreference());
-		assertNull(TestValues.NULL, msg.getEndpoint());
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(CloudAppProperties.KEY_NICKNAMES, TestValues.GENERAL_STRING_LIST);
-			reference.put(CloudAppProperties.KEY_APP_ID, TestValues.GENERAL_STRING);
-			reference.put(CloudAppProperties.KEY_ENABLED, TestValues.GENERAL_BOOLEAN);
-			reference.put(CloudAppProperties.KEY_AUTH_TOKEN, TestValues.GENERAL_STRING);
-			reference.put(CloudAppProperties.KEY_CLOUD_TRANSPORT_TYPE, TestValues.GENERAL_STRING);
-			reference.put(CloudAppProperties.KEY_HYBRID_APP_PREFERENCE, TestValues.GENERAL_HYBRID_APP_PREFERENCE);
-			reference.put(CloudAppProperties.KEY_ENDPOINT, TestValues.GENERAL_STRING);
-
-			JSONObject underTest = msg.serializeJSON();
-
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-
-				if (key.equals(CloudAppProperties.KEY_NICKNAMES)){
-					Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key),
-							JsonUtils.readStringListFromJsonObject(underTest, key));
-				}else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+public class CloudAppPropertiesTests extends TestCase {
+
+    private CloudAppProperties msg;
+
+    @Override
+    public void setUp() {
+        msg = new CloudAppProperties();
+
+        msg.setNicknames(TestValues.GENERAL_STRING_LIST);
+        msg.setAppID(TestValues.GENERAL_STRING);
+        msg.setEnabled(TestValues.GENERAL_BOOLEAN);
+        msg.setAuthToken(TestValues.GENERAL_STRING);
+        msg.setCloudTransportType(TestValues.GENERAL_STRING);
+        msg.setHybridAppPreference(TestValues.GENERAL_HYBRID_APP_PREFERENCE);
+        msg.setEndpoint(TestValues.GENERAL_STRING);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        List<String> nicknames = msg.getNicknames();
+        String appID = msg.getAppID();
+        boolean enabled = msg.isEnabled();
+        String authToken = msg.getAuthToken();
+        String cloudTransportType = msg.getCloudTransportType();
+        HybridAppPreference hybridAppPreference = msg.getHybridAppPreference();
+        String endpoint = msg.getEndpoint();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, nicknames);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appID);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, enabled);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, authToken);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, cloudTransportType);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_HYBRID_APP_PREFERENCE, hybridAppPreference);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, endpoint);
+
+        // Invalid/Null Tests
+        CloudAppProperties msg = new CloudAppProperties();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getNicknames());
+        assertNull(TestValues.NULL, msg.getAppID());
+        assertNull(TestValues.NULL, msg.isEnabled());
+        assertNull(TestValues.NULL, msg.getAuthToken());
+        assertNull(TestValues.NULL, msg.getCloudTransportType());
+        assertNull(TestValues.NULL, msg.getHybridAppPreference());
+        assertNull(TestValues.NULL, msg.getEndpoint());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(CloudAppProperties.KEY_NICKNAMES, TestValues.GENERAL_STRING_LIST);
+            reference.put(CloudAppProperties.KEY_APP_ID, TestValues.GENERAL_STRING);
+            reference.put(CloudAppProperties.KEY_ENABLED, TestValues.GENERAL_BOOLEAN);
+            reference.put(CloudAppProperties.KEY_AUTH_TOKEN, TestValues.GENERAL_STRING);
+            reference.put(CloudAppProperties.KEY_CLOUD_TRANSPORT_TYPE, TestValues.GENERAL_STRING);
+            reference.put(CloudAppProperties.KEY_HYBRID_APP_PREFERENCE, TestValues.GENERAL_HYBRID_APP_PREFERENCE);
+            reference.put(CloudAppProperties.KEY_ENDPOINT, TestValues.GENERAL_STRING);
+
+            JSONObject underTest = msg.serializeJSON();
+
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(CloudAppProperties.KEY_NICKNAMES)) {
+                    Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key),
+                            JsonUtils.readStringListFromJsonObject(underTest, key));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
index 22a316e9a..7eb76cc2c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
@@ -15,15 +15,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ClusterModeStatus}
  */
-public class ClusterModeStatusTests extends TestCase{
+public class ClusterModeStatusTests extends TestCase {
 
-    private ClusterModeStatus                         msg;
+    private ClusterModeStatus msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new ClusterModeStatus();
 
         msg.setPowerModeActive(TestValues.GENERAL_BOOLEAN);
@@ -33,21 +33,21 @@ public class ClusterModeStatusTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         boolean powerMode = msg.getPowerModeActive();
         PowerModeQualificationStatus qualification = msg.getPowerModeQualificationStatus();
         PowerModeStatus status = msg.getPowerModeStatus();
         CarModeStatus carStatus = msg.getCarModeStatus();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, powerMode);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_POWERMODEQUALIFICATIONSTATUS, qualification);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_POWERMODESTATUS, status);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_CARMODESTATUS, carStatus);
-        
+
         // Invalid/Null Tests
         ClusterModeStatus msg = new ClusterModeStatus();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -57,11 +57,11 @@ public class ClusterModeStatusTests extends TestCase{
         assertNull(TestValues.NULL, msg.getPowerModeQualificationStatus());
         assertNull(TestValues.NULL, msg.getCarModeStatus());
     }
-    
-    public void testJson(){
+
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, TestValues.GENERAL_BOOLEAN);
             reference.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, TestValues.GENERAL_POWERMODESTATUS);
             reference.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, TestValues.GENERAL_POWERMODEQUALIFICATIONSTATUS);
@@ -71,12 +71,12 @@ public class ClusterModeStatusTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java
index 40931dc1e..8c32ea7c1 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/CoordinateTests.java
@@ -20,7 +20,7 @@ public class CoordinateTests extends TestCase {
     private Coordinate msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new Coordinate();
 
         msg.setLatitudeDegrees(TestValues.GENERAL_FLOAT);
@@ -30,7 +30,7 @@ public class CoordinateTests extends TestCase {
     /**
      * Tests the expected values of the RPC message.
      */
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
         float floatLat = msg.getLatitudeDegrees();
         float floatLong = msg.getLongitudeDegrees();
@@ -46,10 +46,10 @@ public class CoordinateTests extends TestCase {
         assertNull(TestValues.NULL, msg.getLongitudeDegrees());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(Coordinate.KEY_LATITUDE_DEGREES, (Float) TestValues.GENERAL_FLOAT);
             reference.put(Coordinate.KEY_LONGITUDE_DEGREES, (Float) TestValues.GENERAL_FLOAT);
 
@@ -58,7 +58,7 @@ public class CoordinateTests extends TestCase {
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
                 Object a = JsonUtils.readObjectFromJsonObject(reference, key);
@@ -66,7 +66,7 @@ public class CoordinateTests extends TestCase {
 
                 assertEquals(TestValues.MATCH, a, b);
             }
-        } catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
index 3fa76b93a..441d71562 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
@@ -13,7 +13,7 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DIDResult}
  */
 public class DIDResultTests extends TestCase {
@@ -21,7 +21,7 @@ public class DIDResultTests extends TestCase {
     private DIDResult msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new DIDResult();
 
         msg.setData(TestValues.GENERAL_STRING);
@@ -29,17 +29,17 @@ public class DIDResultTests extends TestCase {
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         String data = msg.getData();
         VehicleDataResultCode resultCode = msg.getResultCode();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, data);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATARESULTCODE, resultCode);
-        
+
         // Invalid/Null Tests
         DIDResult msg = new DIDResult();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -48,10 +48,10 @@ public class DIDResultTests extends TestCase {
         assertNull(TestValues.NULL, msg.getResultCode());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(DIDResult.KEY_DATA, TestValues.GENERAL_STRING);
             reference.put(DIDResult.KEY_RESULT_CODE, TestValues.GENERAL_VEHICLEDATARESULTCODE);
 
@@ -59,12 +59,12 @@ public class DIDResultTests extends TestCase {
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
index a31a897ae..ba5ce05a0 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
@@ -12,15 +12,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DTC}
  */
-public class DTCTests extends TestCase{
+public class DTCTests extends TestCase {
 
     private DTC msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new DTC();
 
         msg.setIdentifier(TestValues.GENERAL_STRING);
@@ -28,17 +28,17 @@ public class DTCTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         String identifier = msg.getIdentifier();
         String statusByte = msg.getStatusByte();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, identifier);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, statusByte);
-        
+
         // Invalid/Null Tests
         DTC msg = new DTC();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -47,10 +47,10 @@ public class DTCTests extends TestCase{
         assertNull(TestValues.NULL, msg.getStatusByte());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(DTC.KEY_IDENTIFIER, TestValues.GENERAL_STRING);
             reference.put(DTC.KEY_STATUS_BYTE, TestValues.GENERAL_STRING);
 
@@ -58,12 +58,12 @@ public class DTCTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java
index b0bd3a2dd..7ef000abd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DateTimeTests.java
@@ -20,7 +20,7 @@ public class DateTimeTests extends TestCase {
     private DateTime msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new DateTime();
 
         msg.setYear(TestValues.GENERAL_INT);
@@ -37,7 +37,7 @@ public class DateTimeTests extends TestCase {
     /**
      * Tests the expected values of the RPC message.
      */
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
         Integer year = msg.getYear();
         Integer month = msg.getMonth();
@@ -75,10 +75,10 @@ public class DateTimeTests extends TestCase {
         assertNull(TestValues.NULL, msg.getTzMinute());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(DateTime.KEY_YEAR, (Integer) TestValues.GENERAL_INT);
             reference.put(DateTime.KEY_MONTH, (Integer) TestValues.GENERAL_INT);
             reference.put(DateTime.KEY_DAY, (Integer) TestValues.GENERAL_INT);
@@ -94,7 +94,7 @@ public class DateTimeTests extends TestCase {
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
                 Object a = JsonUtils.readObjectFromJsonObject(reference, key);
@@ -102,7 +102,7 @@ public class DateTimeTests extends TestCase {
 
                 assertEquals(TestValues.MATCH, a, b);
             }
-        } catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
index c08b5e525..2274d512f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
@@ -12,15 +12,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DeviceInfo}
  */
-public class DeviceInfoTests extends TestCase{
+public class DeviceInfoTests extends TestCase {
 
-    private DeviceInfo          msg;
+    private DeviceInfo msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new DeviceInfo();
 
         msg.setCarrier(TestValues.GENERAL_STRING);
@@ -32,17 +32,17 @@ public class DeviceInfoTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         String carrier = msg.getCarrier();
         String hardware = msg.getHardware();
         String firmwareRev = msg.getFirmwareRev();
         String os = msg.getOs();
         String osVer = msg.getOsVersion();
         int maxNum = msg.getMaxNumberRFCOMMPorts();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, maxNum);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, osVer);
@@ -50,7 +50,7 @@ public class DeviceInfoTests extends TestCase{
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, firmwareRev);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, hardware);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, carrier);
-        
+
         // Invalid/Null Tests
         DeviceInfo msg = new DeviceInfo();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -63,10 +63,10 @@ public class DeviceInfoTests extends TestCase{
         assertNull(TestValues.NULL, msg.getMaxNumberRFCOMMPorts());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(DeviceInfo.KEY_CARRIER, TestValues.GENERAL_STRING);
             reference.put(DeviceInfo.KEY_HARDWARE, TestValues.GENERAL_STRING);
             reference.put(DeviceInfo.KEY_FIRMWARE_REV, TestValues.GENERAL_STRING);
@@ -78,12 +78,12 @@ public class DeviceInfoTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
index 610ded046..65dfea4e3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
@@ -14,7 +14,7 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DeviceStatus}
  */
 public class DeviceStatusTests extends TestCase {
@@ -22,7 +22,7 @@ public class DeviceStatusTests extends TestCase {
     private DeviceStatus msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new DeviceStatus();
 
         msg.setBattLevelStatus(TestValues.GENERAL_DEVICELEVELSTATUS);
@@ -39,10 +39,10 @@ public class DeviceStatusTests extends TestCase {
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         DeviceLevelStatus battLevel = msg.getBattLevelStatus();
         boolean btIcon = msg.getBtIconOn();
         boolean callActive = msg.getCallActive();
@@ -54,7 +54,7 @@ public class DeviceStatusTests extends TestCase {
         boolean stereoAudio = msg.getStereoAudioOutputMuted();
         boolean textAvailable = msg.getTextMsgAvailable();
         boolean voiceRec = msg.getVoiceRecOn();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_DEVICELEVELSTATUS, battLevel);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, btIcon);
@@ -67,7 +67,7 @@ public class DeviceStatusTests extends TestCase {
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, stereoAudio);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, textAvailable);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, voiceRec);
-        
+
         // Invalid/Null Tests
         DeviceStatus msg = new DeviceStatus();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -85,10 +85,10 @@ public class DeviceStatusTests extends TestCase {
         assertNull(TestValues.NULL, msg.getVoiceRecOn());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(DeviceStatus.KEY_BATT_LEVEL_STATUS, TestValues.GENERAL_DEVICELEVELSTATUS);
             reference.put(DeviceStatus.KEY_SIGNAL_LEVEL_STATUS, TestValues.GENERAL_DEVICELEVELSTATUS);
             reference.put(DeviceStatus.KEY_PRIMARY_AUDIO_SOURCE, TestValues.GENERAL_PRIMARYAUDIOSOURCE);
@@ -105,12 +105,12 @@ public class DeviceStatusTests extends TestCase {
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
index a533df277..186f75992 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
@@ -22,16 +22,16 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DisplayCapabilities}
  */
-public class DisplayCapabilitiesTests extends TestCase{
-	
+public class DisplayCapabilitiesTests extends TestCase {
+
     private DisplayCapabilities msg;
 
     @Override
-    public void setUp(){    	
-    	msg = new DisplayCapabilities();
+    public void setUp() {
+        msg = new DisplayCapabilities();
 
         msg.setGraphicSupported(TestValues.GENERAL_BOOLEAN);
         msg.setNumCustomPresetsAvailable(TestValues.GENERAL_INT);
@@ -45,10 +45,10 @@ public class DisplayCapabilitiesTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         boolean graphicSupported = msg.getGraphicSupported();
         int numPresets = msg.getNumCustomPresetsAvailable();
         DisplayType displayType = msg.getDisplayType();
@@ -66,27 +66,27 @@ public class DisplayCapabilitiesTests extends TestCase{
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, displayName);
         assertTrue(TestValues.TRUE, Validator.validateScreenParams(TestValues.GENERAL_SCREENPARAMS, screenParams));
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), templatesAvailable.size());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MEDIACLOCKFORMAT_LIST.size(), mediaClock.size());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTFIELD_LIST.size(), textFields.size());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_IMAGEFIELD_LIST.size(), imageFields.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MEDIACLOCKFORMAT_LIST.size(), mediaClock.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTFIELD_LIST.size(), textFields.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_IMAGEFIELD_LIST.size(), imageFields.size());
 
-		for(int i = 0; i < TestValues.GENERAL_STRING_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_STRING_LIST.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.get(i), templatesAvailable.get(i));
         }
-        
-        for(int i = 0; i < TestValues.GENERAL_MEDIACLOCKFORMAT_LIST.size(); i++){
+
+        for (int i = 0; i < TestValues.GENERAL_MEDIACLOCKFORMAT_LIST.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_MEDIACLOCKFORMAT_LIST.get(i), mediaClock.get(i));
         }
 
-        for(int i = 0; i < TestValues.GENERAL_TEXTFIELD_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_TEXTFIELD_LIST.size(); i++) {
             assertTrue(TestValues.TRUE, Validator.validateTextFields(TestValues.GENERAL_TEXTFIELD_LIST.get(i), textFields.get(i)));
         }
 
-        for(int i = 0; i < TestValues.GENERAL_IMAGEFIELD_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_IMAGEFIELD_LIST.size(); i++) {
             assertTrue(TestValues.TRUE, Validator.validateImageFields(TestValues.GENERAL_IMAGEFIELD_LIST.get(i), imageFields.get(i)));
         }
 
-        
+
         // Invalid/Null Tests
         DisplayCapabilities msg = new DisplayCapabilities();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -101,11 +101,11 @@ public class DisplayCapabilitiesTests extends TestCase{
         assertNull(TestValues.NULL, msg.getTemplatesAvailable());
         assertNull(TestValues.NULL, msg.getTextFields());
     }
-    
-    public void testJson(){
+
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(DisplayCapabilities.KEY_NUM_CUSTOM_PRESETS_AVAILABLE, TestValues.GENERAL_INT);
             reference.put(DisplayCapabilities.KEY_GRAPHIC_SUPPORTED, TestValues.GENERAL_BOOLEAN);
             reference.put(DisplayCapabilities.KEY_DISPLAY_TYPE, TestValues.GENERAL_DISPLAYTYPE);
@@ -118,56 +118,56 @@ public class DisplayCapabilitiesTests extends TestCase{
 
             JSONObject underTest = msg.serializeJSON();
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-            
+
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
-                if(key.equals(DisplayCapabilities.KEY_IMAGE_FIELDS)){
+                if (key.equals(DisplayCapabilities.KEY_IMAGE_FIELDS)) {
                     JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
                     JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
                     assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
 
-                    for(int i = 0; i < referenceArray.length(); i++){
-                    	Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
-                    	Hashtable<String, Object> hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
-                    	assertTrue(TestValues.TRUE, Validator.validateImageFields(new ImageField(hashReference), new ImageField(hashTest)));
+                    for (int i = 0; i < referenceArray.length(); i++) {
+                        Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
+                        Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
+                        assertTrue(TestValues.TRUE, Validator.validateImageFields(new ImageField(hashReference), new ImageField(hashTest)));
                     }
-                } else if(key.equals(DisplayCapabilities.KEY_TEXT_FIELDS)){
-                	JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                } else if (key.equals(DisplayCapabilities.KEY_TEXT_FIELDS)) {
+                    JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
                     JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
                     assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
-                    
-                    for(int i = 0; i < referenceArray.length(); i++){
-                    	Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
-                    	Hashtable<String, Object> hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
-                    	assertTrue(TestValues.TRUE, Validator.validateTextFields(new TextField(hashReference), new TextField(hashTest)));
+
+                    for (int i = 0; i < referenceArray.length(); i++) {
+                        Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
+                        Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
+                        assertTrue(TestValues.TRUE, Validator.validateTextFields(new TextField(hashReference), new TextField(hashTest)));
                     }
-                } else if(key.equals(DisplayCapabilities.KEY_TEMPLATES_AVAILABLE)){
+                } else if (key.equals(DisplayCapabilities.KEY_TEMPLATES_AVAILABLE)) {
                     JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
                     JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
                     assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
                     assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key)));
-                } else if(key.equals(DisplayCapabilities.KEY_SCREEN_PARAMS)){
+                } else if (key.equals(DisplayCapabilities.KEY_SCREEN_PARAMS)) {
                     JSONObject referenceArray = JsonUtils.readJsonObjectFromJsonObject(reference, key);
                     JSONObject underTestArray = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-                	Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray);
-                	Hashtable<String, Object> hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray);
-                    
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray);
+
                     assertTrue(TestValues.TRUE, Validator.validateScreenParams(new ScreenParams(hashReference), new ScreenParams(hashTest)));
-                } else if(key.equals(DisplayCapabilities.KEY_MEDIA_CLOCK_FORMATS)){
+                } else if (key.equals(DisplayCapabilities.KEY_MEDIA_CLOCK_FORMATS)) {
                     JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
                     JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
                     assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
 
-                    for(int i = 0; i < referenceArray.length(); i++){
+                    for (int i = 0; i < referenceArray.length(); i++) {
                         assertTrue(TestValues.TRUE, Validator.validateText(referenceArray.getString(i), underTestArray.getString(i)));// not a string?
                     }
-                } else{
+                } else {
                     assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
                 }
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java
index 767c264fa..274dadc3b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DriverDistractionCapabilityTest.java
@@ -57,7 +57,7 @@ public class DriverDistractionCapabilityTest extends TestCase {
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DynamicUpdateCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DynamicUpdateCapabilitiesTests.java
index 01e318e8a..60d7b7a15 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DynamicUpdateCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DynamicUpdateCapabilitiesTests.java
@@ -76,15 +76,15 @@ public class DynamicUpdateCapabilitiesTests extends TestCase {
                     assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
 
                     for (int i = 0; i < referenceArray.length(); i++) {
-                        imageFieldNameListReference.add( (ImageFieldName) referenceArray.get(i));
-                        imageFieldNameListTest.add( (ImageFieldName) underTestArray.get(i));
+                        imageFieldNameListReference.add((ImageFieldName) referenceArray.get(i));
+                        imageFieldNameListTest.add((ImageFieldName) underTestArray.get(i));
                     }
                     assertTrue(TestValues.TRUE, imageFieldNameListReference.containsAll(imageFieldNameListTest) && imageFieldNameListTest.containsAll(imageFieldNameListReference));
                 } else if (key.equals(DynamicUpdateCapabilities.KEY_SUPPORTS_DYNAMIC_SUB_MENUS)) {
                     boolean referenceBool = JsonUtils.readBooleanFromJsonObject(reference, key);
                     boolean underTestBool = JsonUtils.readBooleanFromJsonObject(underTest, key);
                     assertEquals(TestValues.MATCH, referenceBool, underTestBool);
-                }  else {
+                } else {
                     assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
                 }
             }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
index eaf777f23..621223110 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
@@ -14,15 +14,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ECallInfo}
  */
-public class ECallInfoTests extends TestCase{
+public class ECallInfoTests extends TestCase {
 
     private ECallInfo msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new ECallInfo();
 
         msg.setAuxECallNotificationStatus(TestValues.GENERAL_VEHICLEDATANOTIFICATIONSTATUS);
@@ -31,19 +31,19 @@ public class ECallInfoTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         VehicleDataNotificationStatus auxEcall = msg.getAuxECallNotificationStatus();
         VehicleDataNotificationStatus ecallNotify = msg.getECallNotificationStatus();
         ECallConfirmationStatus ecallConfirm = msg.getECallConfirmationStatus();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATANOTIFICATIONSTATUS, auxEcall);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATANOTIFICATIONSTATUS, ecallNotify);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_ECALLCONFIRMATIONSTATUS, ecallConfirm);
-        
+
         // Invalid/Null Tests
         ECallInfo msg = new ECallInfo();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -53,10 +53,10 @@ public class ECallInfoTests extends TestCase{
         assertNull(TestValues.NULL, msg.getAuxECallNotificationStatus());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(ECallInfo.KEY_AUX_E_CALL_NOTIFICATION_STATUS, TestValues.GENERAL_VEHICLEDATANOTIFICATIONSTATUS);
             reference.put(ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS, TestValues.GENERAL_VEHICLEDATANOTIFICATIONSTATUS);
             reference.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, TestValues.GENERAL_ECALLCONFIRMATIONSTATUS);
@@ -65,12 +65,12 @@ public class ECallInfoTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
index 6bfd4b094..4a97fe9ef 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
@@ -15,15 +15,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.EmergencyEvent}
  */
-public class EmergencyEventTests extends TestCase{
+public class EmergencyEventTests extends TestCase {
 
     private EmergencyEvent msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new EmergencyEvent();
 
         msg.setEmergencyEventType(TestValues.GENERAL_EMERGENCYEVENTTYPE);
@@ -34,23 +34,23 @@ public class EmergencyEventTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         EmergencyEventType type = msg.getEmergencyEventType();
         FuelCutoffStatus cutoffStatus = msg.getFuelCutoffStatus();
         VehicleDataEventStatus multipleEvents = msg.getMultipleEvents();
         int changeVelocity = msg.getMaximumChangeVelocity();
         VehicleDataEventStatus rollover = msg.getRolloverEvent();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_EMERGENCYEVENTTYPE, type);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_FUELCUTOFFSTATUS, cutoffStatus);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, changeVelocity);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, multipleEvents);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS, rollover);
-        
+
         // Invalid/Null Tests
         EmergencyEvent msg = new EmergencyEvent();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -62,10 +62,10 @@ public class EmergencyEventTests extends TestCase{
         assertNull(TestValues.NULL, msg.getRolloverEvent());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, TestValues.GENERAL_FUELCUTOFFSTATUS);
             reference.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
             reference.put(EmergencyEvent.KEY_ROLLOVER_EVENT, TestValues.GENERAL_VEHCILEDATAEVENTSTATUS);
@@ -76,12 +76,12 @@ public class EmergencyEventTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java
index 7df963cd8..b9ab22812 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EqualizerSettingsTests.java
@@ -17,62 +17,62 @@ import java.util.Iterator;
  */
 public class EqualizerSettingsTests extends TestCase {
 
-	private EqualizerSettings msg;
+    private EqualizerSettings msg;
 
-	@Override
-	public void setUp() {
-		msg = new EqualizerSettings();
+    @Override
+    public void setUp() {
+        msg = new EqualizerSettings();
 
-		msg.setChannelId(TestValues.GENERAL_INT);
-		msg.setChannelName(TestValues.GENERAL_STRING);
-		msg.setChannelSetting(TestValues.GENERAL_INT);
-	}
+        msg.setChannelId(TestValues.GENERAL_INT);
+        msg.setChannelName(TestValues.GENERAL_STRING);
+        msg.setChannelSetting(TestValues.GENERAL_INT);
+    }
 
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
 
-		int channelId = msg.getChannelId();
-		String channelName = msg.getChannelName();
-		int channelSetting = msg.getChannelSetting();
+        int channelId = msg.getChannelId();
+        String channelName = msg.getChannelName();
+        int channelSetting = msg.getChannelSetting();
 
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, channelId);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, channelName);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, channelSetting);
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, channelId);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, channelName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, channelSetting);
 
-		// Invalid/Null Tests
-		EqualizerSettings msg = new EqualizerSettings();
-		assertNotNull(TestValues.NOT_NULL, msg);
+        // Invalid/Null Tests
+        EqualizerSettings msg = new EqualizerSettings();
+        assertNotNull(TestValues.NOT_NULL, msg);
 
-		assertNull(TestValues.NULL, msg.getChannelId());
-		assertNull(TestValues.NULL, msg.getChannelName());
-		assertNull(TestValues.NULL, msg.getChannelSetting());
-	}
+        assertNull(TestValues.NULL, msg.getChannelId());
+        assertNull(TestValues.NULL, msg.getChannelName());
+        assertNull(TestValues.NULL, msg.getChannelSetting());
+    }
 
-	public void testJson() {
-		JSONObject reference = new JSONObject();
+    public void testJson() {
+        JSONObject reference = new JSONObject();
 
-		try {
+        try {
 
-			reference.put(EqualizerSettings.KEY_CHANNEL_ID, TestValues.GENERAL_INT);
-			reference.put(EqualizerSettings.KEY_CHANNEL_NAME, TestValues.GENERAL_STRING);
-			reference.put(EqualizerSettings.KEY_CHANNEL_SETTING, TestValues.GENERAL_INT);
+            reference.put(EqualizerSettings.KEY_CHANNEL_ID, TestValues.GENERAL_INT);
+            reference.put(EqualizerSettings.KEY_CHANNEL_NAME, TestValues.GENERAL_STRING);
+            reference.put(EqualizerSettings.KEY_CHANNEL_SETTING, TestValues.GENERAL_INT);
 
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
 
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
 
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java
index 547aae247..586050a72 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/FuelRangeTests.java
@@ -15,15 +15,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.FuelRange}
  */
-public class FuelRangeTests extends TestCase{
+public class FuelRangeTests extends TestCase {
 
     private FuelRange msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new FuelRange();
 
         msg.setType(TestValues.GENERAL_FUELTYPE);
@@ -35,10 +35,10 @@ public class FuelRangeTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         FuelType fuelType = msg.getType();
         float range = msg.getRange();
         float level = msg.getLevel();
@@ -53,7 +53,7 @@ public class FuelRangeTests extends TestCase{
         assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, levelState);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_CAPACITYUNIT, capacityUnit);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, capacity);
-        
+
         // Invalid/Null Tests
         FuelRange msg = new FuelRange();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -66,10 +66,10 @@ public class FuelRangeTests extends TestCase{
         assertNull(TestValues.NULL, msg.getCapacity());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(FuelRange.KEY_TYPE, TestValues.GENERAL_FUELTYPE);
             reference.put(FuelRange.KEY_RANGE, (Float) TestValues.GENERAL_FLOAT);
             reference.put(FuelRange.KEY_LEVEL, TestValues.GENERAL_FLOAT);
@@ -81,13 +81,13 @@ public class FuelRangeTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()) {
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
index dbbdd2ac8..ccd85154d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
@@ -14,15 +14,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.GPSData}
  */
-public class GPSDataTests extends TestCase{
+public class GPSDataTests extends TestCase {
 
     private GPSData msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new GPSData();
 
         msg.setActual(TestValues.GENERAL_BOOLEAN);
@@ -47,10 +47,10 @@ public class GPSDataTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         boolean actual = msg.getActual();
         double latitude = msg.getLatitudeDegrees();
         double longitude = msg.getLongitudeDegrees();
@@ -70,7 +70,7 @@ public class GPSDataTests extends TestCase{
         Dimension dimension = msg.getDimension();
         CompassDirection direction = msg.getCompassDirection();
         boolean shifted = msg.getShifted();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, actual);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, latitude);
@@ -91,7 +91,7 @@ public class GPSDataTests extends TestCase{
         assertEquals(TestValues.MATCH, TestValues.GENERAL_DIMENSION, dimension);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPASSDIRECTION, direction);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, shifted);
-        
+
         // Invalid/Null Tests
         GPSData msg = new GPSData();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -117,10 +117,10 @@ public class GPSDataTests extends TestCase{
         assertNull(TestValues.NULL, msg.getShifted());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(GPSData.KEY_ACTUAL, TestValues.GENERAL_BOOLEAN);
             reference.put(GPSData.KEY_LATITUDE_DEGREES, TestValues.GENERAL_DOUBLE);
             reference.put(GPSData.KEY_LONGITUDE_DEGREES, TestValues.GENERAL_DOUBLE);
@@ -145,12 +145,12 @@ public class GPSDataTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GridTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GridTests.java
index ab45ec434..44ed2c581 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GridTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GridTests.java
@@ -13,88 +13,88 @@ import java.util.Iterator;
 
 public class GridTests extends TestCase {
 
-	private Grid msg;
+    private Grid msg;
 
-	@Override
-	public void setUp() {
-		msg = new Grid();
-		msg.setCol(TestValues.GENERAL_INT);
-		msg.setRow(TestValues.GENERAL_INT);
-		msg.setLevel(TestValues.GENERAL_INT);
-		msg.setColSpan(TestValues.GENERAL_INT);
-		msg.setRowSpan(TestValues.GENERAL_INT);
-		msg.setLevelSpan(TestValues.GENERAL_INT);
-	}
+    @Override
+    public void setUp() {
+        msg = new Grid();
+        msg.setCol(TestValues.GENERAL_INT);
+        msg.setRow(TestValues.GENERAL_INT);
+        msg.setLevel(TestValues.GENERAL_INT);
+        msg.setColSpan(TestValues.GENERAL_INT);
+        msg.setRowSpan(TestValues.GENERAL_INT);
+        msg.setLevelSpan(TestValues.GENERAL_INT);
+    }
 
-	public void testRpcValues() {
-		int col = msg.getCol();
-		int row = msg.getRow();
-		int level = msg.getLevel();
-		int colSpan = msg.getColSpan();
-		int rowSpan = msg.getRowSpan();
-		int levelSpan = msg.getLevelSpan();
+    public void testRpcValues() {
+        int col = msg.getCol();
+        int row = msg.getRow();
+        int level = msg.getLevel();
+        int colSpan = msg.getColSpan();
+        int rowSpan = msg.getRowSpan();
+        int levelSpan = msg.getLevelSpan();
 
-		//valid tests
-		assertEquals(TestValues.MATCH, col, TestValues.GENERAL_INT);
-		assertEquals(TestValues.MATCH, row, TestValues.GENERAL_INT);
-		assertEquals(TestValues.MATCH, level, TestValues.GENERAL_INT);
-		assertEquals(TestValues.MATCH, colSpan, TestValues.GENERAL_INT);
-		assertEquals(TestValues.MATCH, rowSpan, TestValues.GENERAL_INT);
-		assertEquals(TestValues.MATCH, levelSpan, TestValues.GENERAL_INT);
+        //valid tests
+        assertEquals(TestValues.MATCH, col, TestValues.GENERAL_INT);
+        assertEquals(TestValues.MATCH, row, TestValues.GENERAL_INT);
+        assertEquals(TestValues.MATCH, level, TestValues.GENERAL_INT);
+        assertEquals(TestValues.MATCH, colSpan, TestValues.GENERAL_INT);
+        assertEquals(TestValues.MATCH, rowSpan, TestValues.GENERAL_INT);
+        assertEquals(TestValues.MATCH, levelSpan, TestValues.GENERAL_INT);
 
-		//null tests
-		Grid msg = new Grid();
-		assertNull(TestValues.NULL, msg.getCol());
-		assertNull(TestValues.NULL, msg.getRow());
-		assertNull(TestValues.NULL, msg.getLevel());
-		assertNull(TestValues.NULL, msg.getColSpan());
-		assertNull(TestValues.NULL, msg.getRowSpan());
-		assertNull(TestValues.NULL, msg.getLevelSpan());
+        //null tests
+        Grid msg = new Grid();
+        assertNull(TestValues.NULL, msg.getCol());
+        assertNull(TestValues.NULL, msg.getRow());
+        assertNull(TestValues.NULL, msg.getLevel());
+        assertNull(TestValues.NULL, msg.getColSpan());
+        assertNull(TestValues.NULL, msg.getRowSpan());
+        assertNull(TestValues.NULL, msg.getLevelSpan());
 
-		//test required constructor
-		Grid msg2 = new Grid(TestValues.GENERAL_INT, TestValues.GENERAL_INT);
-		int row2 = msg2.getRow();
-		int col2 = msg2.getCol();
-		assertEquals(TestValues.MATCH, col2, TestValues.GENERAL_INT);
-		assertEquals(TestValues.MATCH, row2, TestValues.GENERAL_INT);
-	}
+        //test required constructor
+        Grid msg2 = new Grid(TestValues.GENERAL_INT, TestValues.GENERAL_INT);
+        int row2 = msg2.getRow();
+        int col2 = msg2.getCol();
+        assertEquals(TestValues.MATCH, col2, TestValues.GENERAL_INT);
+        assertEquals(TestValues.MATCH, row2, TestValues.GENERAL_INT);
+    }
 
-	public void testJson() {
-		JSONObject original = new JSONObject();
-		try {
-			original.put(Grid.KEY_COL, TestValues.GENERAL_INT);
-			original.put(Grid.KEY_ROW, TestValues.GENERAL_INT);
-			original.put(Grid.KEY_LEVEL, TestValues.GENERAL_INT);
-			original.put(Grid.KEY_COL_SPAN, TestValues.GENERAL_INT);
-			original.put(Grid.KEY_ROW_SPAN, TestValues.GENERAL_INT);
-			original.put(Grid.KEY_LEVEL_SPAN, TestValues.GENERAL_INT);
+    public void testJson() {
+        JSONObject original = new JSONObject();
+        try {
+            original.put(Grid.KEY_COL, TestValues.GENERAL_INT);
+            original.put(Grid.KEY_ROW, TestValues.GENERAL_INT);
+            original.put(Grid.KEY_LEVEL, TestValues.GENERAL_INT);
+            original.put(Grid.KEY_COL_SPAN, TestValues.GENERAL_INT);
+            original.put(Grid.KEY_ROW_SPAN, TestValues.GENERAL_INT);
+            original.put(Grid.KEY_LEVEL_SPAN, TestValues.GENERAL_INT);
 
-			JSONObject serialized = msg.serializeJSON();
-			assertEquals(serialized.length(), original.length());
+            JSONObject serialized = msg.serializeJSON();
+            assertEquals(serialized.length(), original.length());
 
-			Iterator<String> iter = original.keys();
-			String key = "";
-			Grid grid1, grid2;
-			while (iter.hasNext()) {
-				key = iter.next();
-				grid1 = new Grid(JsonRPCMarshaller.deserializeJSONObject(original));
-				grid2 = new Grid(JsonRPCMarshaller.deserializeJSONObject(serialized));
-				if (key.equals(Grid.KEY_COL)) {
-					assertEquals(TestValues.MATCH, grid1.getCol(), grid2.getCol());
-				} else if (key.equals(Grid.KEY_ROW)) {
-					assertEquals(TestValues.MATCH, grid1.getRow(), grid2.getRow());
-				} else if (key.equals(Grid.KEY_LEVEL)) {
-					assertEquals(TestValues.MATCH, grid1.getLevel(), grid2.getLevel());
-				} else if (key.equals(Grid.KEY_COL_SPAN)) {
-					assertEquals(TestValues.MATCH, grid1.getColSpan(), grid2.getColSpan());
-				} else if (key.equals(Grid.KEY_ROW_SPAN)) {
-					assertEquals(TestValues.MATCH, grid1.getRowSpan(), grid2.getRowSpan());
-				} else if (key.equals(Grid.KEY_LEVEL_SPAN)) {
-					assertEquals(TestValues.MATCH, grid1.getLevelSpan(), grid2.getLevelSpan());
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            Iterator<String> iter = original.keys();
+            String key = "";
+            Grid grid1, grid2;
+            while (iter.hasNext()) {
+                key = iter.next();
+                grid1 = new Grid(JsonRPCMarshaller.deserializeJSONObject(original));
+                grid2 = new Grid(JsonRPCMarshaller.deserializeJSONObject(serialized));
+                if (key.equals(Grid.KEY_COL)) {
+                    assertEquals(TestValues.MATCH, grid1.getCol(), grid2.getCol());
+                } else if (key.equals(Grid.KEY_ROW)) {
+                    assertEquals(TestValues.MATCH, grid1.getRow(), grid2.getRow());
+                } else if (key.equals(Grid.KEY_LEVEL)) {
+                    assertEquals(TestValues.MATCH, grid1.getLevel(), grid2.getLevel());
+                } else if (key.equals(Grid.KEY_COL_SPAN)) {
+                    assertEquals(TestValues.MATCH, grid1.getColSpan(), grid2.getColSpan());
+                } else if (key.equals(Grid.KEY_ROW_SPAN)) {
+                    assertEquals(TestValues.MATCH, grid1.getRowSpan(), grid2.getRowSpan());
+                } else if (key.equals(Grid.KEY_LEVEL_SPAN)) {
+                    assertEquals(TestValues.MATCH, grid1.getLevelSpan(), grid2.getLevelSpan());
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java
index 40c873285..4ab264787 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMICapabilitiesTests.java
@@ -18,7 +18,7 @@ public class HMICapabilitiesTests extends TestCase {
     private HMICapabilities msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new HMICapabilities();
 
         msg.setNavigationAvilable(TestValues.GENERAL_BOOLEAN);
@@ -30,7 +30,7 @@ public class HMICapabilitiesTests extends TestCase {
     /**
      * Tests the expected values of the RPC message.
      */
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
         Boolean navAvail = msg.isNavigationAvailable();
         Boolean phoneAvail = msg.isPhoneCallAvailable();
@@ -40,8 +40,8 @@ public class HMICapabilitiesTests extends TestCase {
         // Valid Tests
         assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, navAvail);
         assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, phoneAvail);
-	    assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, vidStreamAvail);
-	    assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, driverDistractionAvail);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, vidStreamAvail);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, driverDistractionAvail);
 
         // Invalid/Null Tests
         HMICapabilities msg = new HMICapabilities();
@@ -54,10 +54,10 @@ public class HMICapabilitiesTests extends TestCase {
 
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(KEY_NAVIGATION, TestValues.GENERAL_BOOLEAN);
             reference.put(HMICapabilities.KEY_PHONE_CALL, TestValues.GENERAL_BOOLEAN);
             reference.put(HMICapabilities.KEY_VIDEO_STREAMING, TestValues.GENERAL_BOOLEAN);
@@ -73,11 +73,11 @@ public class HMICapabilitiesTests extends TestCase {
                     JsonUtils.readStringListFromJsonObject(underTest, KEY_PHONE_CALL));
 
             assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(reference, KEY_VIDEO_STREAMING),
-			        JsonUtils.readStringListFromJsonObject(underTest, KEY_VIDEO_STREAMING));
+                    JsonUtils.readStringListFromJsonObject(underTest, KEY_VIDEO_STREAMING));
             assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(reference, KEY_DRIVER_DISTRACTION),
                     JsonUtils.readStringFromJsonObject(underTest, KEY_DRIVER_DISTRACTION));
 
-        } catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
index 98bf2f549..6c3279a6a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
@@ -14,15 +14,15 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.HMIPermissions}
  */
-public class HMIPermissionsTests extends TestCase{
+public class HMIPermissionsTests extends TestCase {
 
     private HMIPermissions msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new HMIPermissions();
 
         msg.setAllowed(TestValues.GENERAL_HMILEVEL_LIST);
@@ -30,24 +30,24 @@ public class HMIPermissionsTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         List<HMILevel> allowed = msg.getAllowed();
         List<HMILevel> disallowed = msg.getUserDisallowed();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.size(), allowed.size());
         assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.size(), disallowed.size());
-        
-        for(int i = 0; i < TestValues.GENERAL_HMILEVEL_LIST.size(); i++){
+
+        for (int i = 0; i < TestValues.GENERAL_HMILEVEL_LIST.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.get(i), allowed.get(i));
         }
-        for(int i = 0; i < TestValues.GENERAL_HMILEVEL_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_HMILEVEL_LIST.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.get(i), disallowed.get(i));
         }
-        
+
         // Invalid/Null Tests
         HMIPermissions msg = new HMIPermissions();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -56,10 +56,10 @@ public class HMIPermissionsTests extends TestCase{
         assertNull(TestValues.NULL, msg.getUserDisallowed());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(HMIPermissions.KEY_ALLOWED, TestValues.JSON_HMILEVELS);
             reference.put(HMIPermissions.KEY_USER_DISALLOWED, TestValues.JSON_HMILEVELS);
 
@@ -67,18 +67,18 @@ public class HMIPermissionsTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 List<String> referenceList = JsonUtils.readStringListFromJsonObject(reference, key);
                 List<String> underTestList = JsonUtils.readStringListFromJsonObject(underTest, key);
 
                 assertEquals(TestValues.MATCH, referenceList.size(), underTestList.size());
-                for(int i = 0; i < referenceList.size(); i++){
+                for (int i = 0; i < referenceList.size(); i++) {
                     assertEquals(TestValues.MATCH, referenceList.get(i), underTestList.get(i));
                 }
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java
index f91cc9fdf..2d0851568 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlCapabilitiesTests.java
@@ -21,76 +21,76 @@ import java.util.Iterator;
  */
 public class HMISettingsControlCapabilitiesTests extends TestCase {
 
-	private HMISettingsControlCapabilities msg;
-
-	@Override
-	public void setUp() {
-		msg = new HMISettingsControlCapabilities();
-
-		msg.setModuleName(TestValues.GENERAL_STRING);
-		msg.setDistanceUnitAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setTemperatureUnitAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setDisplayModeUnitAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		String moduleName = msg.getModuleName();
-		Boolean distanceUnitAvailable = msg.getDistanceUnitAvailable();
-		Boolean temperatureUnitAvailable = msg.getTemperatureUnitAvailable();
-		Boolean displayModeUnitAvailable = msg.getDisplayModeUnitAvailable();
-		ModuleInfo info = msg.getModuleInfo();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) distanceUnitAvailable);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) temperatureUnitAvailable);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) displayModeUnitAvailable);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info);
-
-		// Invalid/Null Tests
-		HMISettingsControlCapabilities msg = new HMISettingsControlCapabilities();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getModuleName());
-		assertNull(TestValues.NULL, msg.getDistanceUnitAvailable());
-		assertNull(TestValues.NULL, msg.getTemperatureUnitAvailable());
-		assertNull(TestValues.NULL, msg.getDisplayModeUnitAvailable());
-		assertNull(TestValues.NULL, msg.getModuleInfo());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(HMISettingsControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
-			reference.put(HMISettingsControlCapabilities.KEY_DISTANCE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(HMISettingsControlCapabilities.KEY_TEMPERATURE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(HMISettingsControlCapabilities.KEY_DISPLAY_MODE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(HMISettingsControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				if (key.equals(HMISettingsControlCapabilities.KEY_MODULE_INFO)) {
-					JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1);
-					Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2);
-					assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2)));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private HMISettingsControlCapabilities msg;
+
+    @Override
+    public void setUp() {
+        msg = new HMISettingsControlCapabilities();
+
+        msg.setModuleName(TestValues.GENERAL_STRING);
+        msg.setDistanceUnitAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setTemperatureUnitAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setDisplayModeUnitAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        String moduleName = msg.getModuleName();
+        Boolean distanceUnitAvailable = msg.getDistanceUnitAvailable();
+        Boolean temperatureUnitAvailable = msg.getTemperatureUnitAvailable();
+        Boolean displayModeUnitAvailable = msg.getDisplayModeUnitAvailable();
+        ModuleInfo info = msg.getModuleInfo();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) distanceUnitAvailable);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) temperatureUnitAvailable);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) displayModeUnitAvailable);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info);
+
+        // Invalid/Null Tests
+        HMISettingsControlCapabilities msg = new HMISettingsControlCapabilities();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getModuleName());
+        assertNull(TestValues.NULL, msg.getDistanceUnitAvailable());
+        assertNull(TestValues.NULL, msg.getTemperatureUnitAvailable());
+        assertNull(TestValues.NULL, msg.getDisplayModeUnitAvailable());
+        assertNull(TestValues.NULL, msg.getModuleInfo());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(HMISettingsControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
+            reference.put(HMISettingsControlCapabilities.KEY_DISTANCE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(HMISettingsControlCapabilities.KEY_TEMPERATURE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(HMISettingsControlCapabilities.KEY_DISPLAY_MODE_UNIT_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(HMISettingsControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                if (key.equals(HMISettingsControlCapabilities.KEY_MODULE_INFO)) {
+                    JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1);
+                    Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2);
+                    assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java
index 3a193b14f..4182b2a1c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMISettingsControlDataTests.java
@@ -20,59 +20,59 @@ import java.util.Iterator;
  */
 public class HMISettingsControlDataTests extends TestCase {
 
-	private HMISettingsControlData msg;
-
-	@Override
-	public void setUp() {
-		msg = new HMISettingsControlData();
-
-		msg.setDisplayMode(TestValues.GENERAL_DISPLAYMODE);
-		msg.setTemperatureUnit(TestValues.GENERAL_TEMPERATUREUNIT);
-		msg.setDistanceUnit(TestValues.GENERAL_DISTANCEUNIT);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		DisplayMode displayMode = msg.getDisplayMode();
-		TemperatureUnit temperatureUnit = msg.getTemperatureUnit();
-		DistanceUnit distanceUnit = msg.getDistanceUnit();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_DISPLAYMODE, displayMode);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_TEMPERATUREUNIT, temperatureUnit);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_DISTANCEUNIT, distanceUnit);
-
-		// Invalid/Null Tests
-		HMISettingsControlData msg = new HMISettingsControlData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getDisplayMode());
-		assertNull(TestValues.NULL, msg.getTemperatureUnit());
-		assertNull(TestValues.NULL, msg.getDistanceUnit());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(HMISettingsControlData.KEY_DISPLAY_MODE, TestValues.GENERAL_DISPLAYMODE);
-			reference.put(HMISettingsControlData.KEY_TEMPERATURE_UNIT, TestValues.GENERAL_TEMPERATUREUNIT);
-			reference.put(HMISettingsControlData.KEY_DISTANCE_UNIT, TestValues.GENERAL_DISTANCEUNIT);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private HMISettingsControlData msg;
+
+    @Override
+    public void setUp() {
+        msg = new HMISettingsControlData();
+
+        msg.setDisplayMode(TestValues.GENERAL_DISPLAYMODE);
+        msg.setTemperatureUnit(TestValues.GENERAL_TEMPERATUREUNIT);
+        msg.setDistanceUnit(TestValues.GENERAL_DISTANCEUNIT);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        DisplayMode displayMode = msg.getDisplayMode();
+        TemperatureUnit temperatureUnit = msg.getTemperatureUnit();
+        DistanceUnit distanceUnit = msg.getDistanceUnit();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_DISPLAYMODE, displayMode);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_TEMPERATUREUNIT, temperatureUnit);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_DISTANCEUNIT, distanceUnit);
+
+        // Invalid/Null Tests
+        HMISettingsControlData msg = new HMISettingsControlData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getDisplayMode());
+        assertNull(TestValues.NULL, msg.getTemperatureUnit());
+        assertNull(TestValues.NULL, msg.getDistanceUnit());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(HMISettingsControlData.KEY_DISPLAY_MODE, TestValues.GENERAL_DISPLAYMODE);
+            reference.put(HMISettingsControlData.KEY_TEMPERATURE_UNIT, TestValues.GENERAL_TEMPERATUREUNIT);
+            reference.put(HMISettingsControlData.KEY_DISTANCE_UNIT, TestValues.GENERAL_DISTANCEUNIT);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java
index f235761bf..a5e348947 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HapticRectTests.java
@@ -18,56 +18,56 @@ import org.json.JSONObject;
 
 public class HapticRectTests extends TestCase {
 
-	private HapticRect msg;
-
-	@Override
-	public void setUp() {
-		msg = new HapticRect();
-
-		msg.setId(TestValues.GENERAL_INTEGER);
-		msg.setRect(TestValues.GENERAL_RECTANGLE);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		Integer id = msg.getId();
-		Rectangle rect = msg.getRect();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, id);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_RECTANGLE, rect);
-
-		// Invalid/Null Tests
-		HapticRect msg = new HapticRect();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getId());
-		assertNull(TestValues.NULL, msg.getRect());
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(HapticRect.KEY_ID, TestValues.GENERAL_INTEGER);
-			reference.put(HapticRect.KEY_RECT, TestValues.GENERAL_RECTANGLE);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(reference, HapticRect.KEY_ID),
-					JsonUtils.readIntegerFromJsonObject(underTest, HapticRect.KEY_ID));
-
-			assertTrue(Validator.validateRectangle(
-					(Rectangle) JsonUtils.readObjectFromJsonObject(reference, HapticRect.KEY_RECT),
-					new Rectangle(JsonRPCMarshaller.deserializeJSONObject( (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, HapticRect.KEY_RECT))))
-			);
-
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private HapticRect msg;
+
+    @Override
+    public void setUp() {
+        msg = new HapticRect();
+
+        msg.setId(TestValues.GENERAL_INTEGER);
+        msg.setRect(TestValues.GENERAL_RECTANGLE);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Integer id = msg.getId();
+        Rectangle rect = msg.getRect();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, id);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_RECTANGLE, rect);
+
+        // Invalid/Null Tests
+        HapticRect msg = new HapticRect();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getId());
+        assertNull(TestValues.NULL, msg.getRect());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(HapticRect.KEY_ID, TestValues.GENERAL_INTEGER);
+            reference.put(HapticRect.KEY_RECT, TestValues.GENERAL_RECTANGLE);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(reference, HapticRect.KEY_ID),
+                    JsonUtils.readIntegerFromJsonObject(underTest, HapticRect.KEY_ID));
+
+            assertTrue(Validator.validateRectangle(
+                    (Rectangle) JsonUtils.readObjectFromJsonObject(reference, HapticRect.KEY_RECT),
+                    new Rectangle(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(underTest, HapticRect.KEY_RECT))))
+            );
+
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
index c236d5355..e9860b5a4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
@@ -13,15 +13,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.HeadLampStatus}
  */
-public class HeadLampStatusTests extends TestCase{
-	
+public class HeadLampStatusTests extends TestCase {
+
     private HeadLampStatus msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new HeadLampStatus();
 
         msg.setAmbientLightStatus(TestValues.GENERAL_AMBIENTLIGHTSTATUS);
@@ -30,19 +30,19 @@ public class HeadLampStatusTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         boolean lowBeams = msg.getLowBeamsOn();
         boolean highBeams = msg.getHighBeamsOn();
         AmbientLightStatus ambientLights = msg.getAmbientLightStatus();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_AMBIENTLIGHTSTATUS, ambientLights);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, highBeams);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, lowBeams);
-                
+
         // Invalid/Null Tests
         HeadLampStatus msg = new HeadLampStatus();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -52,10 +52,10 @@ public class HeadLampStatusTests extends TestCase{
         assertNull(TestValues.NULL, msg.getAmbientLightStatus());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(HeadLampStatus.KEY_HIGH_BEAMS_ON, TestValues.GENERAL_BOOLEAN);
             reference.put(HeadLampStatus.KEY_LOW_BEAMS_ON, TestValues.GENERAL_BOOLEAN);
             reference.put(HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS, TestValues.GENERAL_AMBIENTLIGHTSTATUS);
@@ -64,12 +64,12 @@ public class HeadLampStatusTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
index 814c92467..435f4cc76 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
@@ -12,15 +12,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.Headers}
  */
-public class HeadersTests extends TestCase{
+public class HeadersTests extends TestCase {
 
     private Headers msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new Headers();
 
         msg.setCharset(TestValues.GENERAL_STRING);
@@ -36,10 +36,10 @@ public class HeadersTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         String charset = msg.getCharset();
         String contentType = msg.getContentType();
         String requestMode = msg.getRequestMethod();
@@ -50,7 +50,7 @@ public class HeadersTests extends TestCase{
         boolean doInput = msg.getDoInput();
         boolean useCache = msg.getUseCaches();
         boolean instanceFollow = msg.getInstanceFollowRedirects();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, charset);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, contentType);
@@ -62,7 +62,7 @@ public class HeadersTests extends TestCase{
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, doInput);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, useCache);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, instanceFollow);
-        
+
         // Invalid/Null Tests
         Headers msg = new Headers();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -79,10 +79,10 @@ public class HeadersTests extends TestCase{
         assertNull(TestValues.NULL, msg.getUseCaches());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(Headers.KEY_CHARSET, TestValues.GENERAL_STRING);
             reference.put(Headers.KEY_CONTENT_TYPE, TestValues.GENERAL_STRING);
             reference.put(Headers.KEY_REQUEST_METHOD, TestValues.GENERAL_STRING);
@@ -98,12 +98,12 @@ public class HeadersTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
index 0c4090870..630a7157c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
@@ -21,15 +21,15 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ImageField}
  */
-public class ImageFieldTests extends TestCase{
+public class ImageFieldTests extends TestCase {
 
     private ImageField msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new ImageField();
 
         msg.setImageResolution(TestValues.GENERAL_IMAGERESOLUTION);
@@ -38,19 +38,19 @@ public class ImageFieldTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         ImageResolution imageRes = msg.getImageResolution();
         List<FileType> imageTypes = msg.getImageTypeSupported();
         ImageFieldName name = msg.getName();
-        
+
         // Valid Tests
         assertTrue(TestValues.TRUE, Validator.validateImageResolution(TestValues.GENERAL_IMAGERESOLUTION, imageRes));
         assertEquals(TestValues.MATCH, TestValues.GENERAL_IMAGEFIELDNAME, name);
         assertTrue(TestValues.TRUE, Validator.validateFileTypes(TestValues.GENERAL_FILETYPE_LIST, imageTypes));
-                
+
         // Invalid/Null Tests
         ImageField msg = new ImageField();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -60,46 +60,46 @@ public class ImageFieldTests extends TestCase{
         assertNull(TestValues.NULL, msg.getName());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(ImageField.KEY_IMAGE_RESOLUTION, TestValues.JSON_IMAGERESOLUTION);
             reference.put(ImageField.KEY_IMAGE_TYPE_SUPPORTED, JsonUtils.createJsonArray(TestValues.GENERAL_FILETYPE_LIST));
             reference.put(ImageField.KEY_NAME, TestValues.GENERAL_IMAGEFIELDNAME);
-            
+
             JSONObject underTest = msg.serializeJSON();
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
-                if(key.equals(ImageField.KEY_IMAGE_RESOLUTION)){
-                	JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-                	JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-                	Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-                	Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);                	
-                    assertTrue(TestValues.TRUE, Validator.validateImageResolution( new ImageResolution(hashReference), new ImageResolution(hashTest)));
-                } else if(key.equals(ImageField.KEY_IMAGE_TYPE_SUPPORTED)) {
-					JSONArray imageTypeArrayReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-					JSONArray imageTypeArrayTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					List<FileType> imageTypeListReference = new ArrayList<FileType>();
-					List<FileType> imageTypeListTest = new ArrayList<FileType>();					
-					
-					assertEquals(TestValues.MATCH, imageTypeArrayReference.length(), imageTypeArrayTest.length());
-					
-				    for (int index = 0 ; index < imageTypeArrayReference.length(); index++) {
-				    	imageTypeListReference.add( (FileType)imageTypeArrayReference.get(index) );
-				    	imageTypeListTest.add( (FileType)imageTypeArrayTest.get(index) );
-				    }				    
-					assertTrue(TestValues.TRUE, imageTypeListReference.containsAll(imageTypeListTest) && imageTypeListTest.containsAll(imageTypeListReference));
-				} else{
+                if (key.equals(ImageField.KEY_IMAGE_RESOLUTION)) {
+                    JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateImageResolution(new ImageResolution(hashReference), new ImageResolution(hashTest)));
+                } else if (key.equals(ImageField.KEY_IMAGE_TYPE_SUPPORTED)) {
+                    JSONArray imageTypeArrayReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                    JSONArray imageTypeArrayTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    List<FileType> imageTypeListReference = new ArrayList<FileType>();
+                    List<FileType> imageTypeListTest = new ArrayList<FileType>();
+
+                    assertEquals(TestValues.MATCH, imageTypeArrayReference.length(), imageTypeArrayTest.length());
+
+                    for (int index = 0; index < imageTypeArrayReference.length(); index++) {
+                        imageTypeListReference.add((FileType) imageTypeArrayReference.get(index));
+                        imageTypeListTest.add((FileType) imageTypeArrayTest.get(index));
+                    }
+                    assertTrue(TestValues.TRUE, imageTypeListReference.containsAll(imageTypeListTest) && imageTypeListTest.containsAll(imageTypeListReference));
+                } else {
                     assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
                 }
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
index bdabce23b..ba1352e23 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
@@ -13,15 +13,15 @@ import java.util.Iterator;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ImageResolution}
  */
-public class ImageResolutionTests extends TestCase{
+public class ImageResolutionTests extends TestCase {
 
     private ImageResolution msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new ImageResolution();
 
         msg.setResolutionHeight(TestValues.GENERAL_INT);
@@ -29,17 +29,17 @@ public class ImageResolutionTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         int height = msg.getResolutionHeight();
         int width = msg.getResolutionWidth();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, height);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, width);
-        
+
         // Invalid/Null Tests
         ImageResolution msg = new ImageResolution();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -48,10 +48,10 @@ public class ImageResolutionTests extends TestCase{
         assertNull(TestValues.NULL, msg.getResolutionWidth());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(ImageResolution.KEY_RESOLUTION_HEIGHT, TestValues.GENERAL_INT);
             reference.put(ImageResolution.KEY_RESOLUTION_WIDTH, TestValues.GENERAL_INT);
 
@@ -59,34 +59,34 @@ public class ImageResolutionTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 
     public void testSetResolutionWidth_Odd() {
         msg.setResolutionWidth(175);
-        assertEquals(176, (int)msg.getResolutionWidth());
+        assertEquals(176, (int) msg.getResolutionWidth());
     }
 
     public void testSetResolutionHeight_Odd() {
         msg.setResolutionHeight(175);
-        assertEquals(176, (int)msg.getResolutionHeight());
+        assertEquals(176, (int) msg.getResolutionHeight());
     }
 
     public void testSetResolutionWidth_Pair() {
         msg.setResolutionWidth(176);
-        assertEquals(176, (int)msg.getResolutionWidth());
+        assertEquals(176, (int) msg.getResolutionWidth());
 
     }
 
     public void testSetResolutionHeight_Pair() {
         msg.setResolutionHeight(176);
-        assertEquals(176, (int)msg.getResolutionHeight());
+        assertEquals(176, (int) msg.getResolutionHeight());
 
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
index 108686879..24405857c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
@@ -13,15 +13,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.Image}
  */
-public class ImageTests extends TestCase{
+public class ImageTests extends TestCase {
 
     private Image msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new Image();
 
         msg.setImageType(TestValues.GENERAL_IMAGETYPE);
@@ -30,19 +30,19 @@ public class ImageTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         ImageType imageType = msg.getImageType();
         String value = msg.getValue();
         Boolean isTemplate = msg.getIsTemplate();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_IMAGETYPE, imageType);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, value);
         assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, isTemplate);
-        
+
         // Invalid/Null Tests
         Image msg = new Image();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -53,10 +53,10 @@ public class ImageTests extends TestCase{
         assertNull(TestValues.NULL, msg.getIsTemplate());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(Image.KEY_IMAGE_TYPE, TestValues.GENERAL_IMAGETYPE);
             reference.put(Image.KEY_VALUE, TestValues.GENERAL_STRING);
             reference.put(Image.KEY_IS_TEMPLATE, TestValues.GENERAL_BOOLEAN);
@@ -65,12 +65,12 @@ public class ImageTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
index cfb0c1c7d..e06bd5e0b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
@@ -17,15 +17,15 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.KeyboardProperties}
  */
-public class KeyboardPropertiesTests extends TestCase{
+public class KeyboardPropertiesTests extends TestCase {
 
     private KeyboardProperties msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new KeyboardProperties();
 
         msg.setAutoCompleteText(TestValues.GENERAL_STRING);
@@ -37,17 +37,17 @@ public class KeyboardPropertiesTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         String autoCompleteText = msg.getAutoCompleteText();
         List<String> autoCompleteList = msg.getAutoCompleteList();
         KeyboardLayout keyboardLayout = msg.getKeyboardLayout();
         KeypressMode keypressMode = msg.getKeypressMode();
         Language language = msg.getLanguage();
         List<String> limitedChars = msg.getLimitedCharacterList();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, autoCompleteText);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), autoCompleteList.size());
@@ -57,11 +57,11 @@ public class KeyboardPropertiesTests extends TestCase{
         assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, language);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), limitedChars.size());
         assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, limitedChars));
-        
+
         // Invalid/Null Tests
         KeyboardProperties msg = new KeyboardProperties();
         assertNotNull(TestValues.NOT_NULL, msg);
-        
+
         // Keypress mode is created in the object constructor
         assertNotNull(TestValues.NOT_NULL, msg.getKeypressMode());
         assertNull(TestValues.NULL, msg.getAutoCompleteText());
@@ -71,10 +71,10 @@ public class KeyboardPropertiesTests extends TestCase{
         assertNull(TestValues.NULL, msg.getLimitedCharacterList());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(KeyboardProperties.KEY_AUTO_COMPLETE_TEXT, TestValues.GENERAL_STRING);
             reference.put(KeyboardProperties.KEY_AUTO_COMPLETE_LIST, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
             reference.put(KeyboardProperties.KEY_KEYBOARD_LAYOUT, TestValues.GENERAL_KEYBOARDLAYOUT);
@@ -86,16 +86,16 @@ public class KeyboardPropertiesTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
-                if(key.equals(KeyboardProperties.KEY_LIMITED_CHARACTER_LIST) || key.equals(KeyboardProperties.KEY_AUTO_COMPLETE_LIST)){
+                if (key.equals(KeyboardProperties.KEY_LIMITED_CHARACTER_LIST) || key.equals(KeyboardProperties.KEY_AUTO_COMPLETE_LIST)) {
                     assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key)));
-                } else{
+                } else {
                     assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
                 }
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java
index ba4df001f..c58f0d35b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightCapabilitiesTests.java
@@ -18,64 +18,64 @@ import java.util.Iterator;
  */
 public class LightCapabilitiesTests extends TestCase {
 
-	private LightCapabilities msg;
-
-	@Override
-	public void setUp() {
-		msg = new LightCapabilities();
-
-		msg.setName(TestValues.GENERAL_LIGHTNAME);
-		msg.setDensityAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setRGBColorSpaceAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setStatusAvailable(TestValues.GENERAL_BOOLEAN);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		LightName name = msg.getName();
-		Boolean densityAvailable = msg.getDensityAvailable();
-		Boolean rgbColorSpaceAvailable = msg.getRGBColorSpaceAvailable();
-		Boolean statusAvailable = msg.getStatusAvailable();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTNAME, name);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) densityAvailable);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) rgbColorSpaceAvailable);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) statusAvailable);
-
-		// Invalid/Null Tests
-		LightCapabilities msg = new LightCapabilities();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getName());
-		assertNull(TestValues.NULL, msg.getDensityAvailable());
-		assertNull(TestValues.NULL, msg.getRGBColorSpaceAvailable());
-		assertNull(TestValues.NULL, msg.getStatusAvailable());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(LightCapabilities.KEY_NAME, TestValues.GENERAL_LIGHTNAME);
-			reference.put(LightCapabilities.KEY_DENSITY_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(LightCapabilities.KEY_RGB_COLOR_SPACE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(LightCapabilities.KEY_STATUS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private LightCapabilities msg;
+
+    @Override
+    public void setUp() {
+        msg = new LightCapabilities();
+
+        msg.setName(TestValues.GENERAL_LIGHTNAME);
+        msg.setDensityAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setRGBColorSpaceAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setStatusAvailable(TestValues.GENERAL_BOOLEAN);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        LightName name = msg.getName();
+        Boolean densityAvailable = msg.getDensityAvailable();
+        Boolean rgbColorSpaceAvailable = msg.getRGBColorSpaceAvailable();
+        Boolean statusAvailable = msg.getStatusAvailable();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTNAME, name);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) densityAvailable);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) rgbColorSpaceAvailable);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, (boolean) statusAvailable);
+
+        // Invalid/Null Tests
+        LightCapabilities msg = new LightCapabilities();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getName());
+        assertNull(TestValues.NULL, msg.getDensityAvailable());
+        assertNull(TestValues.NULL, msg.getRGBColorSpaceAvailable());
+        assertNull(TestValues.NULL, msg.getStatusAvailable());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(LightCapabilities.KEY_NAME, TestValues.GENERAL_LIGHTNAME);
+            reference.put(LightCapabilities.KEY_DENSITY_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(LightCapabilities.KEY_RGB_COLOR_SPACE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(LightCapabilities.KEY_STATUS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java
index 8487bf17f..e92ce7c6f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlCapabilitiesTests.java
@@ -24,77 +24,76 @@ import java.util.List;
  */
 public class LightControlCapabilitiesTests extends TestCase {
 
-	private LightControlCapabilities msg;
-
-	@Override
-	public void setUp() {
-		msg = new LightControlCapabilities();
-
-		msg.setModuleName(TestValues.GENERAL_STRING);
-		msg.setSupportedLights(TestValues.GENERAL_LIGHTCAPABILITIES_LIST);
-		msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		String moduleName = msg.getModuleName();
-		List<LightCapabilities> supportedLights = msg.getSupportedLights();
-		ModuleInfo info = msg.getModuleInfo();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTCAPABILITIES_LIST.size(), supportedLights.size());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info);
-
-		assertTrue(TestValues.TRUE, Validator.validateLightCapabilitiesList(TestValues.GENERAL_LIGHTCAPABILITIES_LIST, supportedLights));
-
-		// Invalid/Null Tests
-		LightControlCapabilities msg = new LightControlCapabilities();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getModuleName());
-		assertNull(TestValues.NULL, msg.getSupportedLights());
-		assertNull(TestValues.NULL, msg.getModuleInfo());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(LightControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
-			reference.put(LightControlCapabilities.KEY_SUPPORTED_LIGHTS, TestValues.GENERAL_LIGHTCAPABILITIES_LIST);
-			reference.put(LightControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				if (key.equals(LightControlCapabilities.KEY_SUPPORTED_LIGHTS)) {
-					List<LightCapabilities> lcReference = (List<LightCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONArray lsArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					int i = 0;
-					for (LightCapabilities lc : lcReference) {
-						assertTrue(Validator.validateLightCapabilities(lc, new LightCapabilities(JsonRPCMarshaller.deserializeJSONObject(lsArray.getJSONObject(i++)))));
-					}
-				} else if(key.equals(LightControlCapabilities.KEY_MODULE_INFO)) {
-					JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1);
-					Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2);
-					assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2)));
-				}
-				else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private LightControlCapabilities msg;
+
+    @Override
+    public void setUp() {
+        msg = new LightControlCapabilities();
+
+        msg.setModuleName(TestValues.GENERAL_STRING);
+        msg.setSupportedLights(TestValues.GENERAL_LIGHTCAPABILITIES_LIST);
+        msg.setModuleInfo(TestValues.GENERAL_MODULE_INFO);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        String moduleName = msg.getModuleName();
+        List<LightCapabilities> supportedLights = msg.getSupportedLights();
+        ModuleInfo info = msg.getModuleInfo();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTCAPABILITIES_LIST.size(), supportedLights.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULE_INFO, info);
+
+        assertTrue(TestValues.TRUE, Validator.validateLightCapabilitiesList(TestValues.GENERAL_LIGHTCAPABILITIES_LIST, supportedLights));
+
+        // Invalid/Null Tests
+        LightControlCapabilities msg = new LightControlCapabilities();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getModuleName());
+        assertNull(TestValues.NULL, msg.getSupportedLights());
+        assertNull(TestValues.NULL, msg.getModuleInfo());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(LightControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
+            reference.put(LightControlCapabilities.KEY_SUPPORTED_LIGHTS, TestValues.GENERAL_LIGHTCAPABILITIES_LIST);
+            reference.put(LightControlCapabilities.KEY_MODULE_INFO, TestValues.JSON_MODULE_INFO);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(LightControlCapabilities.KEY_SUPPORTED_LIGHTS)) {
+                    List<LightCapabilities> lcReference = (List<LightCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONArray lsArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    int i = 0;
+                    for (LightCapabilities lc : lcReference) {
+                        assertTrue(Validator.validateLightCapabilities(lc, new LightCapabilities(JsonRPCMarshaller.deserializeJSONObject(lsArray.getJSONObject(i++)))));
+                    }
+                } else if (key.equals(LightControlCapabilities.KEY_MODULE_INFO)) {
+                    JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject o2 = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(o1);
+                    Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(o2);
+                    assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java
index 48989a3d9..5d4417f36 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightControlDataTests.java
@@ -22,58 +22,58 @@ import java.util.List;
  */
 public class LightControlDataTests extends TestCase {
 
-	private LightControlData msg;
-
-	@Override
-	public void setUp() {
-		msg = new LightControlData();
-
-		msg.setLightState(TestValues.GENERAL_LIGHTSTATE_LIST);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		List<LightState> lightState = msg.getLightState();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTSTATE_LIST.size(), lightState.size());
-
-		assertTrue(TestValues.TRUE, Validator.validateLightStateList(TestValues.GENERAL_LIGHTSTATE_LIST, lightState));
-
-		// Invalid/Null Tests
-		LightControlData msg = new LightControlData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getLightState());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(LightControlData.KEY_LIGHT_STATE, TestValues.GENERAL_LIGHTSTATE_LIST);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				if (key.equals(LightControlData.KEY_LIGHT_STATE)) {
-					List<LightState> lsReference = (List<LightState>) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONArray lsArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					int i = 0;
-					for (LightState ls : lsReference) {
-						assertTrue(Validator.validateLightState(ls, new LightState(JsonRPCMarshaller.deserializeJSONObject(lsArray.getJSONObject(i++)))));
-					}
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private LightControlData msg;
+
+    @Override
+    public void setUp() {
+        msg = new LightControlData();
+
+        msg.setLightState(TestValues.GENERAL_LIGHTSTATE_LIST);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        List<LightState> lightState = msg.getLightState();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTSTATE_LIST.size(), lightState.size());
+
+        assertTrue(TestValues.TRUE, Validator.validateLightStateList(TestValues.GENERAL_LIGHTSTATE_LIST, lightState));
+
+        // Invalid/Null Tests
+        LightControlData msg = new LightControlData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getLightState());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(LightControlData.KEY_LIGHT_STATE, TestValues.GENERAL_LIGHTSTATE_LIST);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(LightControlData.KEY_LIGHT_STATE)) {
+                    List<LightState> lsReference = (List<LightState>) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONArray lsArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    int i = 0;
+                    for (LightState ls : lsReference) {
+                        assertTrue(Validator.validateLightState(ls, new LightState(JsonRPCMarshaller.deserializeJSONObject(lsArray.getJSONObject(i++)))));
+                    }
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java
index 272880ff0..0fc59d32d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LightStateTests.java
@@ -23,72 +23,72 @@ import java.util.Iterator;
  */
 public class LightStateTests extends TestCase {
 
-	private LightState msg;
-
-	@Override
-	public void setUp() {
-		msg = new LightState();
-
-		msg.setId(TestValues.GENERAL_LIGHTNAME);
-		msg.setStatus(TestValues.GENERAL_LIGHTSTATUS);
-		msg.setDensity(TestValues.GENERAL_FLOAT);
-		msg.setColor(TestValues.GENERAL_RGBCOLOR);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		LightName id = msg.getId();
-		LightStatus status = msg.getStatus();
-		Float density = msg.getDensity();
-		RGBColor color = msg.getColor();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTNAME, id);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTSTATUS, status);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, (float) density);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_RGBCOLOR, color);
-
-		// Invalid/Null Tests
-		LightState msg = new LightState();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getId());
-		assertNull(TestValues.NULL, msg.getStatus());
-		assertNull(TestValues.NULL, msg.getDensity());
-		assertNull(TestValues.NULL, msg.getColor());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(LightState.KEY_ID, TestValues.GENERAL_LIGHTNAME);
-			reference.put(LightState.KEY_STATUS, TestValues.GENERAL_LIGHTSTATUS);
-			reference.put(LightState.KEY_DENSITY, TestValues.GENERAL_FLOAT);
-			reference.put(LightState.KEY_COLOR, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_RGBCOLOR.getStore()));
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				if (key.equals(LightState.KEY_COLOR)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateRGBColor(new RGBColor(hashReference), new RGBColor(hashTest)));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private LightState msg;
+
+    @Override
+    public void setUp() {
+        msg = new LightState();
+
+        msg.setId(TestValues.GENERAL_LIGHTNAME);
+        msg.setStatus(TestValues.GENERAL_LIGHTSTATUS);
+        msg.setDensity(TestValues.GENERAL_FLOAT);
+        msg.setColor(TestValues.GENERAL_RGBCOLOR);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        LightName id = msg.getId();
+        LightStatus status = msg.getStatus();
+        Float density = msg.getDensity();
+        RGBColor color = msg.getColor();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTNAME, id);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LIGHTSTATUS, status);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, (float) density);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_RGBCOLOR, color);
+
+        // Invalid/Null Tests
+        LightState msg = new LightState();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getId());
+        assertNull(TestValues.NULL, msg.getStatus());
+        assertNull(TestValues.NULL, msg.getDensity());
+        assertNull(TestValues.NULL, msg.getColor());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(LightState.KEY_ID, TestValues.GENERAL_LIGHTNAME);
+            reference.put(LightState.KEY_STATUS, TestValues.GENERAL_LIGHTSTATUS);
+            reference.put(LightState.KEY_DENSITY, TestValues.GENERAL_FLOAT);
+            reference.put(LightState.KEY_COLOR, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_RGBCOLOR.getStore()));
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(LightState.KEY_COLOR)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateRGBColor(new RGBColor(hashReference), new RGBColor(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java
index 3792f64b7..c1a2b78f7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/LocationDetailsTests.java
@@ -24,14 +24,14 @@ public class LocationDetailsTests extends TestCase {
     private LocationDetails msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = TestValues.GENERAL_LOCATIONDETAILS;
     }
 
     /**
      * Tests the expected values of the RPC message.
      */
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
         List<String> field1 = msg.getAddressLines();
         String field2 = msg.getLocationDescription();
@@ -64,10 +64,10 @@ public class LocationDetailsTests extends TestCase {
         assertNull(msg.getSearchAddress());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(LocationDetails.KEY_ADDRESS_LINES, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
             reference.put(LocationDetails.KEY_LOCATION_DESCRIPTION, TestValues.GENERAL_STRING);
             reference.put(LocationDetails.KEY_LOCATION_NAME, TestValues.GENERAL_STRING);
@@ -93,20 +93,20 @@ public class LocationDetailsTests extends TestCase {
 
             assertTrue(Validator.validateCoordinate(
                     (Coordinate) JsonUtils.readObjectFromJsonObject(reference, LocationDetails.KEY_COORDINATE),
-                    new Coordinate(JsonRPCMarshaller.deserializeJSONObject( (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, LocationDetails.KEY_COORDINATE))))
-                    );
+                    new Coordinate(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(underTest, LocationDetails.KEY_COORDINATE))))
+            );
 
             assertTrue(Validator.validateImage(
                     (Image) JsonUtils.readObjectFromJsonObject(reference, LocationDetails.KEY_LOCATION_IMAGE),
                     new Image(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(underTest, LocationDetails.KEY_LOCATION_IMAGE)))
-                    ));
+            ));
 
             assertTrue(Validator.validateOasisAddress(
                     (OasisAddress) JsonUtils.readObjectFromJsonObject(reference, LocationDetails.KEY_SEARCH_ADDRESS),
                     new OasisAddress(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(underTest, LocationDetails.KEY_SEARCH_ADDRESS)))
             ));
 
-        } catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java
index fb3e9a764..f4485698b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageCushionFirmnessTest.java
@@ -18,54 +18,54 @@ import java.util.Iterator;
  */
 public class MassageCushionFirmnessTest extends TestCase {
 
-	private MassageCushionFirmness msg;
-
-	@Override
-	public void setUp() {
-		msg = new MassageCushionFirmness();
-
-		msg.setCushion(TestValues.GENERAL_MASSAGECUSHION);
-		msg.setFirmness(TestValues.GENERAL_INT);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		MassageCushion cushion = msg.getCushion();
-		Integer firmness = msg.getFirmness();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGECUSHION, cushion);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, firmness);
-
-		// Invalid/Null Tests
-		MassageCushionFirmness msg = new MassageCushionFirmness();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getCushion());
-		assertNull(TestValues.NULL, msg.getFirmness());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(MassageCushionFirmness.KEY_CUSHION, TestValues.GENERAL_MASSAGECUSHION);
-			reference.put(MassageCushionFirmness.KEY_FIRMNESS, TestValues.GENERAL_INT);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private MassageCushionFirmness msg;
+
+    @Override
+    public void setUp() {
+        msg = new MassageCushionFirmness();
+
+        msg.setCushion(TestValues.GENERAL_MASSAGECUSHION);
+        msg.setFirmness(TestValues.GENERAL_INT);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        MassageCushion cushion = msg.getCushion();
+        Integer firmness = msg.getFirmness();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGECUSHION, cushion);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, firmness);
+
+        // Invalid/Null Tests
+        MassageCushionFirmness msg = new MassageCushionFirmness();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getCushion());
+        assertNull(TestValues.NULL, msg.getFirmness());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(MassageCushionFirmness.KEY_CUSHION, TestValues.GENERAL_MASSAGECUSHION);
+            reference.put(MassageCushionFirmness.KEY_FIRMNESS, TestValues.GENERAL_INT);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java
index 7f89422a0..5cd86343b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MassageModeDataTest.java
@@ -19,56 +19,56 @@ import java.util.Iterator;
  */
 public class MassageModeDataTest extends TestCase {
 
-	private MassageModeData msg;
+    private MassageModeData msg;
 
-	@Override
-	public void setUp() {
-		msg = new MassageModeData();
+    @Override
+    public void setUp() {
+        msg = new MassageModeData();
 
-		msg.setMassageZone(TestValues.GENERAL_MASSAGEZONE);
-		msg.setMassageMode(TestValues.GENERAL_MASSAGEMODE);
-	}
+        msg.setMassageZone(TestValues.GENERAL_MASSAGEZONE);
+        msg.setMassageMode(TestValues.GENERAL_MASSAGEMODE);
+    }
 
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		MassageZone massageZone = msg.getMassageZone();
-		MassageMode massageMode = msg.getMassageMode();
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        MassageZone massageZone = msg.getMassageZone();
+        MassageMode massageMode = msg.getMassageMode();
 
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGEZONE, massageZone);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGEMODE, massageMode);
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGEZONE, massageZone);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MASSAGEMODE, massageMode);
 
 
-		// Invalid/Null Tests
-		MassageModeData msg = new MassageModeData();
-		assertNotNull(TestValues.NOT_NULL, msg);
+        // Invalid/Null Tests
+        MassageModeData msg = new MassageModeData();
+        assertNotNull(TestValues.NOT_NULL, msg);
 
-		assertNull(TestValues.NULL, msg.getMassageMode());
-		assertNull(TestValues.NULL, msg.getMassageZone());
-	}
+        assertNull(TestValues.NULL, msg.getMassageMode());
+        assertNull(TestValues.NULL, msg.getMassageZone());
+    }
 
-	public void testJson() {
-		JSONObject reference = new JSONObject();
+    public void testJson() {
+        JSONObject reference = new JSONObject();
 
-		try {
-			reference.put(MassageModeData.KEY_MASSAGE_MODE, TestValues.GENERAL_MASSAGEMODE);
-			reference.put(MassageModeData.KEY_MASSAGE_ZONE, TestValues.GENERAL_MASSAGEZONE);
+        try {
+            reference.put(MassageModeData.KEY_MASSAGE_MODE, TestValues.GENERAL_MASSAGEMODE);
+            reference.put(MassageModeData.KEY_MASSAGE_ZONE, TestValues.GENERAL_MASSAGEZONE);
 
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
 
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
 
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java
index 5d1baded5..6f7dd148a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceDataTests.java
@@ -22,116 +22,116 @@ import java.util.Iterator;
  */
 public class MediaServiceDataTests extends TestCase {
 
-	private MediaServiceData msg;
-
-	@Override
-	public void setUp(){
-
-		msg = new MediaServiceData();
-		msg.setMediaType(TestValues.GENERAL_MEDIATYPE);
-		msg.setMediaTitle(TestValues.GENERAL_STRING);
-		msg.setMediaArtist(TestValues.GENERAL_STRING);
-		msg.setMediaAlbum(TestValues.GENERAL_STRING);
-		msg.setMediaImage(TestValues.GENERAL_IMAGE);
-		msg.setPlaylistName(TestValues.GENERAL_STRING);
-		msg.setIsExplicit(TestValues.GENERAL_BOOLEAN);
-		msg.setTrackPlaybackProgress(TestValues.GENERAL_INTEGER);
-		msg.setTrackPlaybackDuration(TestValues.GENERAL_INTEGER);
-		msg.setQueuePlaybackProgress(TestValues.GENERAL_INTEGER);
-		msg.setQueuePlaybackDuration(TestValues.GENERAL_INTEGER);
-		msg.setQueueCurrentTrackNumber(TestValues.GENERAL_INTEGER);
-		msg.setQueueTotalTrackCount(TestValues.GENERAL_INTEGER);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		MediaType mediaType = msg.getMediaType();
-		String mediaTitle = msg.getMediaTitle();
-		String mediaArtist = msg.getMediaArtist();
-		String mediaAlbum = msg.getMediaAlbum();
-		Image mediaImage = msg.getMediaImage();
-		String playlistName = msg.getPlaylistName();
-		boolean isExplicit = msg.getIsExplicit();
-		Integer trackPlaybackProgress = msg.getTrackPlaybackProgress();
-		Integer trackPlaybackDuration = msg.getTrackPlaybackDuration();
-		Integer queuePlaybackProgress = msg.getQueuePlaybackProgress();
-		Integer queuePlaybackDuration = msg.getQueuePlaybackDuration();
-		Integer queueCurrentTrackNumber = msg.getQueueCurrentTrackNumber();
-		Integer queueTotalTrackCount = msg.getQueueTotalTrackCount();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_MEDIATYPE, mediaType);
-		assertEquals(TestValues.GENERAL_STRING, mediaTitle);
-		assertEquals(TestValues.GENERAL_STRING, mediaArtist);
-		assertEquals(TestValues.GENERAL_STRING, mediaAlbum);
-		assertEquals(TestValues.GENERAL_IMAGE, mediaImage);
-		assertEquals(TestValues.GENERAL_STRING, playlistName);
-		assertEquals(TestValues.GENERAL_BOOLEAN, isExplicit);
-		assertEquals(TestValues.GENERAL_INTEGER, trackPlaybackProgress);
-		assertEquals(TestValues.GENERAL_INTEGER, trackPlaybackDuration);
-		assertEquals(TestValues.GENERAL_INTEGER, queuePlaybackProgress);
-		assertEquals(TestValues.GENERAL_INTEGER, queuePlaybackDuration);
-		assertEquals(TestValues.GENERAL_INTEGER, queueCurrentTrackNumber);
-		assertEquals(TestValues.GENERAL_INTEGER, queueTotalTrackCount);
-
-		// Invalid/Null Tests
-		MediaServiceData msg = new MediaServiceData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getMediaType());
-		assertNull(TestValues.NULL, msg.getMediaTitle());
-		assertNull(TestValues.NULL, msg.getMediaArtist());
-		assertNull(TestValues.NULL, msg.getMediaAlbum());
-		assertNull(TestValues.NULL, msg.getMediaImage());
-		assertNull(TestValues.NULL, msg.getPlaylistName());
-		assertNull(TestValues.NULL, msg.getIsExplicit());
-		assertNull(TestValues.NULL, msg.getTrackPlaybackProgress());
-		assertNull(TestValues.NULL, msg.getTrackPlaybackDuration());
-		assertNull(TestValues.NULL, msg.getQueuePlaybackProgress());
-		assertNull(TestValues.NULL, msg.getQueuePlaybackDuration());
-		assertNull(TestValues.NULL, msg.getQueueCurrentTrackNumber());
-		assertNull(TestValues.NULL, msg.getQueueTotalTrackCount());
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(MediaServiceData.KEY_MEDIA_TYPE, TestValues.GENERAL_MEDIATYPE);
-			reference.put(MediaServiceData.KEY_MEDIA_TITLE, TestValues.GENERAL_STRING);
-			reference.put(MediaServiceData.KEY_MEDIA_ARTIST, TestValues.GENERAL_STRING);
-			reference.put(MediaServiceData.KEY_MEDIA_ALBUM, TestValues.GENERAL_STRING);
-			reference.put(MediaServiceData.KEY_MEDIA_IMAGE, TestValues.GENERAL_IMAGE);
-			reference.put(MediaServiceData.KEY_PLAYLIST_NAME, TestValues.GENERAL_STRING);
-			reference.put(MediaServiceData.KEY_IS_EXPLICIT, TestValues.GENERAL_BOOLEAN);
-			reference.put(MediaServiceData.KEY_TRACK_PLAYBACK_PROGRESS, TestValues.GENERAL_INTEGER);
-			reference.put(MediaServiceData.KEY_TRACK_PLAYBACK_DURATION, TestValues.GENERAL_INTEGER);
-			reference.put(MediaServiceData.KEY_QUEUE_PLAYBACK_PROGRESS, TestValues.GENERAL_INTEGER);
-			reference.put(MediaServiceData.KEY_QUEUE_PLAYBACK_DURATION, TestValues.GENERAL_INTEGER);
-			reference.put(MediaServiceData.KEY_QUEUE_CURRENT_TRACK_NUMBER, TestValues.GENERAL_INTEGER);
-			reference.put(MediaServiceData.KEY_QUEUE_TOTAL_TRACK_COUNT, TestValues.GENERAL_INTEGER);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-
-				if (key.equals(MediaServiceData.KEY_MEDIA_IMAGE)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, new Image(hashTest)));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private MediaServiceData msg;
+
+    @Override
+    public void setUp() {
+
+        msg = new MediaServiceData();
+        msg.setMediaType(TestValues.GENERAL_MEDIATYPE);
+        msg.setMediaTitle(TestValues.GENERAL_STRING);
+        msg.setMediaArtist(TestValues.GENERAL_STRING);
+        msg.setMediaAlbum(TestValues.GENERAL_STRING);
+        msg.setMediaImage(TestValues.GENERAL_IMAGE);
+        msg.setPlaylistName(TestValues.GENERAL_STRING);
+        msg.setIsExplicit(TestValues.GENERAL_BOOLEAN);
+        msg.setTrackPlaybackProgress(TestValues.GENERAL_INTEGER);
+        msg.setTrackPlaybackDuration(TestValues.GENERAL_INTEGER);
+        msg.setQueuePlaybackProgress(TestValues.GENERAL_INTEGER);
+        msg.setQueuePlaybackDuration(TestValues.GENERAL_INTEGER);
+        msg.setQueueCurrentTrackNumber(TestValues.GENERAL_INTEGER);
+        msg.setQueueTotalTrackCount(TestValues.GENERAL_INTEGER);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        MediaType mediaType = msg.getMediaType();
+        String mediaTitle = msg.getMediaTitle();
+        String mediaArtist = msg.getMediaArtist();
+        String mediaAlbum = msg.getMediaAlbum();
+        Image mediaImage = msg.getMediaImage();
+        String playlistName = msg.getPlaylistName();
+        boolean isExplicit = msg.getIsExplicit();
+        Integer trackPlaybackProgress = msg.getTrackPlaybackProgress();
+        Integer trackPlaybackDuration = msg.getTrackPlaybackDuration();
+        Integer queuePlaybackProgress = msg.getQueuePlaybackProgress();
+        Integer queuePlaybackDuration = msg.getQueuePlaybackDuration();
+        Integer queueCurrentTrackNumber = msg.getQueueCurrentTrackNumber();
+        Integer queueTotalTrackCount = msg.getQueueTotalTrackCount();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_MEDIATYPE, mediaType);
+        assertEquals(TestValues.GENERAL_STRING, mediaTitle);
+        assertEquals(TestValues.GENERAL_STRING, mediaArtist);
+        assertEquals(TestValues.GENERAL_STRING, mediaAlbum);
+        assertEquals(TestValues.GENERAL_IMAGE, mediaImage);
+        assertEquals(TestValues.GENERAL_STRING, playlistName);
+        assertEquals(TestValues.GENERAL_BOOLEAN, isExplicit);
+        assertEquals(TestValues.GENERAL_INTEGER, trackPlaybackProgress);
+        assertEquals(TestValues.GENERAL_INTEGER, trackPlaybackDuration);
+        assertEquals(TestValues.GENERAL_INTEGER, queuePlaybackProgress);
+        assertEquals(TestValues.GENERAL_INTEGER, queuePlaybackDuration);
+        assertEquals(TestValues.GENERAL_INTEGER, queueCurrentTrackNumber);
+        assertEquals(TestValues.GENERAL_INTEGER, queueTotalTrackCount);
+
+        // Invalid/Null Tests
+        MediaServiceData msg = new MediaServiceData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getMediaType());
+        assertNull(TestValues.NULL, msg.getMediaTitle());
+        assertNull(TestValues.NULL, msg.getMediaArtist());
+        assertNull(TestValues.NULL, msg.getMediaAlbum());
+        assertNull(TestValues.NULL, msg.getMediaImage());
+        assertNull(TestValues.NULL, msg.getPlaylistName());
+        assertNull(TestValues.NULL, msg.getIsExplicit());
+        assertNull(TestValues.NULL, msg.getTrackPlaybackProgress());
+        assertNull(TestValues.NULL, msg.getTrackPlaybackDuration());
+        assertNull(TestValues.NULL, msg.getQueuePlaybackProgress());
+        assertNull(TestValues.NULL, msg.getQueuePlaybackDuration());
+        assertNull(TestValues.NULL, msg.getQueueCurrentTrackNumber());
+        assertNull(TestValues.NULL, msg.getQueueTotalTrackCount());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(MediaServiceData.KEY_MEDIA_TYPE, TestValues.GENERAL_MEDIATYPE);
+            reference.put(MediaServiceData.KEY_MEDIA_TITLE, TestValues.GENERAL_STRING);
+            reference.put(MediaServiceData.KEY_MEDIA_ARTIST, TestValues.GENERAL_STRING);
+            reference.put(MediaServiceData.KEY_MEDIA_ALBUM, TestValues.GENERAL_STRING);
+            reference.put(MediaServiceData.KEY_MEDIA_IMAGE, TestValues.GENERAL_IMAGE);
+            reference.put(MediaServiceData.KEY_PLAYLIST_NAME, TestValues.GENERAL_STRING);
+            reference.put(MediaServiceData.KEY_IS_EXPLICIT, TestValues.GENERAL_BOOLEAN);
+            reference.put(MediaServiceData.KEY_TRACK_PLAYBACK_PROGRESS, TestValues.GENERAL_INTEGER);
+            reference.put(MediaServiceData.KEY_TRACK_PLAYBACK_DURATION, TestValues.GENERAL_INTEGER);
+            reference.put(MediaServiceData.KEY_QUEUE_PLAYBACK_PROGRESS, TestValues.GENERAL_INTEGER);
+            reference.put(MediaServiceData.KEY_QUEUE_PLAYBACK_DURATION, TestValues.GENERAL_INTEGER);
+            reference.put(MediaServiceData.KEY_QUEUE_CURRENT_TRACK_NUMBER, TestValues.GENERAL_INTEGER);
+            reference.put(MediaServiceData.KEY_QUEUE_TOTAL_TRACK_COUNT, TestValues.GENERAL_INTEGER);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(MediaServiceData.KEY_MEDIA_IMAGE)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, new Image(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java
index d85e064f4..e81f207fe 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MediaServiceManifestTests.java
@@ -11,20 +11,20 @@ import junit.framework.TestCase;
  */
 public class MediaServiceManifestTests extends TestCase {
 
-	@Override
-	public void setUp(){
-		// nothing to setup yet, this class doesn't contain anything
-	}
+    @Override
+    public void setUp() {
+        // nothing to setup yet, this class doesn't contain anything
+    }
 
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
 
-		// Invalid/Null Tests
-		MediaServiceManifest msg = new MediaServiceManifest();
-		assertNotNull(TestValues.NOT_NULL, msg);
-	}
+        // Invalid/Null Tests
+        MediaServiceManifest msg = new MediaServiceManifest();
+        assertNotNull(TestValues.NOT_NULL, msg);
+    }
 
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
index c3670f9df..998d8f4d4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
@@ -12,15 +12,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.MenuParams}
  */
-public class MenuParamsTests extends TestCase{
+public class MenuParamsTests extends TestCase {
 
     private MenuParams msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new MenuParams();
 
         msg.setMenuName(TestValues.GENERAL_STRING);
@@ -29,19 +29,19 @@ public class MenuParamsTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         String menuName = msg.getMenuName();
         int parentId = msg.getParentID();
         int position = msg.getPosition();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, menuName);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, parentId);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, position);
-        
+
         // Invalid/Null Tests
         MenuParams msg = new MenuParams();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -51,10 +51,10 @@ public class MenuParamsTests extends TestCase{
         assertNull(TestValues.NULL, msg.getPosition());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(MenuParams.KEY_MENU_NAME, TestValues.GENERAL_STRING);
             reference.put(MenuParams.KEY_PARENT_ID, TestValues.GENERAL_INT);
             reference.put(MenuParams.KEY_POSITION, TestValues.GENERAL_INT);
@@ -63,12 +63,12 @@ public class MenuParamsTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java
index 9b08c8e73..44d5d758a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MetadataTagsTests.java
@@ -22,89 +22,89 @@ import java.util.List;
 
 public class MetadataTagsTests extends TestCase {
 
-	private MetadataTags msg;
-	private MetadataTags msg2;
-	private List<MetadataType> exampleList;
-
-	@Override
-	public void setUp() {
-		// Create List for Testing
-		exampleList = new ArrayList<>();
-		exampleList.add(0, MetadataType.CURRENT_TEMPERATURE);
-		exampleList.add(1, MetadataType.MEDIA_ALBUM);
-		exampleList.add(2, MetadataType.MEDIA_ARTIST);
-
-		msg = new MetadataTags();
-		msg.setMainField1(exampleList);
-		msg.setMainField2(exampleList);
-		msg.setMainField3(exampleList);
-		msg.setMainField4(exampleList);
-
-		// Setup without a list
-		msg2 = new MetadataTags();
-		msg2.setMainField1(MetadataType.CURRENT_TEMPERATURE);
-		msg2.setMainField2(MetadataType.HUMIDITY);
-		msg2.setMainField3(MetadataType.MAXIMUM_TEMPERATURE);
-		msg2.setMainField4(MetadataType.MEDIA_ALBUM);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		List<MetadataType> mainField1Types = msg.getMainField1();
-		List<MetadataType> mainField2Types = msg.getMainField2();
-		List<MetadataType> mainField3Types = msg.getMainField3();
-		List<MetadataType> mainField4Types = msg.getMainField4();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, exampleList, mainField1Types);
-		assertEquals(TestValues.MATCH, exampleList, mainField2Types);
-		assertEquals(TestValues.MATCH, exampleList, mainField3Types);
-		assertEquals(TestValues.MATCH, exampleList, mainField4Types);
-
-		// Test metadata set without a list
-		mainField1Types = msg2.getMainField1();
-		mainField2Types = msg2.getMainField2();
-		mainField3Types = msg2.getMainField3();
-		mainField4Types = msg2.getMainField4();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, MetadataType.CURRENT_TEMPERATURE, mainField1Types.get(0));
-		assertEquals(TestValues.MATCH, MetadataType.HUMIDITY, mainField2Types.get(0));
-		assertEquals(TestValues.MATCH, MetadataType.MAXIMUM_TEMPERATURE, mainField3Types.get(0));
-		assertEquals(TestValues.MATCH, MetadataType.MEDIA_ALBUM, mainField4Types.get(0));
-
-		// Invalid/Null Tests
-		MetadataTags msg = new MetadataTags();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getMainField1());
-		assertNull(TestValues.NULL, msg.getMainField2());
-		assertNull(TestValues.NULL, msg.getMainField3());
-		assertNull(TestValues.NULL, msg.getMainField4());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(MetadataTags.KEY_MAIN_FIELD_1_TYPE, TestValues.JSON_TEXTFIELDTYPES);
-			reference.put(MetadataTags.KEY_MAIN_FIELD_2_TYPE, TestValues.JSON_TEXTFIELDTYPES);
-			reference.put(MetadataTags.KEY_MAIN_FIELD_3_TYPE, TestValues.JSON_TEXTFIELDTYPES);
-			reference.put(MetadataTags.KEY_MAIN_FIELD_4_TYPE, TestValues.JSON_TEXTFIELDTYPES);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private MetadataTags msg;
+    private MetadataTags msg2;
+    private List<MetadataType> exampleList;
+
+    @Override
+    public void setUp() {
+        // Create List for Testing
+        exampleList = new ArrayList<>();
+        exampleList.add(0, MetadataType.CURRENT_TEMPERATURE);
+        exampleList.add(1, MetadataType.MEDIA_ALBUM);
+        exampleList.add(2, MetadataType.MEDIA_ARTIST);
+
+        msg = new MetadataTags();
+        msg.setMainField1(exampleList);
+        msg.setMainField2(exampleList);
+        msg.setMainField3(exampleList);
+        msg.setMainField4(exampleList);
+
+        // Setup without a list
+        msg2 = new MetadataTags();
+        msg2.setMainField1(MetadataType.CURRENT_TEMPERATURE);
+        msg2.setMainField2(MetadataType.HUMIDITY);
+        msg2.setMainField3(MetadataType.MAXIMUM_TEMPERATURE);
+        msg2.setMainField4(MetadataType.MEDIA_ALBUM);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        List<MetadataType> mainField1Types = msg.getMainField1();
+        List<MetadataType> mainField2Types = msg.getMainField2();
+        List<MetadataType> mainField3Types = msg.getMainField3();
+        List<MetadataType> mainField4Types = msg.getMainField4();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, exampleList, mainField1Types);
+        assertEquals(TestValues.MATCH, exampleList, mainField2Types);
+        assertEquals(TestValues.MATCH, exampleList, mainField3Types);
+        assertEquals(TestValues.MATCH, exampleList, mainField4Types);
+
+        // Test metadata set without a list
+        mainField1Types = msg2.getMainField1();
+        mainField2Types = msg2.getMainField2();
+        mainField3Types = msg2.getMainField3();
+        mainField4Types = msg2.getMainField4();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, MetadataType.CURRENT_TEMPERATURE, mainField1Types.get(0));
+        assertEquals(TestValues.MATCH, MetadataType.HUMIDITY, mainField2Types.get(0));
+        assertEquals(TestValues.MATCH, MetadataType.MAXIMUM_TEMPERATURE, mainField3Types.get(0));
+        assertEquals(TestValues.MATCH, MetadataType.MEDIA_ALBUM, mainField4Types.get(0));
+
+        // Invalid/Null Tests
+        MetadataTags msg = new MetadataTags();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getMainField1());
+        assertNull(TestValues.NULL, msg.getMainField2());
+        assertNull(TestValues.NULL, msg.getMainField3());
+        assertNull(TestValues.NULL, msg.getMainField4());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(MetadataTags.KEY_MAIN_FIELD_1_TYPE, TestValues.JSON_TEXTFIELDTYPES);
+            reference.put(MetadataTags.KEY_MAIN_FIELD_2_TYPE, TestValues.JSON_TEXTFIELDTYPES);
+            reference.put(MetadataTags.KEY_MAIN_FIELD_3_TYPE, TestValues.JSON_TEXTFIELDTYPES);
+            reference.put(MetadataTags.KEY_MAIN_FIELD_4_TYPE, TestValues.JSON_TEXTFIELDTYPES);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java
index c6a88dcc3..dd48b1baf 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleDataTests.java
@@ -27,121 +27,121 @@ import java.util.Iterator;
  */
 public class ModuleDataTests extends TestCase {
 
-	private ModuleData msg;
-
-	@Override
-	public void setUp() {
-		msg = new ModuleData();
-		msg.setModuleType(TestValues.GENERAL_MODULETYPE);
-		msg.setRadioControlData(TestValues.GENERAL_RADIOCONTROLDATA);
-		msg.setClimateControlData(TestValues.GENERAL_CLIMATECONTROLDATA);
-		msg.setSeatControlData(TestValues.GENERAL_SEATCONTROLDATA);
-		msg.setAudioControlData(TestValues.GENERAL_AUDIOCONTROLDATA);
-		msg.setHmiSettingsControlData(TestValues.GENERAL_HMISETTINGSCONTROLDATA);
-		msg.setLightControlData(TestValues.GENERAL_LIGHTCONTROLDATA);
-		msg.setModuleId(TestValues.GENERAL_STRING);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		ModuleType moduleType = msg.getModuleType();
-		RadioControlData radioControlData = msg.getRadioControlData();
-		ClimateControlData climateControlData = msg.getClimateControlData();
-		SeatControlData seatControlData = msg.getSeatControlData();
-		AudioControlData audioControlData = msg.getAudioControlData();
-		HMISettingsControlData hmiSettingsControlData = msg.getHmiSettingsControlData();
-		LightControlData lightControlData = msg.getLightControlData();
-		String moduleId = msg.getModuleId();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, moduleType);
-		assertTrue(TestValues.TRUE, Validator.validateRadioControlData(TestValues.GENERAL_RADIOCONTROLDATA, radioControlData));
-		assertTrue(TestValues.TRUE, Validator.validateClimateControlData(TestValues.GENERAL_CLIMATECONTROLDATA, climateControlData));
-		assertTrue(TestValues.TRUE, Validator.validateSeatControlData(TestValues.GENERAL_SEATCONTROLDATA, seatControlData));
-		assertTrue(TestValues.TRUE, Validator.validateAudioControlData(TestValues.GENERAL_AUDIOCONTROLDATA, audioControlData));
-		assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlData(TestValues.GENERAL_HMISETTINGSCONTROLDATA, hmiSettingsControlData));
-		assertTrue(TestValues.TRUE, Validator.validateLightControlData(TestValues.GENERAL_LIGHTCONTROLDATA, lightControlData));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleId);
-
-		// Invalid/Null Tests
-		ModuleData msg = new ModuleData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getModuleType());
-		assertNull(TestValues.NULL, msg.getRadioControlData());
-		assertNull(TestValues.NULL, msg.getClimateControlData());
-		assertNull(TestValues.NULL, msg.getSeatControlData());
-		assertNull(TestValues.NULL, msg.getAudioControlData());
-		assertNull(TestValues.NULL, msg.getHmiSettingsControlData());
-		assertNull(TestValues.NULL, msg.getLightControlData());
-		assertNull(TestValues.NULL, msg.getModuleId());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(ModuleData.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE);
-			reference.put(ModuleData.KEY_RADIO_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_RADIOCONTROLDATA.getStore()));
-			reference.put(ModuleData.KEY_CLIMATE_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_CLIMATECONTROLDATA.getStore()));
-			reference.put(ModuleData.KEY_SEAT_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_SEATCONTROLDATA.getStore()));
-			reference.put(ModuleData.KEY_AUDIO_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_AUDIOCONTROLDATA.getStore()));
-			reference.put(ModuleData.KEY_HMI_SETTINGS_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HMISETTINGSCONTROLDATA.getStore()));
-			reference.put(ModuleData.KEY_LIGHT_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_LIGHTCONTROLDATA.getStore()));
-			reference.put(ModuleData.KEY_MODULE_ID, TestValues.GENERAL_STRING);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				if (key.equals(ModuleData.KEY_RADIO_CONTROL_DATA)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateRadioControlData(new RadioControlData(hashReference), new RadioControlData(hashTest)));
-				} else if (key.equals(ModuleData.KEY_CLIMATE_CONTROL_DATA)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateClimateControlData(new ClimateControlData(hashReference), new ClimateControlData(hashTest)));
-				} else if (key.equals(ModuleData.KEY_SEAT_CONTROL_DATA)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateSeatControlData(new SeatControlData(hashReference), new SeatControlData(hashTest)));
-				} else if (key.equals(ModuleData.KEY_AUDIO_CONTROL_DATA)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateAudioControlData(new AudioControlData(hashReference), new AudioControlData(hashTest)));
-				} else if (key.equals(ModuleData.KEY_HMI_SETTINGS_CONTROL_DATA)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlData(new HMISettingsControlData(hashReference), new HMISettingsControlData(hashTest)));
-				} else if (key.equals(ModuleData.KEY_LIGHT_CONTROL_DATA)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateLightControlData(new LightControlData(hashReference), new LightControlData(hashTest)));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private ModuleData msg;
+
+    @Override
+    public void setUp() {
+        msg = new ModuleData();
+        msg.setModuleType(TestValues.GENERAL_MODULETYPE);
+        msg.setRadioControlData(TestValues.GENERAL_RADIOCONTROLDATA);
+        msg.setClimateControlData(TestValues.GENERAL_CLIMATECONTROLDATA);
+        msg.setSeatControlData(TestValues.GENERAL_SEATCONTROLDATA);
+        msg.setAudioControlData(TestValues.GENERAL_AUDIOCONTROLDATA);
+        msg.setHmiSettingsControlData(TestValues.GENERAL_HMISETTINGSCONTROLDATA);
+        msg.setLightControlData(TestValues.GENERAL_LIGHTCONTROLDATA);
+        msg.setModuleId(TestValues.GENERAL_STRING);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        ModuleType moduleType = msg.getModuleType();
+        RadioControlData radioControlData = msg.getRadioControlData();
+        ClimateControlData climateControlData = msg.getClimateControlData();
+        SeatControlData seatControlData = msg.getSeatControlData();
+        AudioControlData audioControlData = msg.getAudioControlData();
+        HMISettingsControlData hmiSettingsControlData = msg.getHmiSettingsControlData();
+        LightControlData lightControlData = msg.getLightControlData();
+        String moduleId = msg.getModuleId();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, moduleType);
+        assertTrue(TestValues.TRUE, Validator.validateRadioControlData(TestValues.GENERAL_RADIOCONTROLDATA, radioControlData));
+        assertTrue(TestValues.TRUE, Validator.validateClimateControlData(TestValues.GENERAL_CLIMATECONTROLDATA, climateControlData));
+        assertTrue(TestValues.TRUE, Validator.validateSeatControlData(TestValues.GENERAL_SEATCONTROLDATA, seatControlData));
+        assertTrue(TestValues.TRUE, Validator.validateAudioControlData(TestValues.GENERAL_AUDIOCONTROLDATA, audioControlData));
+        assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlData(TestValues.GENERAL_HMISETTINGSCONTROLDATA, hmiSettingsControlData));
+        assertTrue(TestValues.TRUE, Validator.validateLightControlData(TestValues.GENERAL_LIGHTCONTROLDATA, lightControlData));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleId);
+
+        // Invalid/Null Tests
+        ModuleData msg = new ModuleData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getModuleType());
+        assertNull(TestValues.NULL, msg.getRadioControlData());
+        assertNull(TestValues.NULL, msg.getClimateControlData());
+        assertNull(TestValues.NULL, msg.getSeatControlData());
+        assertNull(TestValues.NULL, msg.getAudioControlData());
+        assertNull(TestValues.NULL, msg.getHmiSettingsControlData());
+        assertNull(TestValues.NULL, msg.getLightControlData());
+        assertNull(TestValues.NULL, msg.getModuleId());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(ModuleData.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE);
+            reference.put(ModuleData.KEY_RADIO_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_RADIOCONTROLDATA.getStore()));
+            reference.put(ModuleData.KEY_CLIMATE_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_CLIMATECONTROLDATA.getStore()));
+            reference.put(ModuleData.KEY_SEAT_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_SEATCONTROLDATA.getStore()));
+            reference.put(ModuleData.KEY_AUDIO_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_AUDIOCONTROLDATA.getStore()));
+            reference.put(ModuleData.KEY_HMI_SETTINGS_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HMISETTINGSCONTROLDATA.getStore()));
+            reference.put(ModuleData.KEY_LIGHT_CONTROL_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_LIGHTCONTROLDATA.getStore()));
+            reference.put(ModuleData.KEY_MODULE_ID, TestValues.GENERAL_STRING);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(ModuleData.KEY_RADIO_CONTROL_DATA)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateRadioControlData(new RadioControlData(hashReference), new RadioControlData(hashTest)));
+                } else if (key.equals(ModuleData.KEY_CLIMATE_CONTROL_DATA)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateClimateControlData(new ClimateControlData(hashReference), new ClimateControlData(hashTest)));
+                } else if (key.equals(ModuleData.KEY_SEAT_CONTROL_DATA)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateSeatControlData(new SeatControlData(hashReference), new SeatControlData(hashTest)));
+                } else if (key.equals(ModuleData.KEY_AUDIO_CONTROL_DATA)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateAudioControlData(new AudioControlData(hashReference), new AudioControlData(hashTest)));
+                } else if (key.equals(ModuleData.KEY_HMI_SETTINGS_CONTROL_DATA)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlData(new HMISettingsControlData(hashReference), new HMISettingsControlData(hashTest)));
+                } else if (key.equals(ModuleData.KEY_LIGHT_CONTROL_DATA)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateLightControlData(new LightControlData(hashReference), new LightControlData(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleInfoTests.java
index ef09a270f..e1af40a70 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleInfoTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ModuleInfoTests.java
@@ -14,57 +14,57 @@ import org.json.JSONObject;
 import java.util.Hashtable;
 
 public class ModuleInfoTests extends TestCase {
-	private ModuleInfo msg;
+    private ModuleInfo msg;
 
-	@Override
-	public void setUp() {
-		msg = new ModuleInfo();
-		msg.setModuleId(TestValues.GENERAL_STRING);
-		msg.setModuleLocation(TestValues.GENERAL_GRID);
-		msg.setModuleServiceArea(TestValues.GENERAL_GRID);
-		msg.setMultipleAccessAllowance(TestValues.GENERAL_BOOLEAN);
-	}
+    @Override
+    public void setUp() {
+        msg = new ModuleInfo();
+        msg.setModuleId(TestValues.GENERAL_STRING);
+        msg.setModuleLocation(TestValues.GENERAL_GRID);
+        msg.setModuleServiceArea(TestValues.GENERAL_GRID);
+        msg.setMultipleAccessAllowance(TestValues.GENERAL_BOOLEAN);
+    }
 
-	public void testRpcValues() {
-		String id = msg.getModuleId();
-		Grid loc = msg.getModuleLocation();
-		Grid area = msg.getModuleServiceArea();
-		boolean isAllowed = msg.getMultipleAccessAllowance();
+    public void testRpcValues() {
+        String id = msg.getModuleId();
+        Grid loc = msg.getModuleLocation();
+        Grid area = msg.getModuleServiceArea();
+        boolean isAllowed = msg.getMultipleAccessAllowance();
 
-		//valid tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, id);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, loc);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, area);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, isAllowed);
+        //valid tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, id);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, loc);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_GRID, area);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, isAllowed);
 
-		//null test
-		ModuleInfo msg = new ModuleInfo();
-		assertNull(TestValues.NULL, msg.getModuleId());
-		assertNull(TestValues.NULL, msg.getModuleLocation());
-		assertNull(TestValues.NULL, msg.getModuleServiceArea());
-		assertNull(TestValues.NULL, msg.getMultipleAccessAllowance());
+        //null test
+        ModuleInfo msg = new ModuleInfo();
+        assertNull(TestValues.NULL, msg.getModuleId());
+        assertNull(TestValues.NULL, msg.getModuleLocation());
+        assertNull(TestValues.NULL, msg.getModuleServiceArea());
+        assertNull(TestValues.NULL, msg.getMultipleAccessAllowance());
 
-		//test required params constructor
-		ModuleInfo msg2 = new ModuleInfo(TestValues.GENERAL_STRING);
-		assertEquals(TestValues.MATCH, msg2.getModuleId(), TestValues.GENERAL_STRING);
-	}
+        //test required params constructor
+        ModuleInfo msg2 = new ModuleInfo(TestValues.GENERAL_STRING);
+        assertEquals(TestValues.MATCH, msg2.getModuleId(), TestValues.GENERAL_STRING);
+    }
 
-	public void testJson() {
-		JSONObject original = new JSONObject();
-		try {
-			original.put(ModuleInfo.KEY_MODULE_ID, TestValues.GENERAL_STRING);
-			original.put(ModuleInfo.KEY_MODULE_LOCATION, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_GRID.getStore()));
-			original.put(ModuleInfo.KEY_MODULE_SERVICE_AREA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_GRID.getStore()));
-			original.put(ModuleInfo.KEY_MULTIPLE_ACCESS_ALLOWED, TestValues.GENERAL_BOOLEAN);
+    public void testJson() {
+        JSONObject original = new JSONObject();
+        try {
+            original.put(ModuleInfo.KEY_MODULE_ID, TestValues.GENERAL_STRING);
+            original.put(ModuleInfo.KEY_MODULE_LOCATION, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_GRID.getStore()));
+            original.put(ModuleInfo.KEY_MODULE_SERVICE_AREA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_GRID.getStore()));
+            original.put(ModuleInfo.KEY_MULTIPLE_ACCESS_ALLOWED, TestValues.GENERAL_BOOLEAN);
 
-			JSONObject serialized = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, original.length(), serialized.length());
+            JSONObject serialized = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, original.length(), serialized.length());
 
-			Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(original);
-			Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(serialized);
-			assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2)));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(original);
+            Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(serialized);
+            assertTrue(TestValues.TRUE, Validator.validateModuleInfo(new ModuleInfo(h1), new ModuleInfo(h2)));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
index c5dabaf50..05ebd66ff 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
@@ -13,29 +13,29 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.MyKey}
  */
-public class MyKeyTests extends TestCase{
+public class MyKeyTests extends TestCase {
 
     private MyKey msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new MyKey();
         msg.setE911Override(TestValues.GENERAL_VEHICLEDATASTATUS);
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         VehicleDataStatus override = msg.getE911Override();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATASTATUS, override);
-        
+
         // Invalid/Null Tests
         MyKey msg = new MyKey();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -43,22 +43,22 @@ public class MyKeyTests extends TestCase{
         assertNull(TestValues.NULL, msg.getE911Override());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(MyKey.KEY_E_911_OVERRIDE, TestValues.GENERAL_VEHICLEDATASTATUS);
 
             JSONObject underTest = msg.serializeJSON();
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java
index af2410155..200d33fbe 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationCapabilityTests.java
@@ -12,15 +12,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.NavigationCapability}
  */
-public class NavigationCapabilityTests extends TestCase{
+public class NavigationCapabilityTests extends TestCase {
 
     private NavigationCapability msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new NavigationCapability();
 
         msg.setSendLocationEnabled(TestValues.GENERAL_BOOLEAN);
@@ -28,10 +28,10 @@ public class NavigationCapabilityTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         boolean sendLocationEnabled = msg.getSendLocationEnabled();
         boolean getWayPointsEnabled = msg.getWayPointsEnabled();
 
@@ -47,10 +47,10 @@ public class NavigationCapabilityTests extends TestCase{
         assertNull(TestValues.NULL, msg.getWayPointsEnabled());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(NavigationCapability.KEY_GETWAYPOINTS_ENABLED, TestValues.GENERAL_BOOLEAN);
             reference.put(NavigationCapability.KEY_LOCATION_ENABLED, TestValues.GENERAL_BOOLEAN);
 
@@ -58,12 +58,12 @@ public class NavigationCapabilityTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java
index cfb791f02..ff7e9e13e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationInstructionTests.java
@@ -26,109 +26,109 @@ import java.util.Iterator;
  */
 public class NavigationInstructionTests extends TestCase {
 
-	private NavigationInstruction msg;
-
-	@Override
-	public void setUp(){
-		msg = new NavigationInstruction();
-
-		msg.setLocationDetails(TestValues.GENERAL_LOCATIONDETAILS);
-		msg.setAction(TestValues.GENERAL_NAVIGATIONACTION);
-		msg.setEta(TestValues.GENERAL_DATETIME);
-		msg.setBearing(TestValues.GENERAL_INTEGER);
-		msg.setJunctionType(TestValues.GENERAL_NAVIGATION_JUNCTION);
-		msg.setDrivingSide(TestValues.GENERAL_DIRECTION);
-		msg.setDetails(TestValues.GENERAL_STRING);
-		msg.setImage(TestValues.GENERAL_IMAGE);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		LocationDetails locationDetails = msg.getLocationDetails();
-		NavigationAction action = msg.getAction();
-		DateTime eta = msg.getEta();
-		Integer bearing = msg.getBearing();
-		NavigationJunction junctionType = msg.getJunctionType();
-		Direction drivingSide = msg.getDrivingSide();
-		String details = msg.getDetails();
-		Image image = msg.getImage();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_LOCATIONDETAILS, locationDetails);
-		assertEquals(TestValues.GENERAL_NAVIGATIONACTION, action);
-		assertEquals(TestValues.GENERAL_DATETIME, eta);
-		assertEquals(TestValues.GENERAL_INTEGER, bearing);
-		assertEquals(TestValues.GENERAL_NAVIGATION_JUNCTION, junctionType);
-		assertEquals(TestValues.GENERAL_DIRECTION, drivingSide);
-		assertEquals(TestValues.GENERAL_STRING, details);
-		assertEquals(TestValues.GENERAL_IMAGE, image);
-
-		// Invalid/Null Tests
-		NavigationInstruction msg = new NavigationInstruction();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getLocationDetails());
-		assertNull(TestValues.NULL, msg.getAction());
-		assertNull(TestValues.NULL, msg.getEta());
-		assertNull(TestValues.NULL, msg.getBearing());
-		assertNull(TestValues.NULL, msg.getJunctionType());
-		assertNull(TestValues.NULL, msg.getDrivingSide());
-		assertNull(TestValues.NULL, msg.getDetails());
-		assertNull(TestValues.NULL, msg.getImage());
-	}
-
-	public void testRequiredConstructor(){
-		NavigationInstruction msg = new NavigationInstruction(TestValues.GENERAL_LOCATIONDETAILS, TestValues.GENERAL_NAVIGATIONACTION);
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		LocationDetails locationDetails = msg.getLocationDetails();
-		NavigationAction action = msg.getAction();
-
-		assertEquals(TestValues.GENERAL_LOCATIONDETAILS, locationDetails);
-		assertEquals(TestValues.GENERAL_NAVIGATIONACTION, action);
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(NavigationInstruction.KEY_LOCATION_DETAILS, TestValues.GENERAL_LOCATIONDETAILS);
-			reference.put(NavigationInstruction.KEY_ACTION, TestValues.GENERAL_NAVIGATIONACTION);
-			reference.put(NavigationInstruction.KEY_ETA, TestValues.GENERAL_DATETIME);
-			reference.put(NavigationInstruction.KEY_BEARING, TestValues.GENERAL_INTEGER);
-			reference.put(NavigationInstruction.KEY_JUNCTION_TYPE, TestValues.GENERAL_NAVIGATION_JUNCTION);
-			reference.put(NavigationInstruction.KEY_DRIVING_SIDE, TestValues.GENERAL_DIRECTION);
-			reference.put(NavigationInstruction.KEY_DETAILS, TestValues.GENERAL_STRING);
-			reference.put(NavigationInstruction.KEY_IMAGE, TestValues.GENERAL_IMAGE);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-
-				if(key.equals(NavigationInstruction.KEY_IMAGE)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(testEquals));
-					assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, msg.getImage()));
-				}else if(key.equals(NavigationInstruction.KEY_LOCATION_DETAILS)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateLocationDetails( TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest)));
-				}else if (key.equals(NavigationInstruction.KEY_ETA)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest)));
-				}else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private NavigationInstruction msg;
+
+    @Override
+    public void setUp() {
+        msg = new NavigationInstruction();
+
+        msg.setLocationDetails(TestValues.GENERAL_LOCATIONDETAILS);
+        msg.setAction(TestValues.GENERAL_NAVIGATIONACTION);
+        msg.setEta(TestValues.GENERAL_DATETIME);
+        msg.setBearing(TestValues.GENERAL_INTEGER);
+        msg.setJunctionType(TestValues.GENERAL_NAVIGATION_JUNCTION);
+        msg.setDrivingSide(TestValues.GENERAL_DIRECTION);
+        msg.setDetails(TestValues.GENERAL_STRING);
+        msg.setImage(TestValues.GENERAL_IMAGE);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        LocationDetails locationDetails = msg.getLocationDetails();
+        NavigationAction action = msg.getAction();
+        DateTime eta = msg.getEta();
+        Integer bearing = msg.getBearing();
+        NavigationJunction junctionType = msg.getJunctionType();
+        Direction drivingSide = msg.getDrivingSide();
+        String details = msg.getDetails();
+        Image image = msg.getImage();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_LOCATIONDETAILS, locationDetails);
+        assertEquals(TestValues.GENERAL_NAVIGATIONACTION, action);
+        assertEquals(TestValues.GENERAL_DATETIME, eta);
+        assertEquals(TestValues.GENERAL_INTEGER, bearing);
+        assertEquals(TestValues.GENERAL_NAVIGATION_JUNCTION, junctionType);
+        assertEquals(TestValues.GENERAL_DIRECTION, drivingSide);
+        assertEquals(TestValues.GENERAL_STRING, details);
+        assertEquals(TestValues.GENERAL_IMAGE, image);
+
+        // Invalid/Null Tests
+        NavigationInstruction msg = new NavigationInstruction();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getLocationDetails());
+        assertNull(TestValues.NULL, msg.getAction());
+        assertNull(TestValues.NULL, msg.getEta());
+        assertNull(TestValues.NULL, msg.getBearing());
+        assertNull(TestValues.NULL, msg.getJunctionType());
+        assertNull(TestValues.NULL, msg.getDrivingSide());
+        assertNull(TestValues.NULL, msg.getDetails());
+        assertNull(TestValues.NULL, msg.getImage());
+    }
+
+    public void testRequiredConstructor() {
+        NavigationInstruction msg = new NavigationInstruction(TestValues.GENERAL_LOCATIONDETAILS, TestValues.GENERAL_NAVIGATIONACTION);
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        LocationDetails locationDetails = msg.getLocationDetails();
+        NavigationAction action = msg.getAction();
+
+        assertEquals(TestValues.GENERAL_LOCATIONDETAILS, locationDetails);
+        assertEquals(TestValues.GENERAL_NAVIGATIONACTION, action);
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(NavigationInstruction.KEY_LOCATION_DETAILS, TestValues.GENERAL_LOCATIONDETAILS);
+            reference.put(NavigationInstruction.KEY_ACTION, TestValues.GENERAL_NAVIGATIONACTION);
+            reference.put(NavigationInstruction.KEY_ETA, TestValues.GENERAL_DATETIME);
+            reference.put(NavigationInstruction.KEY_BEARING, TestValues.GENERAL_INTEGER);
+            reference.put(NavigationInstruction.KEY_JUNCTION_TYPE, TestValues.GENERAL_NAVIGATION_JUNCTION);
+            reference.put(NavigationInstruction.KEY_DRIVING_SIDE, TestValues.GENERAL_DIRECTION);
+            reference.put(NavigationInstruction.KEY_DETAILS, TestValues.GENERAL_STRING);
+            reference.put(NavigationInstruction.KEY_IMAGE, TestValues.GENERAL_IMAGE);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(NavigationInstruction.KEY_IMAGE)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(testEquals));
+                    assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, msg.getImage()));
+                } else if (key.equals(NavigationInstruction.KEY_LOCATION_DETAILS)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateLocationDetails(TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest)));
+                } else if (key.equals(NavigationInstruction.KEY_ETA)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java
index 9276fc091..d80bfab14 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceDataTests.java
@@ -26,118 +26,118 @@ import java.util.List;
  */
 public class NavigationServiceDataTests extends TestCase {
 
-	private NavigationServiceData msg;
-
-	@Override
-	public void setUp(){
-		msg = new NavigationServiceData();
-
-		msg.setTimeStamp(TestValues.GENERAL_DATETIME);
-		msg.setOrigin(TestValues.GENERAL_LOCATIONDETAILS);
-		msg.setDestination(TestValues.GENERAL_LOCATIONDETAILS);
-		msg.setDestinationETA(TestValues.GENERAL_DATETIME);
-		msg.setInstructions(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST);
-		msg.setNextInstructionETA(TestValues.GENERAL_DATETIME);
-		msg.setNextInstructionDistance(TestValues.GENERAL_FLOAT);
-		msg.setNextInstructionDistanceScale(TestValues.GENERAL_FLOAT);
-		msg.setPrompt(TestValues.GENERAL_STRING);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		DateTime timestamp = msg.getTimeStamp();
-		LocationDetails origin = msg.getOrigin();
-		LocationDetails destination = msg.getDestination();
-		DateTime destinationETA = msg.getDestinationETA();
-		List<NavigationInstruction> instructions = msg.getInstructions();
-		DateTime nextInstructionETA = msg.getNextInstructionETA();
-		Float nextInstructionDistance = msg.getNextInstructionDistance();
-		Float nextInstructionDistanceScale = msg.getNextInstructionDistanceScale();
-		String prompt = msg.getPrompt();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_DATETIME, timestamp);
-		assertEquals(TestValues.GENERAL_LOCATIONDETAILS, origin);
-		assertEquals(TestValues.GENERAL_LOCATIONDETAILS, destination);
-		assertEquals(TestValues.GENERAL_DATETIME, destinationETA);
-		assertEquals(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST, instructions);
-		assertEquals(TestValues.GENERAL_DATETIME, nextInstructionETA);
-		assertEquals(TestValues.GENERAL_FLOAT, nextInstructionDistance);
-		assertEquals(TestValues.GENERAL_FLOAT, nextInstructionDistanceScale);
-		assertEquals(TestValues.GENERAL_STRING, prompt);
-
-		// Invalid/Null Tests
-		NavigationServiceData msg = new NavigationServiceData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getTimeStamp());
-		assertNull(TestValues.NULL, msg.getOrigin());
-		assertNull(TestValues.NULL, msg.getDestination());
-		assertNull(TestValues.NULL, msg.getDestinationETA());
-		assertNull(TestValues.NULL, msg.getInstructions());
-		assertNull(TestValues.NULL, msg.getNextInstructionETA());
-		assertNull(TestValues.NULL, msg.getNextInstructionDistance());
-		assertNull(TestValues.NULL, msg.getNextInstructionDistanceScale());
-		assertNull(TestValues.NULL, msg.getPrompt());
-	}
-
-	public void testRequiredConstructor(){
-		NavigationServiceData msg = new NavigationServiceData(TestValues.GENERAL_DATETIME);
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		DateTime locationDetails = msg.getTimeStamp();
-
-		assertEquals(TestValues.GENERAL_DATETIME, locationDetails);
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(NavigationServiceData.KEY_TIMESTAMP, TestValues.GENERAL_DATETIME);
-			reference.put(NavigationServiceData.KEY_ORIGIN, TestValues.GENERAL_LOCATIONDETAILS);
-			reference.put(NavigationServiceData.KEY_DESTINATION, TestValues.GENERAL_LOCATIONDETAILS);
-			reference.put(NavigationServiceData.KEY_DESTINATION_ETA, TestValues.GENERAL_DATETIME);
-			reference.put(NavigationServiceData.KEY_INSTRUCTIONS, TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST);
-			reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_ETA, TestValues.GENERAL_DATETIME);
-			reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_DISTANCE, TestValues.GENERAL_FLOAT);
-			reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_DISTANCE_SCALE, TestValues.GENERAL_FLOAT);
-			reference.put(NavigationServiceData.KEY_PROMPT, TestValues.GENERAL_STRING);
-
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-
-				if(key.equals(NavigationServiceData.KEY_TIMESTAMP)||key.equals(NavigationServiceData.KEY_DESTINATION_ETA)||key.equals(NavigationServiceData.KEY_NEXT_INSTRUCTION_ETA)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest)));
-				}else if(key.equals(NavigationServiceData.KEY_DESTINATION)||key.equals(NavigationServiceData.KEY_ORIGIN)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateLocationDetails( TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest)));
-				}else if (key.equals(NavigationServiceData.KEY_INSTRUCTIONS)){
-					JSONArray NavigationInstructionUnderTestListArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					List<NavigationInstruction> NavigationInstructionUnderTestList = new ArrayList<>();
-					for (int index = 0; index < NavigationInstructionUnderTestListArrayObjTest.length(); index++) {
-						NavigationInstruction NavigationInstructionData = new NavigationInstruction(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)NavigationInstructionUnderTestListArrayObjTest.get(index) ));
-						NavigationInstructionUnderTestList.add(NavigationInstructionData);
-					}
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateNavigationInstructionList(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST, NavigationInstructionUnderTestList));
-				}else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private NavigationServiceData msg;
+
+    @Override
+    public void setUp() {
+        msg = new NavigationServiceData();
+
+        msg.setTimeStamp(TestValues.GENERAL_DATETIME);
+        msg.setOrigin(TestValues.GENERAL_LOCATIONDETAILS);
+        msg.setDestination(TestValues.GENERAL_LOCATIONDETAILS);
+        msg.setDestinationETA(TestValues.GENERAL_DATETIME);
+        msg.setInstructions(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST);
+        msg.setNextInstructionETA(TestValues.GENERAL_DATETIME);
+        msg.setNextInstructionDistance(TestValues.GENERAL_FLOAT);
+        msg.setNextInstructionDistanceScale(TestValues.GENERAL_FLOAT);
+        msg.setPrompt(TestValues.GENERAL_STRING);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        DateTime timestamp = msg.getTimeStamp();
+        LocationDetails origin = msg.getOrigin();
+        LocationDetails destination = msg.getDestination();
+        DateTime destinationETA = msg.getDestinationETA();
+        List<NavigationInstruction> instructions = msg.getInstructions();
+        DateTime nextInstructionETA = msg.getNextInstructionETA();
+        Float nextInstructionDistance = msg.getNextInstructionDistance();
+        Float nextInstructionDistanceScale = msg.getNextInstructionDistanceScale();
+        String prompt = msg.getPrompt();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_DATETIME, timestamp);
+        assertEquals(TestValues.GENERAL_LOCATIONDETAILS, origin);
+        assertEquals(TestValues.GENERAL_LOCATIONDETAILS, destination);
+        assertEquals(TestValues.GENERAL_DATETIME, destinationETA);
+        assertEquals(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST, instructions);
+        assertEquals(TestValues.GENERAL_DATETIME, nextInstructionETA);
+        assertEquals(TestValues.GENERAL_FLOAT, nextInstructionDistance);
+        assertEquals(TestValues.GENERAL_FLOAT, nextInstructionDistanceScale);
+        assertEquals(TestValues.GENERAL_STRING, prompt);
+
+        // Invalid/Null Tests
+        NavigationServiceData msg = new NavigationServiceData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getTimeStamp());
+        assertNull(TestValues.NULL, msg.getOrigin());
+        assertNull(TestValues.NULL, msg.getDestination());
+        assertNull(TestValues.NULL, msg.getDestinationETA());
+        assertNull(TestValues.NULL, msg.getInstructions());
+        assertNull(TestValues.NULL, msg.getNextInstructionETA());
+        assertNull(TestValues.NULL, msg.getNextInstructionDistance());
+        assertNull(TestValues.NULL, msg.getNextInstructionDistanceScale());
+        assertNull(TestValues.NULL, msg.getPrompt());
+    }
+
+    public void testRequiredConstructor() {
+        NavigationServiceData msg = new NavigationServiceData(TestValues.GENERAL_DATETIME);
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        DateTime locationDetails = msg.getTimeStamp();
+
+        assertEquals(TestValues.GENERAL_DATETIME, locationDetails);
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(NavigationServiceData.KEY_TIMESTAMP, TestValues.GENERAL_DATETIME);
+            reference.put(NavigationServiceData.KEY_ORIGIN, TestValues.GENERAL_LOCATIONDETAILS);
+            reference.put(NavigationServiceData.KEY_DESTINATION, TestValues.GENERAL_LOCATIONDETAILS);
+            reference.put(NavigationServiceData.KEY_DESTINATION_ETA, TestValues.GENERAL_DATETIME);
+            reference.put(NavigationServiceData.KEY_INSTRUCTIONS, TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST);
+            reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_ETA, TestValues.GENERAL_DATETIME);
+            reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_DISTANCE, TestValues.GENERAL_FLOAT);
+            reference.put(NavigationServiceData.KEY_NEXT_INSTRUCTION_DISTANCE_SCALE, TestValues.GENERAL_FLOAT);
+            reference.put(NavigationServiceData.KEY_PROMPT, TestValues.GENERAL_STRING);
+
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(NavigationServiceData.KEY_TIMESTAMP) || key.equals(NavigationServiceData.KEY_DESTINATION_ETA) || key.equals(NavigationServiceData.KEY_NEXT_INSTRUCTION_ETA)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest)));
+                } else if (key.equals(NavigationServiceData.KEY_DESTINATION) || key.equals(NavigationServiceData.KEY_ORIGIN)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateLocationDetails(TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest)));
+                } else if (key.equals(NavigationServiceData.KEY_INSTRUCTIONS)) {
+                    JSONArray NavigationInstructionUnderTestListArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    List<NavigationInstruction> NavigationInstructionUnderTestList = new ArrayList<>();
+                    for (int index = 0; index < NavigationInstructionUnderTestListArrayObjTest.length(); index++) {
+                        NavigationInstruction NavigationInstructionData = new NavigationInstruction(JsonRPCMarshaller.deserializeJSONObject((JSONObject) NavigationInstructionUnderTestListArrayObjTest.get(index)));
+                        NavigationInstructionUnderTestList.add(NavigationInstructionData);
+                    }
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateNavigationInstructionList(TestValues.GENERAL_NAVIGATION_INSTRUCTION_LIST, NavigationInstructionUnderTestList));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java
index b9298dcf6..3a95f1341 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/NavigationServiceManifestTests.java
@@ -17,48 +17,48 @@ import java.util.Iterator;
  */
 public class NavigationServiceManifestTests extends TestCase {
 
-	private NavigationServiceManifest msg;
-
-	@Override
-	public void setUp(){
-		msg = new NavigationServiceManifest();
-
-		msg.setAcceptsWayPoints(TestValues.GENERAL_BOOLEAN);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		boolean acceptsWayPoints = msg.getAcceptsWayPoints();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_BOOLEAN, acceptsWayPoints);
-
-		// Invalid/Null Tests
-		NavigationServiceManifest msg = new NavigationServiceManifest();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getAcceptsWayPoints());
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(NavigationServiceManifest.KEY_ACCEPTS_WAY_POINTS, TestValues.GENERAL_BOOLEAN);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private NavigationServiceManifest msg;
+
+    @Override
+    public void setUp() {
+        msg = new NavigationServiceManifest();
+
+        msg.setAcceptsWayPoints(TestValues.GENERAL_BOOLEAN);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        boolean acceptsWayPoints = msg.getAcceptsWayPoints();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_BOOLEAN, acceptsWayPoints);
+
+        // Invalid/Null Tests
+        NavigationServiceManifest msg = new NavigationServiceManifest();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getAcceptsWayPoints());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(NavigationServiceManifest.KEY_ACCEPTS_WAY_POINTS, TestValues.GENERAL_BOOLEAN);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java
index 2ea76cd1d..15f096713 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/OasisAddressTests.java
@@ -18,14 +18,14 @@ public class OasisAddressTests extends TestCase {
     private OasisAddress msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = TestValues.GENERAL_OASISADDRESS;
     }
 
     /**
      * Tests the expected values of the RPC message.
      */
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
         String f1 = msg.getAdministrativeArea();
         String f2 = msg.getSubAdministrativeArea();
@@ -64,10 +64,10 @@ public class OasisAddressTests extends TestCase {
         assertNull(msg.getSubThoroughfare());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(OasisAddress.KEY_ADMINISTRATIVE_AREA, TestValues.GENERAL_STRING);
             reference.put(OasisAddress.KEY_SUB_ADMINISTRATIVE_AREA, TestValues.GENERAL_STRING);
             reference.put(OasisAddress.KEY_COUNTRY_CODE, TestValues.GENERAL_STRING);
@@ -88,7 +88,7 @@ public class OasisAddressTests extends TestCase {
                         underTest.get(key));
             }
 
-        } catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
index 1b7074831..f9becd9f2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
@@ -14,15 +14,15 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ParameterPermissions}
  */
-public class ParameterPermissionsTests extends TestCase{
-    
+public class ParameterPermissionsTests extends TestCase {
+
     private ParameterPermissions msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new ParameterPermissions();
 
         msg.setAllowed(TestValues.GENERAL_STRING_LIST);
@@ -30,29 +30,29 @@ public class ParameterPermissionsTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-    	List<String> allowed = msg.getAllowed();
-    	List<String> disallowed = msg.getUserDisallowed();
-    	
-    	// Valid Tests
-    	assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, allowed));
-    	assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, disallowed));
-    	
-    	// Invalid/Null Tests
-    	ParameterPermissions msg = new ParameterPermissions();
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        List<String> allowed = msg.getAllowed();
+        List<String> disallowed = msg.getUserDisallowed();
+
+        // Valid Tests
+        assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, allowed));
+        assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, disallowed));
+
+        // Invalid/Null Tests
+        ParameterPermissions msg = new ParameterPermissions();
         assertNotNull(TestValues.NOT_NULL, msg);
-        
+
         assertNull(TestValues.NULL, msg.getAllowed());
         assertNull(TestValues.NULL, msg.getUserDisallowed());
     }
-    
-    public void testJson(){
+
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(ParameterPermissions.KEY_ALLOWED, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
             reference.put(ParameterPermissions.KEY_USER_DISALLOWED, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
 
@@ -60,12 +60,12 @@ public class ParameterPermissionsTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key)));
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
index 9fa3d7e2c..38eb020ea 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
@@ -15,77 +15,77 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.PermissionItem}
  */
 public class PermissionItemTest extends TestCase {
 
-	private PermissionItem msg;
+    private PermissionItem msg;
 
-	@Override
-	public void setUp() {
-		msg = new PermissionItem();
-		
-		msg.setRpcName(TestValues.GENERAL_STRING);
-		msg.setHMIPermissions(TestValues.GENERAL_HMIPERMISSIONS);
-		msg.setParameterPermissions(TestValues.GENERAL_PARAMETERPERMISSIONS);
-		msg.setRequireEncryption(TestValues.GENERAL_BOOLEAN);
-	}
+    @Override
+    public void setUp() {
+        msg = new PermissionItem();
+
+        msg.setRpcName(TestValues.GENERAL_STRING);
+        msg.setHMIPermissions(TestValues.GENERAL_HMIPERMISSIONS);
+        msg.setParameterPermissions(TestValues.GENERAL_PARAMETERPERMISSIONS);
+        msg.setRequireEncryption(TestValues.GENERAL_BOOLEAN);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		String rpcName = msg.getRpcName();
-		HMIPermissions hmiPermissions = msg.getHMIPermissions();
-		ParameterPermissions parameterPermissions = msg.getParameterPermissions();
-		boolean isEncryptionRequired = msg.getRequireEncryption();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, rpcName);
-    	assertTrue(TestValues.TRUE, Validator.validateHmiPermissions(TestValues.GENERAL_HMIPERMISSIONS, hmiPermissions));
-    	assertTrue(TestValues.TRUE, Validator.validateParameterPermissions(TestValues.GENERAL_PARAMETERPERMISSIONS, parameterPermissions));
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, isEncryptionRequired);
-    	
-    	// Invalid/Null Tests
-    	PermissionItem msg = new PermissionItem();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getRpcName());
-		assertNull(TestValues.NULL, msg.getHMIPermissions());
-		assertNull(TestValues.NULL, msg.getParameterPermissions());
-		assertNull(TestValues.NULL, msg.getRequireEncryption());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(PermissionItem.KEY_RPC_NAME, TestValues.GENERAL_STRING);
-			reference.put(PermissionItem.KEY_HMI_PERMISSIONS, TestValues.JSON_HMIPERMISSIONS);
-			reference.put(PermissionItem.KEY_PARAMETER_PERMISSIONS, TestValues.JSON_PARAMETERPERMISSIONS);
-			reference.put(PermissionItem.KEY_REQUIRE_ENCRYPTION, TestValues.GENERAL_BOOLEAN);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				
-				if (key.equals(PermissionItem.KEY_HMI_PERMISSIONS)) {
-					assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key)));
-				} else if (key.equals(PermissionItem.KEY_PARAMETER_PERMISSIONS)) {
-					assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key)));
-				} else if (key.equals(PermissionItem.KEY_REQUIRE_ENCRYPTION)) {
-					assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(reference, key), JsonUtils.readBooleanFromJsonObject(underTest, key));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        String rpcName = msg.getRpcName();
+        HMIPermissions hmiPermissions = msg.getHMIPermissions();
+        ParameterPermissions parameterPermissions = msg.getParameterPermissions();
+        boolean isEncryptionRequired = msg.getRequireEncryption();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, rpcName);
+        assertTrue(TestValues.TRUE, Validator.validateHmiPermissions(TestValues.GENERAL_HMIPERMISSIONS, hmiPermissions));
+        assertTrue(TestValues.TRUE, Validator.validateParameterPermissions(TestValues.GENERAL_PARAMETERPERMISSIONS, parameterPermissions));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, isEncryptionRequired);
+
+        // Invalid/Null Tests
+        PermissionItem msg = new PermissionItem();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getRpcName());
+        assertNull(TestValues.NULL, msg.getHMIPermissions());
+        assertNull(TestValues.NULL, msg.getParameterPermissions());
+        assertNull(TestValues.NULL, msg.getRequireEncryption());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(PermissionItem.KEY_RPC_NAME, TestValues.GENERAL_STRING);
+            reference.put(PermissionItem.KEY_HMI_PERMISSIONS, TestValues.JSON_HMIPERMISSIONS);
+            reference.put(PermissionItem.KEY_PARAMETER_PERMISSIONS, TestValues.JSON_PARAMETERPERMISSIONS);
+            reference.put(PermissionItem.KEY_REQUIRE_ENCRYPTION, TestValues.GENERAL_BOOLEAN);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(PermissionItem.KEY_HMI_PERMISSIONS)) {
+                    assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key)));
+                } else if (key.equals(PermissionItem.KEY_PARAMETER_PERMISSIONS)) {
+                    assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key)));
+                } else if (key.equals(PermissionItem.KEY_REQUIRE_ENCRYPTION)) {
+                    assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(reference, key), JsonUtils.readBooleanFromJsonObject(underTest, key));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java
index 2125eca16..f85890cbe 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PhoneCapabilityTests.java
@@ -12,25 +12,25 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.PhoneCapability}
  */
-public class PhoneCapabilityTests extends TestCase{
+public class PhoneCapabilityTests extends TestCase {
 
     private PhoneCapability msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new PhoneCapability();
 
         msg.setDialNumberEnabled(TestValues.GENERAL_BOOLEAN);
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
         boolean dialNumberEnabled = msg.getDialNumberEnabled();
 
         // Valid Tests
@@ -43,22 +43,22 @@ public class PhoneCapabilityTests extends TestCase{
         assertNull(TestValues.NULL, msg.getDialNumberEnabled());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(PhoneCapability.KEY_DIALNUMBER_ENABLED, TestValues.GENERAL_BOOLEAN);
 
             JSONObject underTest = msg.serializeJSON();
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
             }
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
index b614ce272..5556c8223 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
@@ -12,53 +12,53 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.PresetBankCapabilities}
  */
 public class PresetBankCapabilitiesTest extends TestCase {
-	
-	private PresetBankCapabilities msg;
 
-	@Override
-	public void setUp() {
-		msg = new PresetBankCapabilities();
-		
-		msg.setOnScreenPresetsAvailable(TestValues.GENERAL_BOOLEAN);
-	}
+    private PresetBankCapabilities msg;
+
+    @Override
+    public void setUp() {
+        msg = new PresetBankCapabilities();
+
+        msg.setOnScreenPresetsAvailable(TestValues.GENERAL_BOOLEAN);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		boolean presets = msg.onScreenPresetsAvailable();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, presets);
-		
-		// Invalid/Null Tests
-		PresetBankCapabilities msg = new PresetBankCapabilities();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.onScreenPresetsAvailable());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(PresetBankCapabilities.KEY_ON_SCREEN_PRESETS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        boolean presets = msg.onScreenPresetsAvailable();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, presets);
+
+        // Invalid/Null Tests
+        PresetBankCapabilities msg = new PresetBankCapabilities();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.onScreenPresetsAvailable());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(PresetBankCapabilities.KEY_ON_SCREEN_PRESETS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java
index d2f0254f4..ebf7fb31c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RGBColorTest.java
@@ -12,59 +12,59 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.RGBColor}
  */
 public class RGBColorTest extends TestCase {
-	
-	private RGBColor msg;
 
-	@Override
-	public void setUp() {
-		msg = new RGBColor(TestValues.GENERAL_INT, TestValues.GENERAL_INT, TestValues.GENERAL_INT);
-	}
+    private RGBColor msg;
+
+    @Override
+    public void setUp() {
+        msg = new RGBColor(TestValues.GENERAL_INT, TestValues.GENERAL_INT, TestValues.GENERAL_INT);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		Integer red = msg.getRed();
-		Integer green = msg.getGreen();
-		Integer blue = msg.getBlue();
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Integer red = msg.getRed();
+        Integer green = msg.getGreen();
+        Integer blue = msg.getBlue();
 
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, red);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, green);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, blue);
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, red);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, green);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, blue);
 
-		// Invalid/Null Tests
-		RGBColor msg = new RGBColor();
-		assertNotNull(TestValues.NOT_NULL, msg);
+        // Invalid/Null Tests
+        RGBColor msg = new RGBColor();
+        assertNotNull(TestValues.NOT_NULL, msg);
 
-		assertEquals(TestValues.MATCH, msg.getRed(), (Integer) 0);
-		assertEquals(TestValues.MATCH, msg.getGreen(), (Integer) 0);
-		assertEquals(TestValues.MATCH, msg.getBlue(), (Integer) 0);
-	}
+        assertEquals(TestValues.MATCH, msg.getRed(), (Integer) 0);
+        assertEquals(TestValues.MATCH, msg.getGreen(), (Integer) 0);
+        assertEquals(TestValues.MATCH, msg.getBlue(), (Integer) 0);
+    }
 
-	public void testJson() {
-		JSONObject reference = new JSONObject();
+    public void testJson() {
+        JSONObject reference = new JSONObject();
 
-		try {
-			reference.put(RGBColor.KEY_RED, TestValues.GENERAL_INT);
-			reference.put(RGBColor.KEY_GREEN, TestValues.GENERAL_INT);
-			reference.put(RGBColor.KEY_BLUE, TestValues.GENERAL_INT);
+        try {
+            reference.put(RGBColor.KEY_RED, TestValues.GENERAL_INT);
+            reference.put(RGBColor.KEY_GREEN, TestValues.GENERAL_INT);
+            reference.put(RGBColor.KEY_BLUE, TestValues.GENERAL_INT);
 
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java
index 143c6cb99..dd57d9b16 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlCapabilitiesTests.java
@@ -19,12 +19,12 @@ import java.util.Iterator;
  * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.RadioControlCapabilities}
  */
-public class RadioControlCapabilitiesTests extends TestCase{
-	
+public class RadioControlCapabilitiesTests extends TestCase {
+
     private RadioControlCapabilities msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new RadioControlCapabilities();
 
         msg.setModuleName(TestValues.GENERAL_STRING);
@@ -45,9 +45,9 @@ public class RadioControlCapabilitiesTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
         // Test Values
         String moduleName = msg.getModuleName();
         boolean radioEnableAvailable = msg.getRadioEnableAvailable();
@@ -104,10 +104,10 @@ public class RadioControlCapabilitiesTests extends TestCase{
         assertNull(TestValues.NULL, msg.getAvailableHdChannelsAvailable());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(RadioControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
             reference.put(RadioControlCapabilities.KEY_RADIO_ENABLE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
             reference.put(RadioControlCapabilities.KEY_RADIO_BAND_AVAILABLE, TestValues.GENERAL_BOOLEAN);
@@ -128,7 +128,7 @@ public class RadioControlCapabilitiesTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
                 if (key.equals(RadioControlCapabilities.KEY_MODULE_INFO)) {
                     JSONObject o1 = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
@@ -141,8 +141,8 @@ public class RadioControlCapabilitiesTests extends TestCase{
                 }
 
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java
index e5ac58518..de934e2bc 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RadioControlDataTests.java
@@ -23,12 +23,12 @@ import java.util.List;
  * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.RadioControlData}
  */
-public class RadioControlDataTests extends TestCase{
-	
+public class RadioControlDataTests extends TestCase {
+
     private RadioControlData msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new RadioControlData();
 
         msg.setFrequencyInteger(TestValues.GENERAL_INT);
@@ -47,9 +47,9 @@ public class RadioControlDataTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
         // Test Values
         int frequencyInteger = msg.getFrequencyInteger();
         int frequencyFraction = msg.getFrequencyFraction();
@@ -99,10 +99,10 @@ public class RadioControlDataTests extends TestCase{
         assertNull(TestValues.NULL, msg.getAvailableHdChannels());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(RadioControlData.KEY_FREQUENCY_INTEGER, TestValues.GENERAL_INT);
             reference.put(RadioControlData.KEY_FREQUENCY_FRACTION, TestValues.GENERAL_INT);
             reference.put(RadioControlData.KEY_BAND, TestValues.GENERAL_RADIOBAND);
@@ -121,31 +121,31 @@ public class RadioControlDataTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
-                if(key.equals(RadioControlData.KEY_RDS_DATA)){
+                if (key.equals(RadioControlData.KEY_RDS_DATA)) {
                     JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
                     JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
                     Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
                     Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
                     assertTrue(TestValues.TRUE, Validator.validateRdsData(new RdsData(hashReference), new RdsData(hashTest)));
                 } else if (key.equals(RadioControlData.KEY_SIS_DATA)) {
-	                JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-	                JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-	                Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-	                Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-	                assertTrue(TestValues.TRUE, Validator.validateSisData(new SisData(hashReference), new SisData(hashTest)));
-                } else if(key.equals(RadioControlData.KEY_AVAILABLE_HD_CHANNELS)){
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateSisData(new SisData(hashReference), new SisData(hashTest)));
+                } else if (key.equals(RadioControlData.KEY_AVAILABLE_HD_CHANNELS)) {
                     List<Integer> list1 = TestValues.GENERAL_AVAILABLE_HD_CHANNELS_LIST;
                     List<Integer> list2 = JsonUtils.readIntegerListFromJsonObject(underTest, key);
-                    assertTrue(TestValues.TRUE, Validator.validateIntegerList(list1,list2));
-                } else{
+                    assertTrue(TestValues.TRUE, Validator.validateIntegerList(list1, list2));
+                } else {
                     assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
                 }
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java
index b7b468751..61e5ac127 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RdsDataTests.java
@@ -12,15 +12,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.RdsData}
  */
-public class RdsDataTests extends TestCase{
-	
+public class RdsDataTests extends TestCase {
+
     private RdsData msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new RdsData();
 
         msg.setProgramService(TestValues.GENERAL_STRING);
@@ -34,9 +34,9 @@ public class RdsDataTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
         // Test Values
         String ps = msg.getProgramService();
         String rt = msg.getRadioText();
@@ -71,10 +71,10 @@ public class RdsDataTests extends TestCase{
         assertNull(TestValues.NULL, msg.getProgramType());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(RdsData.KEY_PS, TestValues.GENERAL_STRING);
             reference.put(RdsData.KEY_RT, TestValues.GENERAL_STRING);
             reference.put(RdsData.KEY_CT, TestValues.GENERAL_STRING);
@@ -88,14 +88,14 @@ public class RdsDataTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
 
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java
index ec8bcad9c..c30a8e5a1 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RectangleTests.java
@@ -17,63 +17,63 @@ import java.util.Iterator;
  */
 public class RectangleTests extends TestCase {
 
-	private Rectangle msg;
-
-	@Override
-	public void setUp() {
-		msg = new Rectangle();
-
-		msg.setX(TestValues.GENERAL_FLOAT);
-		msg.setY(TestValues.GENERAL_FLOAT);
-		msg.setWidth(TestValues.GENERAL_FLOAT);
-		msg.setHeight(TestValues.GENERAL_FLOAT);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		Float x = msg.getX();
-		Float y = msg.getY();
-		Float width = msg.getWidth();
-		Float height = msg.getHeight();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, x);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, y);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, width);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, height);
-
-		// Invalid/Null Tests
-		Rectangle msg = new Rectangle();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getX());
-		assertNull(TestValues.NULL, msg.getY());
-		assertNull(TestValues.NULL, msg.getWidth());
-		assertNull(TestValues.NULL, msg.getHeight());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(Rectangle.KEY_X, (TestValues.GENERAL_FLOAT));
-			reference.put(Rectangle.KEY_Y, (TestValues.GENERAL_FLOAT));
-			reference.put(Rectangle.KEY_WIDTH, (TestValues.GENERAL_FLOAT));
-			reference.put(Rectangle.KEY_HEIGHT, (TestValues.GENERAL_FLOAT));
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private Rectangle msg;
+
+    @Override
+    public void setUp() {
+        msg = new Rectangle();
+
+        msg.setX(TestValues.GENERAL_FLOAT);
+        msg.setY(TestValues.GENERAL_FLOAT);
+        msg.setWidth(TestValues.GENERAL_FLOAT);
+        msg.setHeight(TestValues.GENERAL_FLOAT);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Float x = msg.getX();
+        Float y = msg.getY();
+        Float width = msg.getWidth();
+        Float height = msg.getHeight();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, x);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, y);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, width);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, height);
+
+        // Invalid/Null Tests
+        Rectangle msg = new Rectangle();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getX());
+        assertNull(TestValues.NULL, msg.getY());
+        assertNull(TestValues.NULL, msg.getWidth());
+        assertNull(TestValues.NULL, msg.getHeight());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(Rectangle.KEY_X, (TestValues.GENERAL_FLOAT));
+            reference.put(Rectangle.KEY_Y, (TestValues.GENERAL_FLOAT));
+            reference.put(Rectangle.KEY_WIDTH, (TestValues.GENERAL_FLOAT));
+            reference.put(Rectangle.KEY_HEIGHT, (TestValues.GENERAL_FLOAT));
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java
index fed1fafda..88dde9f75 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/RemoteControlCapabilitiesTests.java
@@ -30,151 +30,151 @@ import java.util.List;
  */
 public class RemoteControlCapabilitiesTests extends TestCase {
 
-	private RemoteControlCapabilities msg;
-
-	@Override
-	public void setUp() {
-		msg = new RemoteControlCapabilities();
-		msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST);
-		msg.setRadioControlCapabilities(TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST);
-		msg.setClimateControlCapabilities(TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST);
-		msg.setSeatControlCapabilities(TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST);
-		msg.setAudioControlCapabilities(TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST);
-		msg.setHmiSettingsControlCapabilities(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES);
-		msg.setLightControlCapabilities(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		List<ButtonCapabilities> buttonCapabilities = msg.getButtonCapabilities();
-		List<RadioControlCapabilities> radioControlCapabilities = msg.getRadioControlCapabilities();
-		List<ClimateControlCapabilities> climateControlCapabilities = msg.getClimateControlCapabilities();
-		List<SeatControlCapabilities> seatControlCapabilities = msg.getSeatControlCapabilities();
-		List<AudioControlCapabilities> audioControlCapabilities = msg.getAudioControlCapabilities();
-		HMISettingsControlCapabilities hmiSettingsControlCapabilities = msg.getHmiSettingsControlCapabilities();
-		LightControlCapabilities lightControlCapabilities = msg.getLightControlCapabilities();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(), buttonCapabilities.size());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST.size(), radioControlCapabilities.size());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST.size(), climateControlCapabilities.size());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST.size(), seatControlCapabilities.size());
-
-		assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, buttonCapabilities));
-		assertTrue(TestValues.TRUE, Validator.validateRadioControlCapabilities(TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST, radioControlCapabilities));
-		assertTrue(TestValues.TRUE, Validator.validateClimateControlCapabilities(TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST, climateControlCapabilities));
-		assertTrue(TestValues.TRUE, Validator.validateSeatControlCapabilitiesList(TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST, seatControlCapabilities));
-		assertTrue(TestValues.TRUE, Validator.validateAudioControlCapabilitiesList(TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST, audioControlCapabilities));
-		assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlCapabilities(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES, hmiSettingsControlCapabilities));
-		assertTrue(TestValues.TRUE, Validator.validateLightControlCapabilities(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES, lightControlCapabilities));
-
-		// Invalid/Null Tests
-		RemoteControlCapabilities msg = new RemoteControlCapabilities();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getButtonCapabilities());
-		assertNull(TestValues.NULL, msg.getRadioControlCapabilities());
-		assertNull(TestValues.NULL, msg.getClimateControlCapabilities());
-		assertNull(TestValues.NULL, msg.getSeatControlCapabilities());
-		assertNull(TestValues.NULL, msg.getAudioControlCapabilities());
-		assertNull(TestValues.NULL, msg.getHmiSettingsControlCapabilities());
-		assertNull(TestValues.NULL, msg.getLightControlCapabilities());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES);
-			reference.put(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES, TestValues.JSON_RADIOCONTROLCAPABILITIES);
-			reference.put(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES, TestValues.JSON_CLIMATECONTROLCAPABILITIES);
-			reference.put(RemoteControlCapabilities.KEY_SEAT_CONTROL_CAPABILITIES, TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST);
-			reference.put(RemoteControlCapabilities.KEY_AUDIO_CONTROL_CAPABILITIES, TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST);
-			reference.put(RemoteControlCapabilities.KEY_HMI_SETTINGS_CONTROL_CAPABILITIES, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES.getStore()));
-			reference.put(RemoteControlCapabilities.KEY_LIGHT_CONTROL_CAPABILITIES, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES.getStore()));
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				if (key.equals(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES)) {
-					JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-					JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
-
-					List<ButtonCapabilities> referenceList = new ArrayList<ButtonCapabilities>();
-					List<ButtonCapabilities> testList = new ArrayList<ButtonCapabilities>();
-					for (int i = 0; i < referenceArray.length(); i++) {
-						Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
-						referenceList.add(new ButtonCapabilities(hashReference));
-						Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
-						testList.add(new ButtonCapabilities(hashTest));
-					}
-					assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(referenceList, testList));
-				} else if (key.equals(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES)) {
-					JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-					JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
-
-					List<RadioControlCapabilities> referenceList = new ArrayList<RadioControlCapabilities>();
-					List<RadioControlCapabilities> testList = new ArrayList<RadioControlCapabilities>();
-					for (int i = 0; i < referenceArray.length(); i++) {
-						Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
-						referenceList.add(new RadioControlCapabilities(hashReference));
-						Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
-						testList.add(new RadioControlCapabilities(hashTest));
-					}
-					assertTrue(TestValues.TRUE, Validator.validateRadioControlCapabilities(referenceList, testList));
-				} else if (key.equals(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES)) {
-					JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-					JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
-
-					List<ClimateControlCapabilities> referenceList = new ArrayList<ClimateControlCapabilities>();
-					List<ClimateControlCapabilities> testList = new ArrayList<ClimateControlCapabilities>();
-					for (int i = 0; i < referenceArray.length(); i++) {
-						Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
-						referenceList.add(new ClimateControlCapabilities(hashReference));
-						Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
-						testList.add(new ClimateControlCapabilities(hashTest));
-					}
-					assertTrue(TestValues.TRUE, Validator.validateClimateControlCapabilities(referenceList, testList));
-				} else if (key.equals(RemoteControlCapabilities.KEY_SEAT_CONTROL_CAPABILITIES)) {
-					List<SeatControlCapabilities> sccReference = (List<SeatControlCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONArray sccArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					int i = 0;
-					for (SeatControlCapabilities scc : sccReference) {
-						assertTrue(Validator.validateSeatControlCapabilities(scc, new SeatControlCapabilities(JsonRPCMarshaller.deserializeJSONObject(sccArray.getJSONObject(i++)))));
-					}
-				} else if (key.equals(RemoteControlCapabilities.KEY_AUDIO_CONTROL_CAPABILITIES)) {
-					List<AudioControlCapabilities> accReference = (List<AudioControlCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONArray accArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					int i = 0;
-					for (AudioControlCapabilities acc : accReference) {
-						assertTrue(Validator.validateAudioControlCapabilities(acc, new AudioControlCapabilities(JsonRPCMarshaller.deserializeJSONObject(accArray.getJSONObject(i++)))));
-					}
-				} else if (key.equals(RemoteControlCapabilities.KEY_HMI_SETTINGS_CONTROL_CAPABILITIES)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlCapabilities(new HMISettingsControlCapabilities(hashReference), new HMISettingsControlCapabilities(hashTest)));
-				} else if (key.equals(RemoteControlCapabilities.KEY_LIGHT_CONTROL_CAPABILITIES)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateLightControlCapabilities(new LightControlCapabilities(hashReference), new LightControlCapabilities(hashTest)));
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private RemoteControlCapabilities msg;
+
+    @Override
+    public void setUp() {
+        msg = new RemoteControlCapabilities();
+        msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST);
+        msg.setRadioControlCapabilities(TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST);
+        msg.setClimateControlCapabilities(TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST);
+        msg.setSeatControlCapabilities(TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST);
+        msg.setAudioControlCapabilities(TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST);
+        msg.setHmiSettingsControlCapabilities(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES);
+        msg.setLightControlCapabilities(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        List<ButtonCapabilities> buttonCapabilities = msg.getButtonCapabilities();
+        List<RadioControlCapabilities> radioControlCapabilities = msg.getRadioControlCapabilities();
+        List<ClimateControlCapabilities> climateControlCapabilities = msg.getClimateControlCapabilities();
+        List<SeatControlCapabilities> seatControlCapabilities = msg.getSeatControlCapabilities();
+        List<AudioControlCapabilities> audioControlCapabilities = msg.getAudioControlCapabilities();
+        HMISettingsControlCapabilities hmiSettingsControlCapabilities = msg.getHmiSettingsControlCapabilities();
+        LightControlCapabilities lightControlCapabilities = msg.getLightControlCapabilities();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(), buttonCapabilities.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST.size(), radioControlCapabilities.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST.size(), climateControlCapabilities.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST.size(), seatControlCapabilities.size());
+
+        assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, buttonCapabilities));
+        assertTrue(TestValues.TRUE, Validator.validateRadioControlCapabilities(TestValues.GENERAL_RADIOCONTROLCAPABILITIES_LIST, radioControlCapabilities));
+        assertTrue(TestValues.TRUE, Validator.validateClimateControlCapabilities(TestValues.GENERAL_CLIMATECONTROLCAPABILITIES_LIST, climateControlCapabilities));
+        assertTrue(TestValues.TRUE, Validator.validateSeatControlCapabilitiesList(TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST, seatControlCapabilities));
+        assertTrue(TestValues.TRUE, Validator.validateAudioControlCapabilitiesList(TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST, audioControlCapabilities));
+        assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlCapabilities(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES, hmiSettingsControlCapabilities));
+        assertTrue(TestValues.TRUE, Validator.validateLightControlCapabilities(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES, lightControlCapabilities));
+
+        // Invalid/Null Tests
+        RemoteControlCapabilities msg = new RemoteControlCapabilities();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getButtonCapabilities());
+        assertNull(TestValues.NULL, msg.getRadioControlCapabilities());
+        assertNull(TestValues.NULL, msg.getClimateControlCapabilities());
+        assertNull(TestValues.NULL, msg.getSeatControlCapabilities());
+        assertNull(TestValues.NULL, msg.getAudioControlCapabilities());
+        assertNull(TestValues.NULL, msg.getHmiSettingsControlCapabilities());
+        assertNull(TestValues.NULL, msg.getLightControlCapabilities());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES);
+            reference.put(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES, TestValues.JSON_RADIOCONTROLCAPABILITIES);
+            reference.put(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES, TestValues.JSON_CLIMATECONTROLCAPABILITIES);
+            reference.put(RemoteControlCapabilities.KEY_SEAT_CONTROL_CAPABILITIES, TestValues.GENERAL_SEATCONTROLCAPABILITIES_LIST);
+            reference.put(RemoteControlCapabilities.KEY_AUDIO_CONTROL_CAPABILITIES, TestValues.GENERAL_AUDIOCONTROLCAPABILITIES_LIST);
+            reference.put(RemoteControlCapabilities.KEY_HMI_SETTINGS_CONTROL_CAPABILITIES, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HMISETTINGSCONTROLCAPABILITIES.getStore()));
+            reference.put(RemoteControlCapabilities.KEY_LIGHT_CONTROL_CAPABILITIES, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_LIGHTCONTROLCAPABILITIES.getStore()));
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(RemoteControlCapabilities.KEY_BUTTON_CAPABILITIES)) {
+                    JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                    JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
+
+                    List<ButtonCapabilities> referenceList = new ArrayList<ButtonCapabilities>();
+                    List<ButtonCapabilities> testList = new ArrayList<ButtonCapabilities>();
+                    for (int i = 0; i < referenceArray.length(); i++) {
+                        Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
+                        referenceList.add(new ButtonCapabilities(hashReference));
+                        Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
+                        testList.add(new ButtonCapabilities(hashTest));
+                    }
+                    assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(referenceList, testList));
+                } else if (key.equals(RemoteControlCapabilities.KEY_RADIO_CONTROL_CAPABILITIES)) {
+                    JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                    JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
+
+                    List<RadioControlCapabilities> referenceList = new ArrayList<RadioControlCapabilities>();
+                    List<RadioControlCapabilities> testList = new ArrayList<RadioControlCapabilities>();
+                    for (int i = 0; i < referenceArray.length(); i++) {
+                        Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
+                        referenceList.add(new RadioControlCapabilities(hashReference));
+                        Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
+                        testList.add(new RadioControlCapabilities(hashTest));
+                    }
+                    assertTrue(TestValues.TRUE, Validator.validateRadioControlCapabilities(referenceList, testList));
+                } else if (key.equals(RemoteControlCapabilities.KEY_CLIMATE_CONTROL_CAPABILITIES)) {
+                    JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                    JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
+
+                    List<ClimateControlCapabilities> referenceList = new ArrayList<ClimateControlCapabilities>();
+                    List<ClimateControlCapabilities> testList = new ArrayList<ClimateControlCapabilities>();
+                    for (int i = 0; i < referenceArray.length(); i++) {
+                        Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
+                        referenceList.add(new ClimateControlCapabilities(hashReference));
+                        Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
+                        testList.add(new ClimateControlCapabilities(hashTest));
+                    }
+                    assertTrue(TestValues.TRUE, Validator.validateClimateControlCapabilities(referenceList, testList));
+                } else if (key.equals(RemoteControlCapabilities.KEY_SEAT_CONTROL_CAPABILITIES)) {
+                    List<SeatControlCapabilities> sccReference = (List<SeatControlCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONArray sccArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    int i = 0;
+                    for (SeatControlCapabilities scc : sccReference) {
+                        assertTrue(Validator.validateSeatControlCapabilities(scc, new SeatControlCapabilities(JsonRPCMarshaller.deserializeJSONObject(sccArray.getJSONObject(i++)))));
+                    }
+                } else if (key.equals(RemoteControlCapabilities.KEY_AUDIO_CONTROL_CAPABILITIES)) {
+                    List<AudioControlCapabilities> accReference = (List<AudioControlCapabilities>) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONArray accArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    int i = 0;
+                    for (AudioControlCapabilities acc : accReference) {
+                        assertTrue(Validator.validateAudioControlCapabilities(acc, new AudioControlCapabilities(JsonRPCMarshaller.deserializeJSONObject(accArray.getJSONObject(i++)))));
+                    }
+                } else if (key.equals(RemoteControlCapabilities.KEY_HMI_SETTINGS_CONTROL_CAPABILITIES)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateHMISettingsControlCapabilities(new HMISettingsControlCapabilities(hashReference), new HMISettingsControlCapabilities(hashTest)));
+                } else if (key.equals(RemoteControlCapabilities.KEY_LIGHT_CONTROL_CAPABILITIES)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateLightControlCapabilities(new LightControlCapabilities(hashReference), new LightControlCapabilities(hashTest)));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
index eb618abcf..0e69ca513 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
@@ -16,75 +16,75 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ScreenParams}
  */
 public class ScreenParamsTest extends TestCase {
-	    
-	private ScreenParams msg;
 
-	@Override
-	public void setUp() {
-		msg = new ScreenParams();
-		
-		msg.setImageResolution(TestValues.GENERAL_IMAGERESOLUTION);
-		msg.setTouchEventAvailable(TestValues.GENERAL_TOUCHEVENTCAPABILITIES);
-	}
+    private ScreenParams msg;
+
+    @Override
+    public void setUp() {
+        msg = new ScreenParams();
+
+        msg.setImageResolution(TestValues.GENERAL_IMAGERESOLUTION);
+        msg.setTouchEventAvailable(TestValues.GENERAL_TOUCHEVENTCAPABILITIES);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		ImageResolution imageRes = msg.getImageResolution();
-		TouchEventCapabilities touchEvent = msg.getTouchEventAvailable();
-		
-		// Valid Tests
-		assertTrue(TestValues.TRUE, Validator.validateImageResolution(TestValues.GENERAL_IMAGERESOLUTION, imageRes));
-		assertTrue(TestValues.TRUE, Validator.validateTouchEventCapabilities(TestValues.GENERAL_TOUCHEVENTCAPABILITIES, touchEvent));
-		
-		// Invalid/Null Tests
-		ScreenParams msg = new ScreenParams();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getImageResolution());
-		assertNull(TestValues.NULL, msg.getTouchEventAvailable());
-	}
-    
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(ScreenParams.KEY_RESOLUTION, TestValues.JSON_IMAGERESOLUTION);
-			reference.put(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE, TestValues.JSON_TOUCHEVENTCAPABILITIES);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				
-				if (key.equals(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE)) {
-					JSONObject touchEventObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject touchEventObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateTouchEventCapabilities(
-						new TouchEventCapabilities(JsonRPCMarshaller.deserializeJSONObject(touchEventObjReference)),
-						new TouchEventCapabilities(JsonRPCMarshaller.deserializeJSONObject(touchEventObjTest))));
-				} else if (key.equals(ScreenParams.KEY_RESOLUTION)) {
-					JSONObject resolutionObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject resolutionObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateImageResolution(
-						new ImageResolution(JsonRPCMarshaller.deserializeJSONObject(resolutionObjReference)),
-						new ImageResolution(JsonRPCMarshaller.deserializeJSONObject(resolutionObjTest))));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        ImageResolution imageRes = msg.getImageResolution();
+        TouchEventCapabilities touchEvent = msg.getTouchEventAvailable();
+
+        // Valid Tests
+        assertTrue(TestValues.TRUE, Validator.validateImageResolution(TestValues.GENERAL_IMAGERESOLUTION, imageRes));
+        assertTrue(TestValues.TRUE, Validator.validateTouchEventCapabilities(TestValues.GENERAL_TOUCHEVENTCAPABILITIES, touchEvent));
+
+        // Invalid/Null Tests
+        ScreenParams msg = new ScreenParams();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getImageResolution());
+        assertNull(TestValues.NULL, msg.getTouchEventAvailable());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(ScreenParams.KEY_RESOLUTION, TestValues.JSON_IMAGERESOLUTION);
+            reference.put(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE, TestValues.JSON_TOUCHEVENTCAPABILITIES);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(ScreenParams.KEY_TOUCH_EVENT_AVAILABLE)) {
+                    JSONObject touchEventObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject touchEventObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateTouchEventCapabilities(
+                            new TouchEventCapabilities(JsonRPCMarshaller.deserializeJSONObject(touchEventObjReference)),
+                            new TouchEventCapabilities(JsonRPCMarshaller.deserializeJSONObject(touchEventObjTest))));
+                } else if (key.equals(ScreenParams.KEY_RESOLUTION)) {
+                    JSONObject resolutionObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject resolutionObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateImageResolution(
+                            new ImageResolution(JsonRPCMarshaller.deserializeJSONObject(resolutionObjReference)),
+                            new ImageResolution(JsonRPCMarshaller.deserializeJSONObject(resolutionObjTest))));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
index 8cadc99bf..0b8eb2842 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
@@ -12,63 +12,63 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SdlMsgVersion}
  */
 public class SdlMsgVersionTest extends TestCase {
-	
-	private SdlMsgVersion msg;
 
-	@Override
-	public void setUp() {
-		msg = new SdlMsgVersion();
+    private SdlMsgVersion msg;
 
-		msg.setMajorVersion(TestValues.GENERAL_INT);
-		msg.setMinorVersion(TestValues.GENERAL_INT);
-		msg.setPatchVersion(TestValues.GENERAL_INT);
-	}
+    @Override
+    public void setUp() {
+        msg = new SdlMsgVersion();
+
+        msg.setMajorVersion(TestValues.GENERAL_INT);
+        msg.setMinorVersion(TestValues.GENERAL_INT);
+        msg.setPatchVersion(TestValues.GENERAL_INT);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		Integer major = msg.getMajorVersion();
-		Integer minor = msg.getMinorVersion();
-		Integer patch = msg.getPatchVersion();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, major);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, minor);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, patch);
-
-		// Invalid/Null Tests
-		SdlMsgVersion msg = new SdlMsgVersion();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getMajorVersion());
-		assertNull(TestValues.NULL, msg.getMinorVersion());
-		assertNull(TestValues.NULL, msg.getPatchVersion());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(SdlMsgVersion.KEY_MAJOR_VERSION, TestValues.GENERAL_INT);
-			reference.put(SdlMsgVersion.KEY_MINOR_VERSION, TestValues.GENERAL_INT);
-			reference.put(SdlMsgVersion.KEY_PATCH_VERSION, TestValues.GENERAL_INT);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Integer major = msg.getMajorVersion();
+        Integer minor = msg.getMinorVersion();
+        Integer patch = msg.getPatchVersion();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, major);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, minor);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, patch);
+
+        // Invalid/Null Tests
+        SdlMsgVersion msg = new SdlMsgVersion();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getMajorVersion());
+        assertNull(TestValues.NULL, msg.getMinorVersion());
+        assertNull(TestValues.NULL, msg.getPatchVersion());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(SdlMsgVersion.KEY_MAJOR_VERSION, TestValues.GENERAL_INT);
+            reference.put(SdlMsgVersion.KEY_MINOR_VERSION, TestValues.GENERAL_INT);
+            reference.put(SdlMsgVersion.KEY_PATCH_VERSION, TestValues.GENERAL_INT);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java
index 2831d2416..8e5001035 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlCapabilitiesTest.java
@@ -17,125 +17,125 @@ import java.util.Iterator;
  */
 public class SeatControlCapabilitiesTest extends TestCase {
 
-	private SeatControlCapabilities msg;
-
-	@Override
-	public void setUp() {
-		msg = new SeatControlCapabilities();
-		msg.setModuleName(TestValues.GENERAL_STRING);
-		msg.setHeatingEnabledAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setCoolingEnabledAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setHeatingLevelAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setCoolingLevelAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setHorizontalPositionAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setFrontVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setBackVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setBackTiltAngleAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setHeadSupportVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setHeadSupportHorizontalPositionAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setMassageEnabledAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setMassageModeAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setMassageCushionFirmnessAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setMemoryAvailable(TestValues.GENERAL_BOOLEAN);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		String moduleName = msg.getModuleName();
-		Boolean heatingEnabledAvailable = msg.getHeatingEnabledAvailable();
-		Boolean coolingEnabledAvailable = msg.getCoolingEnabledAvailable();
-		Boolean heatingLevelAvailable = msg.getHeatingLevelAvailable();
-		Boolean coolingLevelAvailable = msg.getCoolingLevelAvailable();
-		Boolean horizontalPositionAvailable = msg.getHorizontalPositionAvailable();
-		Boolean verticalPositionAvailable = msg.getVerticalPositionAvailable();
-		Boolean frontVerticalPositionAvailable = msg.getFrontVerticalPositionAvailable();
-		Boolean backVerticalPositionAvailable = msg.getBackVerticalPositionAvailable();
-		Boolean backTiltAngleAvailable = msg.getBackTiltAngleAvailable();
-		Boolean headSupportHorizontalPositionAvailable = msg.getHeadSupportHorizontalPositionAvailable();
-		Boolean headSupportVerticalPositionAvailable = msg.getHeadSupportVerticalPositionAvailable();
-		Boolean massageEnabledAvailable = msg.getMassageEnabledAvailable();
-		Boolean massageModeAvailable = msg.getMassageModeAvailable();
-		Boolean massageCushionFirmnessAvailable = msg.getMassageCushionFirmnessAvailable();
-
-		Boolean memoryAvailable = msg.getMemoryAvailable();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingEnabledAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingEnabledAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingLevelAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingLevelAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, horizontalPositionAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, verticalPositionAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, frontVerticalPositionAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, backVerticalPositionAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, backTiltAngleAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, headSupportHorizontalPositionAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, headSupportVerticalPositionAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageEnabledAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageModeAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageCushionFirmnessAvailable);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, memoryAvailable);
-
-		// Invalid/Null Tests
-		SeatControlCapabilities msg = new SeatControlCapabilities();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getModuleName());
-		assertNull(TestValues.NULL, msg.getHeatingEnabledAvailable());
-		assertNull(TestValues.NULL, msg.getCoolingEnabledAvailable());
-		assertNull(TestValues.NULL, msg.getHeatingLevelAvailable());
-		assertNull(TestValues.NULL, msg.getCoolingLevelAvailable());
-		assertNull(TestValues.NULL, msg.getHorizontalPositionAvailable());
-		assertNull(TestValues.NULL, msg.getVerticalPositionAvailable());
-		assertNull(TestValues.NULL, msg.getFrontVerticalPositionAvailable());
-		assertNull(TestValues.NULL, msg.getBackVerticalPositionAvailable());
-		assertNull(TestValues.NULL, msg.getBackTiltAngleAvailable());
-		assertNull(TestValues.NULL, msg.getHeadSupportHorizontalPositionAvailable());
-		assertNull(TestValues.NULL, msg.getHeadSupportVerticalPositionAvailable());
-		assertNull(TestValues.NULL, msg.getMassageEnabledAvailable());
-		assertNull(TestValues.NULL, msg.getMassageModeAvailable());
-		assertNull(TestValues.NULL, msg.getMassageCushionFirmnessAvailable());
-		assertNull(TestValues.NULL, msg.getMemoryAvailable());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(SeatControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
-			reference.put(SeatControlCapabilities.KEY_HEATING_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_COOLING_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_HEATING_LEVEL_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_COOLING_LEVEL_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_HORIZONTAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_FRONT_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_BACK_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_BACK_TILT_ANGLE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_HEAD_SUPPORT_HORIZONTAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_HEAD_SUPPORT_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_MASSAGE_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-
-			reference.put(SeatControlCapabilities.KEY_MASSAGE_MODE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlCapabilities.KEY_MASSAGE_CUSHION_FIRMNESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-
-			reference.put(SeatControlCapabilities.KEY_MEMORY_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private SeatControlCapabilities msg;
+
+    @Override
+    public void setUp() {
+        msg = new SeatControlCapabilities();
+        msg.setModuleName(TestValues.GENERAL_STRING);
+        msg.setHeatingEnabledAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setCoolingEnabledAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setHeatingLevelAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setCoolingLevelAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setHorizontalPositionAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setFrontVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setBackVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setBackTiltAngleAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setHeadSupportVerticalPositionAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setHeadSupportHorizontalPositionAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setMassageEnabledAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setMassageModeAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setMassageCushionFirmnessAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setMemoryAvailable(TestValues.GENERAL_BOOLEAN);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        String moduleName = msg.getModuleName();
+        Boolean heatingEnabledAvailable = msg.getHeatingEnabledAvailable();
+        Boolean coolingEnabledAvailable = msg.getCoolingEnabledAvailable();
+        Boolean heatingLevelAvailable = msg.getHeatingLevelAvailable();
+        Boolean coolingLevelAvailable = msg.getCoolingLevelAvailable();
+        Boolean horizontalPositionAvailable = msg.getHorizontalPositionAvailable();
+        Boolean verticalPositionAvailable = msg.getVerticalPositionAvailable();
+        Boolean frontVerticalPositionAvailable = msg.getFrontVerticalPositionAvailable();
+        Boolean backVerticalPositionAvailable = msg.getBackVerticalPositionAvailable();
+        Boolean backTiltAngleAvailable = msg.getBackTiltAngleAvailable();
+        Boolean headSupportHorizontalPositionAvailable = msg.getHeadSupportHorizontalPositionAvailable();
+        Boolean headSupportVerticalPositionAvailable = msg.getHeadSupportVerticalPositionAvailable();
+        Boolean massageEnabledAvailable = msg.getMassageEnabledAvailable();
+        Boolean massageModeAvailable = msg.getMassageModeAvailable();
+        Boolean massageCushionFirmnessAvailable = msg.getMassageCushionFirmnessAvailable();
+
+        Boolean memoryAvailable = msg.getMemoryAvailable();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingEnabledAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingEnabledAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingLevelAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingLevelAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, horizontalPositionAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, verticalPositionAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, frontVerticalPositionAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, backVerticalPositionAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, backTiltAngleAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, headSupportHorizontalPositionAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, headSupportVerticalPositionAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageEnabledAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageModeAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageCushionFirmnessAvailable);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, memoryAvailable);
+
+        // Invalid/Null Tests
+        SeatControlCapabilities msg = new SeatControlCapabilities();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getModuleName());
+        assertNull(TestValues.NULL, msg.getHeatingEnabledAvailable());
+        assertNull(TestValues.NULL, msg.getCoolingEnabledAvailable());
+        assertNull(TestValues.NULL, msg.getHeatingLevelAvailable());
+        assertNull(TestValues.NULL, msg.getCoolingLevelAvailable());
+        assertNull(TestValues.NULL, msg.getHorizontalPositionAvailable());
+        assertNull(TestValues.NULL, msg.getVerticalPositionAvailable());
+        assertNull(TestValues.NULL, msg.getFrontVerticalPositionAvailable());
+        assertNull(TestValues.NULL, msg.getBackVerticalPositionAvailable());
+        assertNull(TestValues.NULL, msg.getBackTiltAngleAvailable());
+        assertNull(TestValues.NULL, msg.getHeadSupportHorizontalPositionAvailable());
+        assertNull(TestValues.NULL, msg.getHeadSupportVerticalPositionAvailable());
+        assertNull(TestValues.NULL, msg.getMassageEnabledAvailable());
+        assertNull(TestValues.NULL, msg.getMassageModeAvailable());
+        assertNull(TestValues.NULL, msg.getMassageCushionFirmnessAvailable());
+        assertNull(TestValues.NULL, msg.getMemoryAvailable());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(SeatControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
+            reference.put(SeatControlCapabilities.KEY_HEATING_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_COOLING_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_HEATING_LEVEL_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_COOLING_LEVEL_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_HORIZONTAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_FRONT_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_BACK_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_BACK_TILT_ANGLE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_HEAD_SUPPORT_HORIZONTAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_HEAD_SUPPORT_VERTICAL_POSITION_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_MASSAGE_ENABLED_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+
+            reference.put(SeatControlCapabilities.KEY_MASSAGE_MODE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlCapabilities.KEY_MASSAGE_CUSHION_FIRMNESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+
+            reference.put(SeatControlCapabilities.KEY_MEMORY_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java
index b275f784f..b8dfe214d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatControlDataTest.java
@@ -26,148 +26,148 @@ import java.util.List;
  */
 public class SeatControlDataTest extends TestCase {
 
-	private SeatControlData msg;
-
-	@Override
-	public void setUp() {
-		msg = new SeatControlData();
-		msg.setId(TestValues.GENERAL_SUPPORTEDSEAT);
-		msg.setHeatingEnabled(TestValues.GENERAL_BOOLEAN);
-		msg.setCoolingEnabled(TestValues.GENERAL_BOOLEAN);
-		msg.setHeatingLevel(TestValues.GENERAL_INT);
-		msg.setCoolingLevel(TestValues.GENERAL_INT);
-		msg.setHorizontalPosition(TestValues.GENERAL_INT);
-		msg.setVerticalPosition(TestValues.GENERAL_INT);
-		msg.setFrontVerticalPosition(TestValues.GENERAL_INT);
-		msg.setBackVerticalPosition(TestValues.GENERAL_INT);
-		msg.setBackTiltAngle(TestValues.GENERAL_INT);
-		msg.setHeadSupportVerticalPosition(TestValues.GENERAL_INT);
-		msg.setHeadSupportHorizontalPosition(TestValues.GENERAL_INT);
-		msg.setMassageEnabled(TestValues.GENERAL_BOOLEAN);
-		msg.setMassageMode(TestValues.GENERAL_MASSAGEMODEDATA_LIST);
-		msg.setMassageCushionFirmness(TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST);
-		msg.setMemory(TestValues.GENERAL_SEATMEMORYACTION);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		SupportedSeat id = msg.getId();
-		Boolean heatingEnabled = msg.getHeatingEnabled();
-		Boolean coolingEnabled = msg.getCoolingEnabled();
-		Integer heatingLevel = msg.getHeatingLevel();
-		Integer coolingLevel = msg.getCoolingLevel();
-		Integer horizontalPosition = msg.getHorizontalPosition();
-		Integer verticalPosition = msg.getVerticalPosition();
-		Integer frontVerticalPosition = msg.getFrontVerticalPosition();
-		Integer backVerticalPosition = msg.getBackVerticalPosition();
-		Integer backTiltAngle = msg.getBackTiltAngle();
-		Integer headSupportHorizontalPosition = msg.getHeadSupportHorizontalPosition();
-		Integer headSupportVerticalPosition = msg.getHeadSupportVerticalPosition();
-		Boolean massageEnabled = msg.getMassageEnabled();
-
-		List<MassageModeData> massageMode = msg.getMassageMode();
-		List<MassageCushionFirmness> massageCushionFirmness = msg.getMassageCushionFirmness();
-		SeatMemoryAction memory = msg.getMemory();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SUPPORTEDSEAT, id);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingEnabled);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingEnabled);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, heatingLevel);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, coolingLevel);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, horizontalPosition);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, verticalPosition);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, frontVerticalPosition);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, backVerticalPosition);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, backTiltAngle);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, headSupportHorizontalPosition);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, headSupportVerticalPosition);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageEnabled);
-
-		assertTrue(TestValues.TRUE, Validator.validateMassageModeDataList(TestValues.GENERAL_MASSAGEMODEDATA_LIST, massageMode));
-		assertTrue(TestValues.TRUE, Validator.validateMassageCushionFirmnessList(TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST, massageCushionFirmness));
-
-		assertTrue(TestValues.TRUE, Validator.validateSeatMemoryAction(TestValues.GENERAL_SEATMEMORYACTION, memory));
-
-		// Invalid/Null Tests
-		SeatControlData msg = new SeatControlData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getId());
-		assertNull(TestValues.NULL, msg.getHeatingEnabled());
-		assertNull(TestValues.NULL, msg.getCoolingEnabled());
-		assertNull(TestValues.NULL, msg.getHeatingLevel());
-		assertNull(TestValues.NULL, msg.getCoolingLevel());
-		assertNull(TestValues.NULL, msg.getHorizontalPosition());
-		assertNull(TestValues.NULL, msg.getVerticalPosition());
-		assertNull(TestValues.NULL, msg.getFrontVerticalPosition());
-		assertNull(TestValues.NULL, msg.getBackVerticalPosition());
-		assertNull(TestValues.NULL, msg.getBackTiltAngle());
-		assertNull(TestValues.NULL, msg.getHeadSupportHorizontalPosition());
-		assertNull(TestValues.NULL, msg.getHeadSupportVerticalPosition());
-		assertNull(TestValues.NULL, msg.getMassageEnabled());
-		assertNull(TestValues.NULL, msg.getMassageMode());
-		assertNull(TestValues.NULL, msg.getMassageCushionFirmness());
-		assertNull(TestValues.NULL, msg.getMemory());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(SeatControlData.KEY_ID, TestValues.GENERAL_SUPPORTEDSEAT);
-			reference.put(SeatControlData.KEY_HEATING_ENABLED, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlData.KEY_COOLING_ENABLED, TestValues.GENERAL_BOOLEAN);
-			reference.put(SeatControlData.KEY_HEATING_LEVEL, TestValues.GENERAL_INT);
-			reference.put(SeatControlData.KEY_COOLING_LEVEL, TestValues.GENERAL_INT);
-			reference.put(SeatControlData.KEY_HORIZONTAL_POSITION, TestValues.GENERAL_INT);
-			reference.put(SeatControlData.KEY_VERTICAL_POSITION, TestValues.GENERAL_INT);
-			reference.put(SeatControlData.KEY_FRONT_VERTICAL_POSITION, TestValues.GENERAL_INT);
-			reference.put(SeatControlData.KEY_BACK_VERTICAL_POSITION, TestValues.GENERAL_INT);
-			reference.put(SeatControlData.KEY_BACK_TILT_ANGLE, TestValues.GENERAL_INT);
-			reference.put(SeatControlData.KEY_HEAD_SUPPORT_HORIZONTAL_POSITION, TestValues.GENERAL_INT);
-			reference.put(SeatControlData.KEY_HEAD_SUPPORT_VERTICAL_POSITION, TestValues.GENERAL_INT);
-			reference.put(SeatControlData.KEY_MASSAGE_ENABLED, TestValues.GENERAL_BOOLEAN);
-
-			reference.put(SeatControlData.KEY_MASSAGE_MODE, TestValues.GENERAL_MASSAGEMODEDATA_LIST);
-			reference.put(SeatControlData.KEY_MASSAGE_CUSHION_FIRMNESS, TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST);
-
-			reference.put(SeatControlData.KEY_MEMORY, TestValues.GENERAL_SEATMEMORYACTION);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				if (key.equals(SeatControlData.KEY_MASSAGE_MODE)) {
-					List<MassageModeData> mmdReference = (List<MassageModeData>) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONArray mmdArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					int i = 0;
-					for (MassageModeData mmd : mmdReference) {
-						assertTrue(Validator.validateMassageModeData(mmd, new MassageModeData(JsonRPCMarshaller.deserializeJSONObject(mmdArray.getJSONObject(i++)))));
-					}
-				} else if (key.equals(SeatControlData.KEY_MASSAGE_CUSHION_FIRMNESS)) {
-					List<MassageCushionFirmness> mcfReference = (List<MassageCushionFirmness>) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONArray mcfArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					int i = 0;
-					for (MassageCushionFirmness mcf : mcfReference) {
-						assertTrue(Validator.validateMassageCushionFirmness(mcf, new MassageCushionFirmness(JsonRPCMarshaller.deserializeJSONObject(mcfArray.getJSONObject(i++)))));
-					}
-				} else if (key.equals(SeatControlData.KEY_MEMORY)) {
-					SeatMemoryAction mReference = (SeatMemoryAction) JsonUtils.readObjectFromJsonObject(reference, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(underTest, key));
-					assertTrue(Validator.validateSeatMemoryAction(mReference, new SeatMemoryAction(hashTest)));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private SeatControlData msg;
+
+    @Override
+    public void setUp() {
+        msg = new SeatControlData();
+        msg.setId(TestValues.GENERAL_SUPPORTEDSEAT);
+        msg.setHeatingEnabled(TestValues.GENERAL_BOOLEAN);
+        msg.setCoolingEnabled(TestValues.GENERAL_BOOLEAN);
+        msg.setHeatingLevel(TestValues.GENERAL_INT);
+        msg.setCoolingLevel(TestValues.GENERAL_INT);
+        msg.setHorizontalPosition(TestValues.GENERAL_INT);
+        msg.setVerticalPosition(TestValues.GENERAL_INT);
+        msg.setFrontVerticalPosition(TestValues.GENERAL_INT);
+        msg.setBackVerticalPosition(TestValues.GENERAL_INT);
+        msg.setBackTiltAngle(TestValues.GENERAL_INT);
+        msg.setHeadSupportVerticalPosition(TestValues.GENERAL_INT);
+        msg.setHeadSupportHorizontalPosition(TestValues.GENERAL_INT);
+        msg.setMassageEnabled(TestValues.GENERAL_BOOLEAN);
+        msg.setMassageMode(TestValues.GENERAL_MASSAGEMODEDATA_LIST);
+        msg.setMassageCushionFirmness(TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST);
+        msg.setMemory(TestValues.GENERAL_SEATMEMORYACTION);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        SupportedSeat id = msg.getId();
+        Boolean heatingEnabled = msg.getHeatingEnabled();
+        Boolean coolingEnabled = msg.getCoolingEnabled();
+        Integer heatingLevel = msg.getHeatingLevel();
+        Integer coolingLevel = msg.getCoolingLevel();
+        Integer horizontalPosition = msg.getHorizontalPosition();
+        Integer verticalPosition = msg.getVerticalPosition();
+        Integer frontVerticalPosition = msg.getFrontVerticalPosition();
+        Integer backVerticalPosition = msg.getBackVerticalPosition();
+        Integer backTiltAngle = msg.getBackTiltAngle();
+        Integer headSupportHorizontalPosition = msg.getHeadSupportHorizontalPosition();
+        Integer headSupportVerticalPosition = msg.getHeadSupportVerticalPosition();
+        Boolean massageEnabled = msg.getMassageEnabled();
+
+        List<MassageModeData> massageMode = msg.getMassageMode();
+        List<MassageCushionFirmness> massageCushionFirmness = msg.getMassageCushionFirmness();
+        SeatMemoryAction memory = msg.getMemory();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SUPPORTEDSEAT, id);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, heatingEnabled);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, coolingEnabled);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, heatingLevel);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, coolingLevel);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, horizontalPosition);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, verticalPosition);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, frontVerticalPosition);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, backVerticalPosition);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, backTiltAngle);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, headSupportHorizontalPosition);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, headSupportVerticalPosition);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, massageEnabled);
+
+        assertTrue(TestValues.TRUE, Validator.validateMassageModeDataList(TestValues.GENERAL_MASSAGEMODEDATA_LIST, massageMode));
+        assertTrue(TestValues.TRUE, Validator.validateMassageCushionFirmnessList(TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST, massageCushionFirmness));
+
+        assertTrue(TestValues.TRUE, Validator.validateSeatMemoryAction(TestValues.GENERAL_SEATMEMORYACTION, memory));
+
+        // Invalid/Null Tests
+        SeatControlData msg = new SeatControlData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getId());
+        assertNull(TestValues.NULL, msg.getHeatingEnabled());
+        assertNull(TestValues.NULL, msg.getCoolingEnabled());
+        assertNull(TestValues.NULL, msg.getHeatingLevel());
+        assertNull(TestValues.NULL, msg.getCoolingLevel());
+        assertNull(TestValues.NULL, msg.getHorizontalPosition());
+        assertNull(TestValues.NULL, msg.getVerticalPosition());
+        assertNull(TestValues.NULL, msg.getFrontVerticalPosition());
+        assertNull(TestValues.NULL, msg.getBackVerticalPosition());
+        assertNull(TestValues.NULL, msg.getBackTiltAngle());
+        assertNull(TestValues.NULL, msg.getHeadSupportHorizontalPosition());
+        assertNull(TestValues.NULL, msg.getHeadSupportVerticalPosition());
+        assertNull(TestValues.NULL, msg.getMassageEnabled());
+        assertNull(TestValues.NULL, msg.getMassageMode());
+        assertNull(TestValues.NULL, msg.getMassageCushionFirmness());
+        assertNull(TestValues.NULL, msg.getMemory());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(SeatControlData.KEY_ID, TestValues.GENERAL_SUPPORTEDSEAT);
+            reference.put(SeatControlData.KEY_HEATING_ENABLED, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlData.KEY_COOLING_ENABLED, TestValues.GENERAL_BOOLEAN);
+            reference.put(SeatControlData.KEY_HEATING_LEVEL, TestValues.GENERAL_INT);
+            reference.put(SeatControlData.KEY_COOLING_LEVEL, TestValues.GENERAL_INT);
+            reference.put(SeatControlData.KEY_HORIZONTAL_POSITION, TestValues.GENERAL_INT);
+            reference.put(SeatControlData.KEY_VERTICAL_POSITION, TestValues.GENERAL_INT);
+            reference.put(SeatControlData.KEY_FRONT_VERTICAL_POSITION, TestValues.GENERAL_INT);
+            reference.put(SeatControlData.KEY_BACK_VERTICAL_POSITION, TestValues.GENERAL_INT);
+            reference.put(SeatControlData.KEY_BACK_TILT_ANGLE, TestValues.GENERAL_INT);
+            reference.put(SeatControlData.KEY_HEAD_SUPPORT_HORIZONTAL_POSITION, TestValues.GENERAL_INT);
+            reference.put(SeatControlData.KEY_HEAD_SUPPORT_VERTICAL_POSITION, TestValues.GENERAL_INT);
+            reference.put(SeatControlData.KEY_MASSAGE_ENABLED, TestValues.GENERAL_BOOLEAN);
+
+            reference.put(SeatControlData.KEY_MASSAGE_MODE, TestValues.GENERAL_MASSAGEMODEDATA_LIST);
+            reference.put(SeatControlData.KEY_MASSAGE_CUSHION_FIRMNESS, TestValues.GENERAL_MASSAGECUSHIONFIRMNESS_LIST);
+
+            reference.put(SeatControlData.KEY_MEMORY, TestValues.GENERAL_SEATMEMORYACTION);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(SeatControlData.KEY_MASSAGE_MODE)) {
+                    List<MassageModeData> mmdReference = (List<MassageModeData>) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONArray mmdArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    int i = 0;
+                    for (MassageModeData mmd : mmdReference) {
+                        assertTrue(Validator.validateMassageModeData(mmd, new MassageModeData(JsonRPCMarshaller.deserializeJSONObject(mmdArray.getJSONObject(i++)))));
+                    }
+                } else if (key.equals(SeatControlData.KEY_MASSAGE_CUSHION_FIRMNESS)) {
+                    List<MassageCushionFirmness> mcfReference = (List<MassageCushionFirmness>) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONArray mcfArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    int i = 0;
+                    for (MassageCushionFirmness mcf : mcfReference) {
+                        assertTrue(Validator.validateMassageCushionFirmness(mcf, new MassageCushionFirmness(JsonRPCMarshaller.deserializeJSONObject(mcfArray.getJSONObject(i++)))));
+                    }
+                } else if (key.equals(SeatControlData.KEY_MEMORY)) {
+                    SeatMemoryAction mReference = (SeatMemoryAction) JsonUtils.readObjectFromJsonObject(reference, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(underTest, key));
+                    assertTrue(Validator.validateSeatMemoryAction(mReference, new SeatMemoryAction(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationCapabilityTests.java
index 1666c89fb..23e15aee1 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationCapabilityTests.java
@@ -20,80 +20,80 @@ import java.util.List;
 
 public class SeatLocationCapabilityTests extends TestCase {
 
-	private SeatLocationCapability msg;
+    private SeatLocationCapability msg;
 
-	@Override
-	public void setUp() {
-		msg = new SeatLocationCapability();
-		msg.setCols(TestValues.GENERAL_INT);
-		msg.setRows(TestValues.GENERAL_INT);
-		msg.setLevels(TestValues.GENERAL_INT);
-		msg.setSeats(TestValues.GENERAL_SEAT_LIST);
-	}
+    @Override
+    public void setUp() {
+        msg = new SeatLocationCapability();
+        msg.setCols(TestValues.GENERAL_INT);
+        msg.setRows(TestValues.GENERAL_INT);
+        msg.setLevels(TestValues.GENERAL_INT);
+        msg.setSeats(TestValues.GENERAL_SEAT_LIST);
+    }
 
-	public void testRpcValues() {
-		int row = msg.getRows();
-		int col = msg.getCols();
-		int level = msg.getLevels();
-		List<SeatLocation> seats = msg.getSeats();
+    public void testRpcValues() {
+        int row = msg.getRows();
+        int col = msg.getCols();
+        int level = msg.getLevels();
+        List<SeatLocation> seats = msg.getSeats();
 
-		//valid tests
-		assertEquals(TestValues.MATCH, row, TestValues.GENERAL_INT);
-		assertEquals(TestValues.MATCH, col, TestValues.GENERAL_INT);
-		assertEquals(TestValues.MATCH, level, TestValues.GENERAL_INT);
-		assertEquals(TestValues.MATCH, seats.size(), TestValues.GENERAL_SEAT_LIST.size());
-		for (int i = 0; i < TestValues.GENERAL_SEAT_LIST.size(); i++) {
-			assertTrue(TestValues.TRUE, Validator.validateGrid(TestValues.GENERAL_SEAT_LIST.get(i).getGrid(), seats.get(i).getGrid()));
-		}
+        //valid tests
+        assertEquals(TestValues.MATCH, row, TestValues.GENERAL_INT);
+        assertEquals(TestValues.MATCH, col, TestValues.GENERAL_INT);
+        assertEquals(TestValues.MATCH, level, TestValues.GENERAL_INT);
+        assertEquals(TestValues.MATCH, seats.size(), TestValues.GENERAL_SEAT_LIST.size());
+        for (int i = 0; i < TestValues.GENERAL_SEAT_LIST.size(); i++) {
+            assertTrue(TestValues.TRUE, Validator.validateGrid(TestValues.GENERAL_SEAT_LIST.get(i).getGrid(), seats.get(i).getGrid()));
+        }
 
-		//null tests
-		SeatLocationCapability msg = new SeatLocationCapability();
-		assertNull(TestValues.NULL, msg.getCols());
-		assertNull(TestValues.NULL, msg.getRows());
-		assertNull(TestValues.NULL, msg.getLevels());
-		assertNull(TestValues.NULL, msg.getSeats());
-	}
+        //null tests
+        SeatLocationCapability msg = new SeatLocationCapability();
+        assertNull(TestValues.NULL, msg.getCols());
+        assertNull(TestValues.NULL, msg.getRows());
+        assertNull(TestValues.NULL, msg.getLevels());
+        assertNull(TestValues.NULL, msg.getSeats());
+    }
 
-	public void testJson() {
-		JSONObject original = new JSONObject();
-		try {
-			original.put(SeatLocationCapability.KEY_COLS, TestValues.GENERAL_INT);
-			original.put(SeatLocationCapability.KEY_ROWS, TestValues.GENERAL_INT);
-			original.put(SeatLocationCapability.KEY_LEVELS, TestValues.GENERAL_INT);
-			original.put(SeatLocationCapability.KEY_SEATS, TestValues.JSON_SEAT_LOCATIONS);
+    public void testJson() {
+        JSONObject original = new JSONObject();
+        try {
+            original.put(SeatLocationCapability.KEY_COLS, TestValues.GENERAL_INT);
+            original.put(SeatLocationCapability.KEY_ROWS, TestValues.GENERAL_INT);
+            original.put(SeatLocationCapability.KEY_LEVELS, TestValues.GENERAL_INT);
+            original.put(SeatLocationCapability.KEY_SEATS, TestValues.JSON_SEAT_LOCATIONS);
 
-			JSONObject serialized = msg.serializeJSON();
-			assertEquals(serialized.length(), original.length());
+            JSONObject serialized = msg.serializeJSON();
+            assertEquals(serialized.length(), original.length());
 
-			Iterator<String> iter = original.keys();
-			String key = "";
-			while (iter.hasNext()) {
-				key = iter.next();
-				if (key.equals(SeatLocationCapability.KEY_COLS)) {
-					int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getCols();
-					int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getCols();
-					assertEquals(TestValues.MATCH, i1, i2);
-				} else if (key.equals(SeatLocationCapability.KEY_ROWS)) {
-					int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getRows();
-					int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getRows();
-					assertEquals(TestValues.MATCH, i1, i2);
-				} else if (key.equals(SeatLocationCapability.KEY_LEVELS)) {
-					int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getLevels();
-					int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getLevels();
-					assertEquals(TestValues.MATCH, i1, i2);
-				} else if (key.equals(SeatLocationCapability.KEY_SEATS)) {
-					JSONArray arr1 = JsonUtils.readJsonArrayFromJsonObject(original, key);
-					JSONArray arr2 = JsonUtils.readJsonArrayFromJsonObject(serialized, key);
-					assertEquals(TestValues.MATCH, arr1.length(), arr2.length());
-					for (int i = 0; i < TestValues.GENERAL_SEAT_LIST.size(); i++) {
-						Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(arr1.getJSONObject(i));
-						Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(arr2.getJSONObject(i));
-						assertTrue(TestValues.MATCH, Validator.validateSeatLocation(new SeatLocation(h1), new SeatLocation(h2)));
-					}
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            Iterator<String> iter = original.keys();
+            String key = "";
+            while (iter.hasNext()) {
+                key = iter.next();
+                if (key.equals(SeatLocationCapability.KEY_COLS)) {
+                    int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getCols();
+                    int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getCols();
+                    assertEquals(TestValues.MATCH, i1, i2);
+                } else if (key.equals(SeatLocationCapability.KEY_ROWS)) {
+                    int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getRows();
+                    int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getRows();
+                    assertEquals(TestValues.MATCH, i1, i2);
+                } else if (key.equals(SeatLocationCapability.KEY_LEVELS)) {
+                    int i1 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(original)).getLevels();
+                    int i2 = new SeatLocationCapability(JsonRPCMarshaller.deserializeJSONObject(serialized)).getLevels();
+                    assertEquals(TestValues.MATCH, i1, i2);
+                } else if (key.equals(SeatLocationCapability.KEY_SEATS)) {
+                    JSONArray arr1 = JsonUtils.readJsonArrayFromJsonObject(original, key);
+                    JSONArray arr2 = JsonUtils.readJsonArrayFromJsonObject(serialized, key);
+                    assertEquals(TestValues.MATCH, arr1.length(), arr2.length());
+                    for (int i = 0; i < TestValues.GENERAL_SEAT_LIST.size(); i++) {
+                        Hashtable<String, Object> h1 = JsonRPCMarshaller.deserializeJSONObject(arr1.getJSONObject(i));
+                        Hashtable<String, Object> h2 = JsonRPCMarshaller.deserializeJSONObject(arr2.getJSONObject(i));
+                        assertTrue(TestValues.MATCH, Validator.validateSeatLocation(new SeatLocation(h1), new SeatLocation(h2)));
+                    }
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationTests.java
index cf954b702..958b55317 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationTests.java
@@ -13,36 +13,36 @@ import org.json.JSONObject;
 
 public class SeatLocationTests extends TestCase {
 
-	private SeatLocation msg;
-
-	@Override
-	public void setUp() {
-		msg = new SeatLocation();
-		msg.setGrid(TestValues.GENERAL_GRID);
-	}
-
-	public void testRpcValues() {
-		Grid grid = msg.getGrid();
-
-		//valid test
-		assertTrue(Validator.validateGrid(TestValues.GENERAL_GRID, grid));
-
-		//null test
-		SeatLocation msg = new SeatLocation();
-		assertNull(TestValues.NULL, msg.getGrid());
-	}
-
-	public void testJson() {
-		JSONObject original = new JSONObject();
-		try {
-			original.put(SeatLocation.KEY_GRID, TestValues.GENERAL_GRID);
-
-			JSONObject serialized = msg.serializeJSON();
-			assertEquals(serialized.length(), original.length());
-			assertTrue(TestValues.TRUE, Validator.validateSeatLocation(new SeatLocation(JsonRPCMarshaller.deserializeJSONObject(original)),
-					new SeatLocation(JsonRPCMarshaller.deserializeJSONObject(serialized))));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private SeatLocation msg;
+
+    @Override
+    public void setUp() {
+        msg = new SeatLocation();
+        msg.setGrid(TestValues.GENERAL_GRID);
+    }
+
+    public void testRpcValues() {
+        Grid grid = msg.getGrid();
+
+        //valid test
+        assertTrue(Validator.validateGrid(TestValues.GENERAL_GRID, grid));
+
+        //null test
+        SeatLocation msg = new SeatLocation();
+        assertNull(TestValues.NULL, msg.getGrid());
+    }
+
+    public void testJson() {
+        JSONObject original = new JSONObject();
+        try {
+            original.put(SeatLocation.KEY_GRID, TestValues.GENERAL_GRID);
+
+            JSONObject serialized = msg.serializeJSON();
+            assertEquals(serialized.length(), original.length());
+            assertTrue(TestValues.TRUE, Validator.validateSeatLocation(new SeatLocation(JsonRPCMarshaller.deserializeJSONObject(original)),
+                    new SeatLocation(JsonRPCMarshaller.deserializeJSONObject(serialized))));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java
index 54b99be2d..c949c9216 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatMemoryActionTest.java
@@ -18,58 +18,58 @@ import java.util.Iterator;
  */
 public class SeatMemoryActionTest extends TestCase {
 
-	private SeatMemoryAction msg;
-
-	@Override
-	public void setUp() {
-		msg = new SeatMemoryAction();
-
-		msg.setId(TestValues.GENERAL_INT);
-		msg.setLabel(TestValues.GENERAL_STRING);
-		msg.setAction(TestValues.GENERAL_SEATMEMORYACTIONTYPE);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		Integer id = msg.getId();
-		String label = msg.getLabel();
-		SeatMemoryActionType action = msg.getAction();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, label);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATMEMORYACTIONTYPE, action);
-
-		// Invalid/Null Tests
-		SeatMemoryAction msg = new SeatMemoryAction();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getId());
-		assertNull(TestValues.NULL, msg.getLabel());
-		assertNull(TestValues.NULL, msg.getAction());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(SeatMemoryAction.KEY_ID, TestValues.GENERAL_INT);
-			reference.put(SeatMemoryAction.KEY_LABEL, TestValues.GENERAL_STRING);
-			reference.put(SeatMemoryAction.KEY_ACTION, TestValues.GENERAL_SEATMEMORYACTIONTYPE);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private SeatMemoryAction msg;
+
+    @Override
+    public void setUp() {
+        msg = new SeatMemoryAction();
+
+        msg.setId(TestValues.GENERAL_INT);
+        msg.setLabel(TestValues.GENERAL_STRING);
+        msg.setAction(TestValues.GENERAL_SEATMEMORYACTIONTYPE);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Integer id = msg.getId();
+        String label = msg.getLabel();
+        SeatMemoryActionType action = msg.getAction();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, label);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SEATMEMORYACTIONTYPE, action);
+
+        // Invalid/Null Tests
+        SeatMemoryAction msg = new SeatMemoryAction();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getId());
+        assertNull(TestValues.NULL, msg.getLabel());
+        assertNull(TestValues.NULL, msg.getAction());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(SeatMemoryAction.KEY_ID, TestValues.GENERAL_INT);
+            reference.put(SeatMemoryAction.KEY_LABEL, TestValues.GENERAL_STRING);
+            reference.put(SeatMemoryAction.KEY_ACTION, TestValues.GENERAL_SEATMEMORYACTIONTYPE);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
index 14f9890f2..7a231d7f5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
@@ -14,63 +14,63 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SingleTireStatus}
  */
 public class SingleTireStatusTest extends TestCase {
-	
-	private SingleTireStatus msg;
-
-	@Override
-	public void setUp() {
-		msg = new SingleTireStatus();
-		
-		msg.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-		msg.setTPMS(TestValues.GENERAL_TPMS);
-		msg.setPressure(TestValues.GENERAL_FLOAT);
-	}
+
+    private SingleTireStatus msg;
+
+    @Override
+    public void setUp() {
+        msg = new SingleTireStatus();
+
+        msg.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+        msg.setTPMS(TestValues.GENERAL_TPMS);
+        msg.setPressure(TestValues.GENERAL_FLOAT);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		ComponentVolumeStatus status = msg.getStatus();
-		TPMS tpms = msg.getTPMS();
-		Float pressure = msg.getPressure();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, status);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_TPMS, tpms);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, pressure);
-		
-		// Invalid/Null Tests
-		SingleTireStatus msg = new SingleTireStatus();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getStatus());
-		assertNull(TestValues.NULL, msg.getTPMS());
-		assertNull(TestValues.NULL, msg.getPressure());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-			reference.put(SingleTireStatus.KEY_TPMS, TestValues.GENERAL_TPMS);
-			reference.put(SingleTireStatus.KEY_PRESSURE, TestValues.GENERAL_FLOAT);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        ComponentVolumeStatus status = msg.getStatus();
+        TPMS tpms = msg.getTPMS();
+        Float pressure = msg.getPressure();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, status);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_TPMS, tpms);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FLOAT, pressure);
+
+        // Invalid/Null Tests
+        SingleTireStatus msg = new SingleTireStatus();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getStatus());
+        assertNull(TestValues.NULL, msg.getTPMS());
+        assertNull(TestValues.NULL, msg.getPressure());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+            reference.put(SingleTireStatus.KEY_TPMS, TestValues.GENERAL_TPMS);
+            reference.put(SingleTireStatus.KEY_PRESSURE, TestValues.GENERAL_FLOAT);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java
index c33a69a5f..86d0058be 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SisDataTests.java
@@ -23,83 +23,83 @@ import java.util.Iterator;
  */
 public class SisDataTests extends TestCase {
 
-	private SisData msg;
-
-	@Override
-	public void setUp() {
-		msg = new SisData();
-
-		msg.setStationShortName(TestValues.GENERAL_STRING);
-		msg.setStationIDNumber(TestValues.GENERAL_STATIONIDNUMBER);
-		msg.setStationLongName(TestValues.GENERAL_STRING);
-		msg.setStationLocation(VehicleDataHelper.GPS);
-		msg.setStationMessage(TestValues.GENERAL_STRING);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
-		String stationShortName = msg.getStationShortName();
-		StationIDNumber stationIDNumber = msg.getStationIDNumber();
-		String stationLongName = msg.getStationLongName();
-		GPSData stationLocation = msg.getStationLocation();
-		String stationMessage = msg.getStationMessage();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationShortName);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STATIONIDNUMBER, stationIDNumber);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationLongName);
-		assertEquals(TestValues.MATCH, VehicleDataHelper.GPS, stationLocation);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationMessage);
-
-		// Invalid/Null Tests
-		SisData msg = new SisData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getStationShortName());
-		assertNull(TestValues.NULL, msg.getStationIDNumber());
-		assertNull(TestValues.NULL, msg.getStationLongName());
-		assertNull(TestValues.NULL, msg.getStationLocation());
-		assertNull(TestValues.NULL, msg.getStationMessage());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(SisData.KEY_STATION_SHORT_NAME, TestValues.GENERAL_STRING);
-			reference.put(SisData.KEY_STATION_ID_NUMBER, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_STATIONIDNUMBER.getStore()));
-			reference.put(SisData.KEY_STATION_LONG_NAME, TestValues.GENERAL_STRING);
-			reference.put(SisData.KEY_STATION_LOCATION, JsonRPCMarshaller.serializeHashtable(VehicleDataHelper.GPS.getStore()));
-			reference.put(SisData.KEY_STATION_MESSAGE, TestValues.GENERAL_STRING);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				if (key.equals(SisData.KEY_STATION_ID_NUMBER)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateStationIDNumber(new StationIDNumber(hashReference), new StationIDNumber(hashTest)));
-				} else if (key.equals(SisData.KEY_STATION_LOCATION)) {
-					JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateGpsData(new GPSData(hashReference), new GPSData(hashTest)));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private SisData msg;
+
+    @Override
+    public void setUp() {
+        msg = new SisData();
+
+        msg.setStationShortName(TestValues.GENERAL_STRING);
+        msg.setStationIDNumber(TestValues.GENERAL_STATIONIDNUMBER);
+        msg.setStationLongName(TestValues.GENERAL_STRING);
+        msg.setStationLocation(VehicleDataHelper.GPS);
+        msg.setStationMessage(TestValues.GENERAL_STRING);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        String stationShortName = msg.getStationShortName();
+        StationIDNumber stationIDNumber = msg.getStationIDNumber();
+        String stationLongName = msg.getStationLongName();
+        GPSData stationLocation = msg.getStationLocation();
+        String stationMessage = msg.getStationMessage();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationShortName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STATIONIDNUMBER, stationIDNumber);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationLongName);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.GPS, stationLocation);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, stationMessage);
+
+        // Invalid/Null Tests
+        SisData msg = new SisData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getStationShortName());
+        assertNull(TestValues.NULL, msg.getStationIDNumber());
+        assertNull(TestValues.NULL, msg.getStationLongName());
+        assertNull(TestValues.NULL, msg.getStationLocation());
+        assertNull(TestValues.NULL, msg.getStationMessage());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(SisData.KEY_STATION_SHORT_NAME, TestValues.GENERAL_STRING);
+            reference.put(SisData.KEY_STATION_ID_NUMBER, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_STATIONIDNUMBER.getStore()));
+            reference.put(SisData.KEY_STATION_LONG_NAME, TestValues.GENERAL_STRING);
+            reference.put(SisData.KEY_STATION_LOCATION, JsonRPCMarshaller.serializeHashtable(VehicleDataHelper.GPS.getStore()));
+            reference.put(SisData.KEY_STATION_MESSAGE, TestValues.GENERAL_STRING);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(SisData.KEY_STATION_ID_NUMBER)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateStationIDNumber(new StationIDNumber(hashReference), new StationIDNumber(hashTest)));
+                } else if (key.equals(SisData.KEY_STATION_LOCATION)) {
+                    JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateGpsData(new GPSData(hashReference), new GPSData(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
index 25feeb6f8..7778c60a4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
@@ -12,73 +12,73 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SoftButtonCapabilities}
  */
 public class SoftButtonCapabilitiesTest extends TestCase {
 
-	private SoftButtonCapabilities msg;
+    private SoftButtonCapabilities msg;
 
-	@Override
-	public void setUp() {
-		msg = new SoftButtonCapabilities();
-		
-		msg.setImageSupported(TestValues.GENERAL_BOOLEAN);
-		msg.setShortPressAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setLongPressAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setUpDownAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setTextSupported(TestValues.GENERAL_BOOLEAN);
-	}
+    @Override
+    public void setUp() {
+        msg = new SoftButtonCapabilities();
+
+        msg.setImageSupported(TestValues.GENERAL_BOOLEAN);
+        msg.setShortPressAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setLongPressAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setUpDownAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setTextSupported(TestValues.GENERAL_BOOLEAN);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		Boolean imageSupp = msg.getImageSupported();
-		Boolean updown = msg.getUpDownAvailable();
-		Boolean longPress = msg.getLongPressAvailable();
-		Boolean shortPress = msg.getShortPressAvailable();
-		Boolean textSupported = msg.getTextSupported();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, imageSupp);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, updown);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, longPress);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, shortPress);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, textSupported);
-		
-		// Invalid/Null Tests
-		SoftButtonCapabilities msg = new SoftButtonCapabilities();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getImageSupported());
-		assertNull(TestValues.NULL, msg.getLongPressAvailable());
-		assertNull(TestValues.NULL, msg.getShortPressAvailable());
-		assertNull(TestValues.NULL, msg.getUpDownAvailable());
-		assertNull(TestValues.NULL, msg.getTextSupported());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(SoftButtonCapabilities.KEY_IMAGE_SUPPORTED, TestValues.GENERAL_BOOLEAN);
-			reference.put(SoftButtonCapabilities.KEY_UP_DOWN_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SoftButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SoftButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(SoftButtonCapabilities.KEY_TEXT_SUPPORTED, TestValues.GENERAL_BOOLEAN);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Boolean imageSupp = msg.getImageSupported();
+        Boolean updown = msg.getUpDownAvailable();
+        Boolean longPress = msg.getLongPressAvailable();
+        Boolean shortPress = msg.getShortPressAvailable();
+        Boolean textSupported = msg.getTextSupported();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, imageSupp);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, updown);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, longPress);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, shortPress);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, textSupported);
+
+        // Invalid/Null Tests
+        SoftButtonCapabilities msg = new SoftButtonCapabilities();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getImageSupported());
+        assertNull(TestValues.NULL, msg.getLongPressAvailable());
+        assertNull(TestValues.NULL, msg.getShortPressAvailable());
+        assertNull(TestValues.NULL, msg.getUpDownAvailable());
+        assertNull(TestValues.NULL, msg.getTextSupported());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(SoftButtonCapabilities.KEY_IMAGE_SUPPORTED, TestValues.GENERAL_BOOLEAN);
+            reference.put(SoftButtonCapabilities.KEY_UP_DOWN_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SoftButtonCapabilities.KEY_LONG_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SoftButtonCapabilities.KEY_SHORT_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(SoftButtonCapabilities.KEY_TEXT_SUPPORTED, TestValues.GENERAL_BOOLEAN);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
index fda0b8cc6..964eb8834 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
@@ -18,87 +18,87 @@ import java.util.Hashtable;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SoftButton}
  */
 public class SoftButtonTest extends TestCase {
-	
-	private SoftButton msg;
-
-	@Override
-	public void setUp() {
-		msg = new SoftButton();
-		
-		msg.setType(TestValues.GENERAL_SOFTBUTTONTYPE);
-		msg.setText(TestValues.GENERAL_STRING);
-		msg.setSystemAction(TestValues.GENERAL_SYSTEMACTION);
-		msg.setImage(TestValues.GENERAL_IMAGE);
-		msg.setIsHighlighted(TestValues.GENERAL_BOOLEAN);
-		msg.setSoftButtonID(TestValues.GENERAL_INT);
-	}
+
+    private SoftButton msg;
+
+    @Override
+    public void setUp() {
+        msg = new SoftButton();
+
+        msg.setType(TestValues.GENERAL_SOFTBUTTONTYPE);
+        msg.setText(TestValues.GENERAL_STRING);
+        msg.setSystemAction(TestValues.GENERAL_SYSTEMACTION);
+        msg.setImage(TestValues.GENERAL_IMAGE);
+        msg.setIsHighlighted(TestValues.GENERAL_BOOLEAN);
+        msg.setSoftButtonID(TestValues.GENERAL_INT);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		SoftButtonType type = msg.getType();
-		String text = msg.getText();
-		SystemAction sysAction = msg.getSystemAction();
-		Image image = msg.getImage();
-		Boolean isHighlighted = msg.getIsHighlighted();
-		Integer id = msg.getSoftButtonID();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONTYPE, type);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMACTION, sysAction);
-	    assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image));
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, isHighlighted);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id);
-		
-		// Invalid/Null Tests
-		SoftButton msg = new SoftButton();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getSoftButtonID());
-		assertNull(TestValues.NULL, msg.getImage());
-		assertNull(TestValues.NULL, msg.getIsHighlighted());
-		assertNull(TestValues.NULL, msg.getSystemAction());
-		assertNull(TestValues.NULL, msg.getText());
-		assertNull(TestValues.NULL, msg.getType());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {			
-			reference.put(SoftButton.KEY_SOFT_BUTTON_ID, TestValues.GENERAL_INT);
-			reference.put(SoftButton.KEY_TYPE, TestValues.GENERAL_SOFTBUTTONTYPE);
-			reference.put(SoftButton.KEY_TEXT, TestValues.GENERAL_STRING);
-			reference.put(SoftButton.KEY_IMAGE, TestValues.JSON_IMAGE);
-			reference.put(SoftButton.KEY_SYSTEM_ACTION, TestValues.GENERAL_SYSTEMACTION);
-			reference.put(SoftButton.KEY_IS_HIGHLIGHTED, TestValues.GENERAL_BOOLEAN);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				
-				if(key.equals(SoftButton.KEY_IMAGE)){
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        SoftButtonType type = msg.getType();
+        String text = msg.getText();
+        SystemAction sysAction = msg.getSystemAction();
+        Image image = msg.getImage();
+        Boolean isHighlighted = msg.getIsHighlighted();
+        Integer id = msg.getSoftButtonID();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONTYPE, type);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMACTION, sysAction);
+        assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image));
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, isHighlighted);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id);
+
+        // Invalid/Null Tests
+        SoftButton msg = new SoftButton();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getSoftButtonID());
+        assertNull(TestValues.NULL, msg.getImage());
+        assertNull(TestValues.NULL, msg.getIsHighlighted());
+        assertNull(TestValues.NULL, msg.getSystemAction());
+        assertNull(TestValues.NULL, msg.getText());
+        assertNull(TestValues.NULL, msg.getType());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(SoftButton.KEY_SOFT_BUTTON_ID, TestValues.GENERAL_INT);
+            reference.put(SoftButton.KEY_TYPE, TestValues.GENERAL_SOFTBUTTONTYPE);
+            reference.put(SoftButton.KEY_TEXT, TestValues.GENERAL_STRING);
+            reference.put(SoftButton.KEY_IMAGE, TestValues.JSON_IMAGE);
+            reference.put(SoftButton.KEY_SYSTEM_ACTION, TestValues.GENERAL_SYSTEMACTION);
+            reference.put(SoftButton.KEY_IS_HIGHLIGHTED, TestValues.GENERAL_BOOLEAN);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(SoftButton.KEY_IMAGE)) {
                     JSONObject referenceArray = JsonUtils.readJsonObjectFromJsonObject(reference, key);
                     JSONObject underTestArray = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-                	Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray);
-                	Hashtable<String, Object> hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray);
-                	assertTrue(TestValues.TRUE, Validator.validateImage(new Image(hashReference), new Image(hashTest)));
-	            } else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-	            }
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray);
+                    assertTrue(TestValues.TRUE, Validator.validateImage(new Image(hashReference), new Image(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StabilityControlsStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StabilityControlsStatusTests.java
index 1de8abfdf..3cf46b7ab 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StabilityControlsStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StabilityControlsStatusTests.java
@@ -26,7 +26,7 @@ public class StabilityControlsStatusTests extends TestCase {
     /**
      * Tests the expected values of the RPC message.
      */
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
         VehicleDataStatus esc = msg.getEscSystem();
         VehicleDataStatus sTrailer = msg.getTrailerSwayControl();
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
index 54752d5ef..d33cc1ac0 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
@@ -12,68 +12,68 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.StartTime}
  */
 public class StartTimeTest extends TestCase {
-	
-	private StartTime msg;
-
-	@Override
-	public void setUp() {
-		msg = new StartTime();
-		
-		msg.setHours(TestValues.GENERAL_INT);
-		msg.setMinutes(TestValues.GENERAL_INT);
-		msg.setSeconds(TestValues.GENERAL_INT);
-	}
+
+    private StartTime msg;
+
+    @Override
+    public void setUp() {
+        msg = new StartTime();
+
+        msg.setHours(TestValues.GENERAL_INT);
+        msg.setMinutes(TestValues.GENERAL_INT);
+        msg.setSeconds(TestValues.GENERAL_INT);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		Integer hours = msg.getHours();
-		Integer minutes = msg.getMinutes();
-		Integer seconds = msg.getSeconds();		
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, hours);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, minutes);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, seconds);
-
-		// TimeInterval constructor test
-		StartTime startTime = new StartTime(7000);
-		assertEquals(TestValues.MATCH, (Integer) 1, startTime.getHours());
-		assertEquals(TestValues.MATCH, (Integer) 56, startTime.getMinutes());
-		assertEquals(TestValues.MATCH, (Integer) 40, startTime.getSeconds());
-
-		// Invalid/Null Tests
-		StartTime msg = new StartTime();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		assertNull(TestValues.NULL, msg.getHours());
-		assertNull(TestValues.NULL, msg.getMinutes());
-		assertNull(TestValues.NULL, msg.getSeconds());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(StartTime.KEY_HOURS, TestValues.GENERAL_INT);
-			reference.put(StartTime.KEY_MINUTES, TestValues.GENERAL_INT);
-			reference.put(StartTime.KEY_SECONDS, TestValues.GENERAL_INT);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Integer hours = msg.getHours();
+        Integer minutes = msg.getMinutes();
+        Integer seconds = msg.getSeconds();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, hours);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, minutes);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, seconds);
+
+        // TimeInterval constructor test
+        StartTime startTime = new StartTime(7000);
+        assertEquals(TestValues.MATCH, (Integer) 1, startTime.getHours());
+        assertEquals(TestValues.MATCH, (Integer) 56, startTime.getMinutes());
+        assertEquals(TestValues.MATCH, (Integer) 40, startTime.getSeconds());
+
+        // Invalid/Null Tests
+        StartTime msg = new StartTime();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        assertNull(TestValues.NULL, msg.getHours());
+        assertNull(TestValues.NULL, msg.getMinutes());
+        assertNull(TestValues.NULL, msg.getSeconds());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(StartTime.KEY_HOURS, TestValues.GENERAL_INT);
+            reference.put(StartTime.KEY_MINUTES, TestValues.GENERAL_INT);
+            reference.put(StartTime.KEY_SECONDS, TestValues.GENERAL_INT);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java
index f35f0913d..04da073df 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StationIDNumberTests.java
@@ -17,57 +17,57 @@ import java.util.Iterator;
  */
 public class StationIDNumberTests extends TestCase {
 
-	private StationIDNumber msg;
+    private StationIDNumber msg;
 
-	@Override
-	public void setUp() {
-		msg = new StationIDNumber();
+    @Override
+    public void setUp() {
+        msg = new StationIDNumber();
 
-		msg.setCountryCode(TestValues.GENERAL_INT);
-		msg.setFccFacilityId(TestValues.GENERAL_INT);
-	}
+        msg.setCountryCode(TestValues.GENERAL_INT);
+        msg.setFccFacilityId(TestValues.GENERAL_INT);
+    }
 
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues() {
-		// Test Values
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
 
-		int countryCode = msg.getCountryCode();
-		int fccFacilityId = msg.getFccFacilityId();
+        int countryCode = msg.getCountryCode();
+        int fccFacilityId = msg.getFccFacilityId();
 
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, countryCode);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, fccFacilityId);
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, countryCode);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, fccFacilityId);
 
-		// Invalid/Null Tests
-		StationIDNumber msg = new StationIDNumber();
-		assertNotNull(TestValues.NOT_NULL, msg);
+        // Invalid/Null Tests
+        StationIDNumber msg = new StationIDNumber();
+        assertNotNull(TestValues.NOT_NULL, msg);
 
-		assertNull(TestValues.NULL, msg.getCountryCode());
-		assertNull(TestValues.NULL, msg.getFccFacilityId());
-	}
+        assertNull(TestValues.NULL, msg.getCountryCode());
+        assertNull(TestValues.NULL, msg.getFccFacilityId());
+    }
 
-	public void testJson() {
-		JSONObject reference = new JSONObject();
+    public void testJson() {
+        JSONObject reference = new JSONObject();
 
-		try {
+        try {
 
-			reference.put(StationIDNumber.KEY_COUNTRY_CODE, TestValues.GENERAL_INT);
-			reference.put(StationIDNumber.KEY_FCC_FACILITY_ID, TestValues.GENERAL_INT);
+            reference.put(StationIDNumber.KEY_COUNTRY_CODE, TestValues.GENERAL_INT);
+            reference.put(StationIDNumber.KEY_FCC_FACILITY_ID, TestValues.GENERAL_INT);
 
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
 
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
 
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java
index 4ba99dda0..bbccdd042 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SystemCapabilityTests.java
@@ -51,7 +51,7 @@ public class SystemCapabilityTests extends TestCase {
     /**
      * Tests the expected values of the RPC message.
      */
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
         SystemCapabilityType testType = msg.getSystemCapabilityType();
         NavigationCapability testNavigationCapability = (NavigationCapability) msg.getCapabilityForType(SystemCapabilityType.NAVIGATION);
@@ -70,7 +70,7 @@ public class SystemCapabilityTests extends TestCase {
         assertTrue(TestValues.TRUE, Validator.validateDriverDistractionCapability(TestValues.GENERAL_DRIVERDISTRACTIONCAPABILITY, testDriverDistractionCapability));
 
 
-        for(int i = 0; i < TestValues.GENERAL_DISPLAYCAPABILITY_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_DISPLAYCAPABILITY_LIST.size(); i++) {
             assertTrue(TestValues.TRUE, Validator.validateDisplayCapability(TestValues.GENERAL_DISPLAYCAPABILITY_LIST.get(i), displayCapabilities.get(i)));
         }
 
@@ -112,40 +112,40 @@ public class SystemCapabilityTests extends TestCase {
             while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
-                if(key.equals(SystemCapability.KEY_NAVIGATION_CAPABILITY)){
+                if (key.equals(SystemCapability.KEY_NAVIGATION_CAPABILITY)) {
                     JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
                     JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
                     Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
                     Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-                    assertTrue(TestValues.TRUE, Validator.validateNavigationCapability( new NavigationCapability(hashReference), new NavigationCapability(hashTest)));
-                } else if(key.equals(SystemCapability.KEY_PHONE_CAPABILITY)){
+                    assertTrue(TestValues.TRUE, Validator.validateNavigationCapability(new NavigationCapability(hashReference), new NavigationCapability(hashTest)));
+                } else if (key.equals(SystemCapability.KEY_PHONE_CAPABILITY)) {
                     JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
                     JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
                     Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
                     Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-                    assertTrue(TestValues.TRUE, Validator.validatePhoneCapability( new PhoneCapability(hashReference), new PhoneCapability(hashTest)));
-                } else if(key.equals(SystemCapability.KEY_REMOTE_CONTROL_CAPABILITY)){
+                    assertTrue(TestValues.TRUE, Validator.validatePhoneCapability(new PhoneCapability(hashReference), new PhoneCapability(hashTest)));
+                } else if (key.equals(SystemCapability.KEY_REMOTE_CONTROL_CAPABILITY)) {
                     JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
                     JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
                     Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
                     Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-                    assertTrue(TestValues.TRUE, Validator.validateRemoteControlCapabilities( new RemoteControlCapabilities(hashReference), new RemoteControlCapabilities(hashTest)));
-                } else if(key.equals(SystemCapability.KEY_APP_SERVICES_CAPABILITIES)){
+                    assertTrue(TestValues.TRUE, Validator.validateRemoteControlCapabilities(new RemoteControlCapabilities(hashReference), new RemoteControlCapabilities(hashTest)));
+                } else if (key.equals(SystemCapability.KEY_APP_SERVICES_CAPABILITIES)) {
                     JSONObject objectEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(reference, key);
                     JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
                     Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
                     Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
                     Log.i("TEST REF", hashReference.toString());
                     Log.i("TEST TEST", hashTest.toString());
-                    assertTrue(TestValues.TRUE, Validator.validateAppServiceCapabilities( new AppServicesCapabilities(hashReference), new AppServicesCapabilities(hashTest)));
-                } else if(key.equals(SystemCapability.KEY_DISPLAY_CAPABILITIES)){
+                    assertTrue(TestValues.TRUE, Validator.validateAppServiceCapabilities(new AppServicesCapabilities(hashReference), new AppServicesCapabilities(hashTest)));
+                } else if (key.equals(SystemCapability.KEY_DISPLAY_CAPABILITIES)) {
                     JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
                     JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
                     assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
 
-                    for(int i = 0; i < referenceArray.length(); i++){
+                    for (int i = 0; i < referenceArray.length(); i++) {
                         Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(referenceArray.getJSONObject(i));
-                        Hashtable<String, Object> hashTest= JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
+                        Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(underTestArray.getJSONObject(i));
                         assertTrue(TestValues.TRUE, Validator.validateDisplayCapability(new DisplayCapability(hashReference), new DisplayCapability(hashTest)));
                     }
                 } else if (key.equals(SystemCapability.KEY_DRIVER_DISTRACTION_CAPABILITY)) {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
index 8a30b1c21..9d04b07de 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
@@ -13,54 +13,54 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 public class TTSChunkTest extends TestCase {
-	
-	private TTSChunk msg;
 
-	@Override
-	public void setUp() {
-		msg = new TTSChunk();
-		
-		msg.setText(TestValues.GENERAL_STRING);
-		msg.setType(TestValues.GENERAL_SPEECHCAPABILITIES);
-	}
+    private TTSChunk msg;
+
+    @Override
+    public void setUp() {
+        msg = new TTSChunk();
+
+        msg.setText(TestValues.GENERAL_STRING);
+        msg.setType(TestValues.GENERAL_SPEECHCAPABILITIES);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		String text = msg.getText();
-		SpeechCapabilities speechType = msg.getType();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SPEECHCAPABILITIES, speechType);
-		
-		// Invalid/Null Tests
-		TTSChunk msg = new TTSChunk();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getText());
-		assertNull(TestValues.NULL, msg.getType());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(TTSChunk.KEY_TEXT, TestValues.GENERAL_STRING);
-			reference.put(TTSChunk.KEY_TYPE, TestValues.GENERAL_SPEECHCAPABILITIES);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        String text = msg.getText();
+        SpeechCapabilities speechType = msg.getType();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SPEECHCAPABILITIES, speechType);
+
+        // Invalid/Null Tests
+        TTSChunk msg = new TTSChunk();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getText());
+        assertNull(TestValues.NULL, msg.getType());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(TTSChunk.KEY_TEXT, TestValues.GENERAL_STRING);
+            reference.put(TTSChunk.KEY_TYPE, TestValues.GENERAL_SPEECHCAPABILITIES);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java
index 2bff0d31b..98bb58fb7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemperatureTests.java
@@ -13,15 +13,15 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.Temperature}
  */
-public class TemperatureTests extends TestCase{
-	
+public class TemperatureTests extends TestCase {
+
     private Temperature msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new Temperature();
 
         msg.setUnit(TestValues.GENERAL_TEMPERATUREUNIT);
@@ -29,9 +29,9 @@ public class TemperatureTests extends TestCase{
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
         // Test Values
         TemperatureUnit unit = msg.getUnit();
         float value = msg.getValue();
@@ -48,10 +48,10 @@ public class TemperatureTests extends TestCase{
         assertNull(TestValues.NULL, msg.getValue());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(Temperature.KEY_VALUE, (Float) TestValues.GENERAL_FLOAT);
             reference.put(Temperature.KEY_UNIT, TestValues.GENERAL_TEMPERATUREUNIT);
 
@@ -59,14 +59,14 @@ public class TemperatureTests extends TestCase{
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
                 assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
 
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java
index 22ef586d2..be1150c5b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateColorSchemeTest.java
@@ -15,66 +15,66 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.TemplateColorScheme}
  */
 public class TemplateColorSchemeTest extends TestCase {
-	
-	private TemplateColorScheme msg;
 
-	@Override
-	public void setUp() {
-		msg = new TemplateColorScheme();
-		msg.setPrimaryColor(TestValues.GENERAL_RGBCOLOR);
-		msg.setSecondaryColor(TestValues.GENERAL_RGBCOLOR);
-		msg.setBackgroundColor(TestValues.GENERAL_RGBCOLOR);
-	}
+    private TemplateColorScheme msg;
+
+    @Override
+    public void setUp() {
+        msg = new TemplateColorScheme();
+        msg.setPrimaryColor(TestValues.GENERAL_RGBCOLOR);
+        msg.setSecondaryColor(TestValues.GENERAL_RGBCOLOR);
+        msg.setBackgroundColor(TestValues.GENERAL_RGBCOLOR);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		RGBColor primaryColor = msg.getPrimaryColor();
-		RGBColor secondaryColor = msg.getSecondaryColor();
-		RGBColor backgroundColor = msg.getBackgroundColor();
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        RGBColor primaryColor = msg.getPrimaryColor();
+        RGBColor secondaryColor = msg.getSecondaryColor();
+        RGBColor backgroundColor = msg.getBackgroundColor();
 
-		// Valid Tests
-		assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, primaryColor));
-		assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, secondaryColor));
-		assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, backgroundColor));
+        // Valid Tests
+        assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, primaryColor));
+        assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, secondaryColor));
+        assertTrue(TestValues.TRUE, Validator.validateRGBColor(TestValues.GENERAL_RGBCOLOR, backgroundColor));
 
-		// Invalid/Null Tests
-		TemplateColorScheme msg = new TemplateColorScheme();
-		assertNotNull(TestValues.NOT_NULL, msg);
+        // Invalid/Null Tests
+        TemplateColorScheme msg = new TemplateColorScheme();
+        assertNotNull(TestValues.NOT_NULL, msg);
 
-		assertNull(TestValues.NULL, msg.getPrimaryColor());
-		assertNull(TestValues.NULL, msg.getSecondaryColor());
-		assertNull(TestValues.NULL, msg.getBackgroundColor());
-	}
+        assertNull(TestValues.NULL, msg.getPrimaryColor());
+        assertNull(TestValues.NULL, msg.getSecondaryColor());
+        assertNull(TestValues.NULL, msg.getBackgroundColor());
+    }
 
-	public void testJson() {
-		JSONObject reference = new JSONObject();
+    public void testJson() {
+        JSONObject reference = new JSONObject();
 
-		try {
-			reference.put(TemplateColorScheme.KEY_PRIMARY_COLOR, TestValues.JSON_RGBCOLOR);
-			reference.put(TemplateColorScheme.KEY_SECONDARY_COLOR, TestValues.JSON_RGBCOLOR);
-			reference.put(TemplateColorScheme.KEY_BACKGROUND_COLOR, TestValues.JSON_RGBCOLOR);
+        try {
+            reference.put(TemplateColorScheme.KEY_PRIMARY_COLOR, TestValues.JSON_RGBCOLOR);
+            reference.put(TemplateColorScheme.KEY_SECONDARY_COLOR, TestValues.JSON_RGBCOLOR);
+            reference.put(TemplateColorScheme.KEY_BACKGROUND_COLOR, TestValues.JSON_RGBCOLOR);
 
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				JSONObject referenceColorObj = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-				RGBColor referenceColor = new RGBColor(JsonRPCMarshaller.deserializeJSONObject(referenceColorObj));
-				JSONObject underTestColorObj = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-				RGBColor underTestColor = new RGBColor(JsonRPCMarshaller.deserializeJSONObject(underTestColorObj));
-				assertTrue(TestValues.TRUE, Validator.validateRGBColor(referenceColor, underTestColor));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                JSONObject referenceColorObj = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                RGBColor referenceColor = new RGBColor(JsonRPCMarshaller.deserializeJSONObject(referenceColorObj));
+                JSONObject underTestColorObj = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+                RGBColor underTestColor = new RGBColor(JsonRPCMarshaller.deserializeJSONObject(underTestColorObj));
+                assertTrue(TestValues.TRUE, Validator.validateRGBColor(referenceColor, underTestColor));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateConfigurationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateConfigurationTests.java
index d01bb92fd..6b0ea016f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateConfigurationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TemplateConfigurationTests.java
@@ -16,7 +16,7 @@ import java.util.Hashtable;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.TemplateConfiguration}
  */
 public class TemplateConfigurationTests extends TestCase {
@@ -24,7 +24,7 @@ public class TemplateConfigurationTests extends TestCase {
     private TemplateConfiguration msg;
 
     @Override
-    public void setUp(){
+    public void setUp() {
         msg = new TemplateConfiguration();
 
         msg.setTemplate(TestValues.GENERAL_STRING);
@@ -36,17 +36,17 @@ public class TemplateConfigurationTests extends TestCase {
     /**
      * Tests the expected values of the RPC message.
      */
-    public void testRpcValues () {
-    	// Test Values
+    public void testRpcValues() {
+        // Test Values
         String testTemplate = msg.getTemplate();
         TemplateColorScheme testDayColorScheme = msg.getDayColorScheme();
         TemplateColorScheme testNightColorScheme = msg.getNightColorScheme();
-        
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTemplate);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_DAYCOLORSCHEME, testDayColorScheme);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_NIGHTCOLORSCHEME, testNightColorScheme);
-        
+
         // Invalid/Null Tests
         TemplateConfiguration msg = new TemplateConfiguration();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -56,10 +56,10 @@ public class TemplateConfigurationTests extends TestCase {
         assertNull(TestValues.NULL, msg.getNightColorScheme());
     }
 
-    public void testJson(){
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
+        try {
             reference.put(TemplateConfiguration.KEY_TEMPLATE, TestValues.GENERAL_STRING);
             reference.put(TemplateConfiguration.KEY_DAY_COLOR_SCHEME, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_DAYCOLORSCHEME.getStore()));
             reference.put(TemplateConfiguration.KEY_NIGHT_COLOR_SCHEME, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_NIGHTCOLORSCHEME.getStore()));
@@ -68,7 +68,7 @@ public class TemplateConfigurationTests extends TestCase {
             assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
-            while(iterator.hasNext()){
+            while (iterator.hasNext()) {
                 String key = (String) iterator.next();
 
                 if (key.equals(TemplateConfiguration.KEY_DAY_COLOR_SCHEME)) {
@@ -87,8 +87,8 @@ public class TemplateConfigurationTests extends TestCase {
                     assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
                 }
             }
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
index cf12f3d1f..affa8c624 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
@@ -14,68 +14,68 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.TextField}
  */
 public class TextFieldTest extends TestCase {
-    
-	private TextField msg;
-
-	@Override
-	public void setUp() {
-		msg = new TextField();
-		
-		msg.setName(TestValues.GENERAL_TEXTFIELDNAME);
-		msg.setCharacterSet(TestValues.GENERAL_CHARACTERSET);
-		msg.setWidth(TestValues.GENERAL_INT);
-		msg.setRows(TestValues.GENERAL_INT);
-	}
+
+    private TextField msg;
+
+    @Override
+    public void setUp() {
+        msg = new TextField();
+
+        msg.setName(TestValues.GENERAL_TEXTFIELDNAME);
+        msg.setCharacterSet(TestValues.GENERAL_CHARACTERSET);
+        msg.setWidth(TestValues.GENERAL_INT);
+        msg.setRows(TestValues.GENERAL_INT);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		TextFieldName name = msg.getName();
-		CharacterSet charSet = msg.getCharacterSet();
-		Integer width = msg.getWidth();
-		Integer rows = msg.getRows();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTFIELDNAME, name);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_CHARACTERSET, charSet);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, width);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, rows);
-		
-		// Invalid/Null Tests
-		TextField msg = new TextField();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getName());
-		assertNull(TestValues.NULL, msg.getWidth());
-		assertNull(TestValues.NULL, msg.getRows());
-		assertNull(TestValues.NULL, msg.getCharacterSet());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(TextField.KEY_CHARACTER_SET, TestValues.GENERAL_CHARACTERSET);
-			reference.put(TextField.KEY_WIDTH, TestValues.GENERAL_INT);
-			reference.put(TextField.KEY_ROWS, TestValues.GENERAL_INT);
-			reference.put(TextField.KEY_NAME, TestValues.GENERAL_TEXTFIELDNAME);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        TextFieldName name = msg.getName();
+        CharacterSet charSet = msg.getCharacterSet();
+        Integer width = msg.getWidth();
+        Integer rows = msg.getRows();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTFIELDNAME, name);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_CHARACTERSET, charSet);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, width);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, rows);
+
+        // Invalid/Null Tests
+        TextField msg = new TextField();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getName());
+        assertNull(TestValues.NULL, msg.getWidth());
+        assertNull(TestValues.NULL, msg.getRows());
+        assertNull(TestValues.NULL, msg.getCharacterSet());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(TextField.KEY_CHARACTER_SET, TestValues.GENERAL_CHARACTERSET);
+            reference.put(TextField.KEY_WIDTH, TestValues.GENERAL_INT);
+            reference.put(TextField.KEY_ROWS, TestValues.GENERAL_INT);
+            reference.put(TextField.KEY_NAME, TestValues.GENERAL_TEXTFIELDNAME);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
index 59d289546..dfbf4bc7c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
@@ -13,96 +13,96 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.TireStatus}
  */
 public class TireStatusTest extends TestCase {
-	
-	private TireStatus msg;
 
-	@Override
-	public void setUp() {
-		msg = new TireStatus();
-		msg.setPressureTellTale(TestValues.GENERAL_WARNINGLIGHTSTATUS);
-    	SingleTireStatus tireLeftFront = new SingleTireStatus();
-    	tireLeftFront.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-    	msg.setLeftFront(tireLeftFront);
-    	SingleTireStatus tireRightFront = new SingleTireStatus();
-    	tireRightFront.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-    	msg.setRightFront(tireRightFront);
-    	SingleTireStatus tireLeftRear = new SingleTireStatus();
-    	tireLeftRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-    	msg.setLeftRear(tireLeftRear);
-    	SingleTireStatus tireRightRear = new SingleTireStatus();
-    	tireRightRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-    	msg.setRightRear(tireRightRear);
-    	SingleTireStatus tireInnerLeftRear = new SingleTireStatus();
-    	tireInnerLeftRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-    	msg.setInnerLeftRear(tireInnerLeftRear);
-    	SingleTireStatus tireInnerRightRear = new SingleTireStatus();
-    	tireInnerRightRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-    	msg.setInnerRightRear(tireInnerRightRear);
-	}
+    private TireStatus msg;
+
+    @Override
+    public void setUp() {
+        msg = new TireStatus();
+        msg.setPressureTellTale(TestValues.GENERAL_WARNINGLIGHTSTATUS);
+        SingleTireStatus tireLeftFront = new SingleTireStatus();
+        tireLeftFront.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+        msg.setLeftFront(tireLeftFront);
+        SingleTireStatus tireRightFront = new SingleTireStatus();
+        tireRightFront.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+        msg.setRightFront(tireRightFront);
+        SingleTireStatus tireLeftRear = new SingleTireStatus();
+        tireLeftRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+        msg.setLeftRear(tireLeftRear);
+        SingleTireStatus tireRightRear = new SingleTireStatus();
+        tireRightRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+        msg.setRightRear(tireRightRear);
+        SingleTireStatus tireInnerLeftRear = new SingleTireStatus();
+        tireInnerLeftRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+        msg.setInnerLeftRear(tireInnerLeftRear);
+        SingleTireStatus tireInnerRightRear = new SingleTireStatus();
+        tireInnerRightRear.setStatus(TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+        msg.setInnerRightRear(tireInnerRightRear);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		WarningLightStatus pressure = msg.getPressureTellTale();
-		SingleTireStatus leftFront = msg.getLeftFront();
-		SingleTireStatus rightFront = msg.getRightFront();
-		SingleTireStatus leftRear = msg.getLeftRear();
-		SingleTireStatus rightRear = msg.getRightRear();
-		SingleTireStatus innerLeftRear = msg.getInnerLeftRear();
-		SingleTireStatus innerRightRear = msg.getInnerRightRear();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_WARNINGLIGHTSTATUS, pressure);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, leftFront.getStatus());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, rightFront.getStatus());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, leftRear.getStatus());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, rightRear.getStatus());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, innerLeftRear.getStatus());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, innerRightRear.getStatus());
-		
-		// Invalid/Null Tests
-		TireStatus msg = new TireStatus();
-		assertNotNull(TestValues.NOT_NULL, msg);
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        WarningLightStatus pressure = msg.getPressureTellTale();
+        SingleTireStatus leftFront = msg.getLeftFront();
+        SingleTireStatus rightFront = msg.getRightFront();
+        SingleTireStatus leftRear = msg.getLeftRear();
+        SingleTireStatus rightRear = msg.getRightRear();
+        SingleTireStatus innerLeftRear = msg.getInnerLeftRear();
+        SingleTireStatus innerRightRear = msg.getInnerRightRear();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_WARNINGLIGHTSTATUS, pressure);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, leftFront.getStatus());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, rightFront.getStatus());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, leftRear.getStatus());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, rightRear.getStatus());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, innerLeftRear.getStatus());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_COMPONENTVOLUMESTATUS, innerRightRear.getStatus());
+
+        // Invalid/Null Tests
+        TireStatus msg = new TireStatus();
+        assertNotNull(TestValues.NOT_NULL, msg);
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(TireStatus.KEY_PRESSURE_TELL_TALE, TestValues.GENERAL_WARNINGLIGHTSTATUS);
+            JSONObject tireLeftFront = new JSONObject();
+            tireLeftFront.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+            reference.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront);
+            JSONObject tireRightFront = new JSONObject();
+            tireRightFront.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+            reference.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront);
+            JSONObject tireLeftRear = new JSONObject();
+            tireLeftRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+            reference.put(TireStatus.KEY_LEFT_REAR, tireLeftRear);
+            JSONObject tireRightRear = new JSONObject();
+            tireRightRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+            reference.put(TireStatus.KEY_RIGHT_REAR, tireRightRear);
+            JSONObject tireInnerLeftRear = new JSONObject();
+            tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+            reference.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear);
+            JSONObject tireInnerRightRear = new JSONObject();
+            tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
+            reference.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-		
-		try {
-			reference.put(TireStatus.KEY_PRESSURE_TELL_TALE, TestValues.GENERAL_WARNINGLIGHTSTATUS);
-			JSONObject tireLeftFront = new JSONObject();
-			tireLeftFront.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-			reference.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront);
-			JSONObject tireRightFront = new JSONObject();
-			tireRightFront.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-			reference.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront);
-			JSONObject tireLeftRear = new JSONObject();
-			tireLeftRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-			reference.put(TireStatus.KEY_LEFT_REAR, tireLeftRear);
-			JSONObject tireRightRear = new JSONObject();
-			tireRightRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-			reference.put(TireStatus.KEY_RIGHT_REAR, tireRightRear);
-			JSONObject tireInnerLeftRear = new JSONObject();
-			tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-			reference.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear);
-			JSONObject tireInnerRightRear = new JSONObject();
-			tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, TestValues.GENERAL_COMPONENTVOLUMESTATUS);
-			reference.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear);
-			
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-			
-			assertTrue(TestValues.TRUE, Validator.validateTireStatus(
-				new TireStatus(JsonRPCMarshaller.deserializeJSONObject(reference)),
-				new TireStatus(JsonRPCMarshaller.deserializeJSONObject(underTest))));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            assertTrue(TestValues.TRUE, Validator.validateTireStatus(
+                    new TireStatus(JsonRPCMarshaller.deserializeJSONObject(reference)),
+                    new TireStatus(JsonRPCMarshaller.deserializeJSONObject(underTest))));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
index bf0242bd9..6bb4626f3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
@@ -12,58 +12,58 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.TouchCoord}
  */
 public class TouchCoordTest extends TestCase {
-	
-	private TouchCoord msg;
 
-	@Override
-	public void setUp() {
-		msg = new TouchCoord();
-		
-		msg.setX(TestValues.GENERAL_INT);
-		msg.setY(TestValues.GENERAL_INT);
-	}
+    private TouchCoord msg;
+
+    @Override
+    public void setUp() {
+        msg = new TouchCoord();
+
+        msg.setX(TestValues.GENERAL_INT);
+        msg.setY(TestValues.GENERAL_INT);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		Integer x = msg.getX();
-		Integer y = msg.getY();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, x);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, y);
-		
-		// Invalid/Null Tests
-		TouchCoord msg = new TouchCoord();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getX());
-		assertNull(TestValues.NULL, msg.getY());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(TouchCoord.KEY_X, TestValues.GENERAL_INT);
-			reference.put(TouchCoord.KEY_Y, TestValues.GENERAL_INT);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Integer x = msg.getX();
+        Integer y = msg.getY();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, x);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, y);
+
+        // Invalid/Null Tests
+        TouchCoord msg = new TouchCoord();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getX());
+        assertNull(TestValues.NULL, msg.getY());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(TouchCoord.KEY_X, TestValues.GENERAL_INT);
+            reference.put(TouchCoord.KEY_Y, TestValues.GENERAL_INT);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
index 82085632f..dba539b81 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
@@ -12,63 +12,63 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.TouchEventCapabilities}
  */
 public class TouchEventCapabilitiesTest extends TestCase {
-	
-	private TouchEventCapabilities msg;
-
-	@Override
-	public void setUp() {
-		msg = new TouchEventCapabilities();
-		
-		msg.setPressAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setDoublePressAvailable(TestValues.GENERAL_BOOLEAN);
-		msg.setMultiTouchAvailable(TestValues.GENERAL_BOOLEAN);
-	}
+
+    private TouchEventCapabilities msg;
+
+    @Override
+    public void setUp() {
+        msg = new TouchEventCapabilities();
+
+        msg.setPressAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setDoublePressAvailable(TestValues.GENERAL_BOOLEAN);
+        msg.setMultiTouchAvailable(TestValues.GENERAL_BOOLEAN);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		Boolean press = msg.getPressAvailable();
-		Boolean multiTouch = msg.getMultiTouchAvailable();
-		Boolean doublePress = msg.getDoublePressAvailable();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, press);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, multiTouch);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, doublePress);
-		
-		// Invalid/Null Tests
-		TouchEventCapabilities msg = new TouchEventCapabilities();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getPressAvailable());
-		assertNull(TestValues.NULL, msg.getMultiTouchAvailable());
-		assertNull(TestValues.NULL, msg.getDoublePressAvailable());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(TouchEventCapabilities.KEY_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(TouchEventCapabilities.KEY_MULTI_TOUCH_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-			reference.put(TouchEventCapabilities.KEY_DOUBLE_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Boolean press = msg.getPressAvailable();
+        Boolean multiTouch = msg.getMultiTouchAvailable();
+        Boolean doublePress = msg.getDoublePressAvailable();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, press);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, multiTouch);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, doublePress);
+
+        // Invalid/Null Tests
+        TouchEventCapabilities msg = new TouchEventCapabilities();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getPressAvailable());
+        assertNull(TestValues.NULL, msg.getMultiTouchAvailable());
+        assertNull(TestValues.NULL, msg.getDoublePressAvailable());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(TouchEventCapabilities.KEY_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(TouchEventCapabilities.KEY_MULTI_TOUCH_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+            reference.put(TouchEventCapabilities.KEY_DOUBLE_PRESS_AVAILABLE, TestValues.GENERAL_BOOLEAN);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
index f26558ad8..56654b679 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
@@ -15,75 +15,75 @@ import java.util.Iterator;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.TouchEvent}
  */
 public class TouchEventTest extends TestCase {
-	
-	private TouchEvent msg;
 
-	@Override
-	public void setUp() {		
-		msg = new TouchEvent();
-		msg.setId(TestValues.GENERAL_INT);
-		msg.setTs(TestValues.GENERAL_LONG_LIST);
-		msg.setC(TestValues.GENERAL_TOUCHCOORD_LIST);
-	}
+    private TouchEvent msg;
+
+    @Override
+    public void setUp() {
+        msg = new TouchEvent();
+        msg.setId(TestValues.GENERAL_INT);
+        msg.setTs(TestValues.GENERAL_LONG_LIST);
+        msg.setC(TestValues.GENERAL_TOUCHCOORD_LIST);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		Integer id = msg.getId();
-		List<Long> timestamp = msg.getTs();
-		List<TouchCoord> coordTest = msg.getC();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id);
-    	assertTrue(TestValues.TRUE, Validator.validateLongList(TestValues.GENERAL_LONG_LIST, timestamp));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_TOUCHCOORD_LIST.size(), coordTest.size());
-		
-		for (int index = 0; index < TestValues.GENERAL_TOUCHCOORD_LIST.size(); index++) {
-			assertTrue(TestValues.TRUE, Validator.validateTouchCoord(TestValues.GENERAL_TOUCHCOORD_LIST.get(index), coordTest.get(index)));
-		}
-		
-		// Invalid/Null Tests
-		TouchEvent msg = new TouchEvent();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getId());
-		assertNull(TestValues.NULL, msg.getTs());
-		assertNull(TestValues.NULL, msg.getC());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-		
-		try {			
-			reference.put(TouchEvent.KEY_ID, TestValues.GENERAL_INT);
-			reference.put(TouchEvent.KEY_TS, JsonUtils.createJsonArray(TestValues.GENERAL_LONG_LIST));
-			reference.put(TouchEvent.KEY_C, TestValues.JSON_TOUCHCOORDS);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				
-				if (key.equals(TouchEvent.KEY_C)) {
-	                assertTrue(TestValues.TRUE, JsonUtils.readIntegerFromJsonObject(reference, key) == JsonUtils.readIntegerFromJsonObject(underTest, key));
-	            } else if (key.equals(TouchEvent.KEY_TS)) {				
-					List<Long> tsListReference = JsonUtils.readLongListFromJsonObject(reference, key);
-					List<Long> tsListTest = JsonUtils.readLongListFromJsonObject(underTest, key);
-					assertTrue(TestValues.TRUE, tsListReference.containsAll(tsListTest) && tsListTest.containsAll(tsListReference));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-	            }
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Integer id = msg.getId();
+        List<Long> timestamp = msg.getTs();
+        List<TouchCoord> coordTest = msg.getC();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, id);
+        assertTrue(TestValues.TRUE, Validator.validateLongList(TestValues.GENERAL_LONG_LIST, timestamp));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_TOUCHCOORD_LIST.size(), coordTest.size());
+
+        for (int index = 0; index < TestValues.GENERAL_TOUCHCOORD_LIST.size(); index++) {
+            assertTrue(TestValues.TRUE, Validator.validateTouchCoord(TestValues.GENERAL_TOUCHCOORD_LIST.get(index), coordTest.get(index)));
+        }
+
+        // Invalid/Null Tests
+        TouchEvent msg = new TouchEvent();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getId());
+        assertNull(TestValues.NULL, msg.getTs());
+        assertNull(TestValues.NULL, msg.getC());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(TouchEvent.KEY_ID, TestValues.GENERAL_INT);
+            reference.put(TouchEvent.KEY_TS, JsonUtils.createJsonArray(TestValues.GENERAL_LONG_LIST));
+            reference.put(TouchEvent.KEY_C, TestValues.JSON_TOUCHCOORDS);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(TouchEvent.KEY_C)) {
+                    assertTrue(TestValues.TRUE, JsonUtils.readIntegerFromJsonObject(reference, key) == JsonUtils.readIntegerFromJsonObject(underTest, key));
+                } else if (key.equals(TouchEvent.KEY_TS)) {
+                    List<Long> tsListReference = JsonUtils.readLongListFromJsonObject(reference, key);
+                    List<Long> tsListTest = JsonUtils.readLongListFromJsonObject(underTest, key);
+                    assertTrue(TestValues.TRUE, tsListReference.containsAll(tsListTest) && tsListTest.containsAll(tsListReference));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
index 6b4b71988..b40d4ca6c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
@@ -11,46 +11,46 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 public class TurnTests extends TestCase {
-	
-	private Turn msg;
 
-	@Override
-    public void setUp(){
+    private Turn msg;
+
+    @Override
+    public void setUp() {
         msg = new Turn();
         assertNotNull(TestValues.NOT_NULL, msg);
-        
+
         msg.setTurnIcon(TestValues.GENERAL_IMAGE);
         msg.setNavigationText(TestValues.GENERAL_STRING);
-	}
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		Image icon = msg.getTurnIcon();
-		String text = msg.getNavigationText();
-		
-		// Valid Tests
-		assertTrue(TestValues.MATCH, Validator.validateImage(TestValues.GENERAL_IMAGE, icon));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text);
-		
-		// Invalid/Null Tests
-		Turn msg = new Turn();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		
-		assertNull(TestValues.NULL, msg.getNavigationText());
-		assertNull(TestValues.NULL, msg.getTurnIcon());
-	}
-	
-	public void testJson(){
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Image icon = msg.getTurnIcon();
+        String text = msg.getNavigationText();
+
+        // Valid Tests
+        assertTrue(TestValues.MATCH, Validator.validateImage(TestValues.GENERAL_IMAGE, icon));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text);
+
+        // Invalid/Null Tests
+        Turn msg = new Turn();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getNavigationText());
+        assertNull(TestValues.NULL, msg.getTurnIcon());
+    }
+
+    public void testJson() {
         JSONObject reference = new JSONObject();
 
-        try{
-        	reference.put(Turn.KEY_NAVIGATION_TEXT, TestValues.GENERAL_STRING);
-        	reference.put(Turn.KEY_TURN_IMAGE, TestValues.JSON_IMAGE);
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        try {
+            reference.put(Turn.KEY_NAVIGATION_TEXT, TestValues.GENERAL_STRING);
+            reference.put(Turn.KEY_TURN_IMAGE, TestValues.JSON_IMAGE);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
-	}
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
index c3b9034f0..13cdea4da 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
@@ -14,61 +14,61 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 public class VehicleDataResultTest extends TestCase {
-	
-	private VehicleDataResult msg;
-
-	@Override
-	public void setUp() {
-		msg = new VehicleDataResult();
-		
-		msg.setDataType(TestValues.GENERAL_VEHICLEDATATYPE);
-		msg.setResultCode(TestValues.GENERAL_VEHICLEDATARESULTCODE);
-		msg.setOEMCustomVehicleDataType(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
-	}
+
+    private VehicleDataResult msg;
+
+    @Override
+    public void setUp() {
+        msg = new VehicleDataResult();
+
+        msg.setDataType(TestValues.GENERAL_VEHICLEDATATYPE);
+        msg.setResultCode(TestValues.GENERAL_VEHICLEDATARESULTCODE);
+        msg.setOEMCustomVehicleDataType(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-		// Test Values
-		VehicleDataResultCode result = msg.getResultCode();
-		VehicleDataType type = msg.getDataType();
-		String oemCustomDataType = msg.getOEMCustomVehicleDataType();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATARESULTCODE, result);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATATYPE, type);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, oemCustomDataType);
-		
-		// Invalid/Null Tests
-		VehicleDataResult msg = new VehicleDataResult();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getDataType());
-		assertNull(TestValues.NULL, msg.getResultCode());
-		assertNull(TestValues.NULL, msg.getOEMCustomVehicleDataType());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(VehicleDataResult.KEY_RESULT_CODE, TestValues.GENERAL_VEHICLEDATARESULTCODE);
-			reference.put(VehicleDataResult.KEY_DATA_TYPE, TestValues.GENERAL_VEHICLEDATATYPE);
-			reference.put(VehicleDataResult.KEY_OEM_CUSTOM_DATA_TYPE, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH,
-						JsonUtils.readObjectFromJsonObject(reference, key),
-						JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        VehicleDataResultCode result = msg.getResultCode();
+        VehicleDataType type = msg.getDataType();
+        String oemCustomDataType = msg.getOEMCustomVehicleDataType();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATARESULTCODE, result);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VEHICLEDATATYPE, type);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, oemCustomDataType);
+
+        // Invalid/Null Tests
+        VehicleDataResult msg = new VehicleDataResult();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getDataType());
+        assertNull(TestValues.NULL, msg.getResultCode());
+        assertNull(TestValues.NULL, msg.getOEMCustomVehicleDataType());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(VehicleDataResult.KEY_RESULT_CODE, TestValues.GENERAL_VEHICLEDATARESULTCODE);
+            reference.put(VehicleDataResult.KEY_DATA_TYPE, TestValues.GENERAL_VEHICLEDATATYPE);
+            reference.put(VehicleDataResult.KEY_OEM_CUSTOM_DATA_TYPE, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH,
+                        JsonUtils.readObjectFromJsonObject(reference, key),
+                        JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
index 1b0d5730e..a77de7473 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
@@ -12,64 +12,64 @@ import org.json.JSONObject;
 import java.util.Iterator;
 
 public class VehicleTypeTest extends TestCase {
-	
-	private VehicleType msg;
-
-	@Override
-	public void setUp() {
-		msg = new VehicleType();
-		
-		msg.setModel(TestValues.GENERAL_STRING);
-		msg.setMake(TestValues.GENERAL_STRING);
-		msg.setTrim(TestValues.GENERAL_STRING);
-		msg.setModelYear(TestValues.GENERAL_STRING);
-	}
+
+    private VehicleType msg;
+
+    @Override
+    public void setUp() {
+        msg = new VehicleType();
+
+        msg.setModel(TestValues.GENERAL_STRING);
+        msg.setMake(TestValues.GENERAL_STRING);
+        msg.setTrim(TestValues.GENERAL_STRING);
+        msg.setModelYear(TestValues.GENERAL_STRING);
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-		// Test Values
-		String year = msg.getModelYear();
-		String trim = msg.getTrim();
-		String make = msg.getMake();
-		String model = msg.getModel();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, year);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, model);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, make);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, trim);
-		
-		// Invalid/Null Tests
-		VehicleType msg = new VehicleType();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getModel());
-		assertNull(TestValues.NULL, msg.getMake());
-		assertNull(TestValues.NULL, msg.getModelYear());
-		assertNull(TestValues.NULL, msg.getTrim());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(VehicleType.KEY_MODEL, TestValues.GENERAL_STRING);
-			reference.put(VehicleType.KEY_MAKE, TestValues.GENERAL_STRING);
-			reference.put(VehicleType.KEY_MODEL_YEAR, TestValues.GENERAL_STRING);
-			reference.put(VehicleType.KEY_TRIM, TestValues.GENERAL_STRING);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        String year = msg.getModelYear();
+        String trim = msg.getTrim();
+        String make = msg.getMake();
+        String model = msg.getModel();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, year);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, model);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, make);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, trim);
+
+        // Invalid/Null Tests
+        VehicleType msg = new VehicleType();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getModel());
+        assertNull(TestValues.NULL, msg.getMake());
+        assertNull(TestValues.NULL, msg.getModelYear());
+        assertNull(TestValues.NULL, msg.getTrim());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(VehicleType.KEY_MODEL, TestValues.GENERAL_STRING);
+            reference.put(VehicleType.KEY_MAKE, TestValues.GENERAL_STRING);
+            reference.put(VehicleType.KEY_MODEL_YEAR, TestValues.GENERAL_STRING);
+            reference.put(VehicleType.KEY_TRIM, TestValues.GENERAL_STRING);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java
index 0fb0288e2..422cd5ddc 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingCapabilityTests.java
@@ -21,94 +21,94 @@ import java.util.List;
 
 public class VideoStreamingCapabilityTests extends TestCase {
 
-	private VideoStreamingCapability msg;
-
-	@Override
-	public void setUp() {
-		msg = new VideoStreamingCapability();
-		msg.setSupportedFormats(TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST);
-		msg.setPreferredResolution(TestValues.GENERAL_IMAGERESOLUTION);
-		msg.setMaxBitrate(TestValues.GENERAL_INT);
-		msg.setIsHapticSpatialDataSupported(TestValues.GENERAL_BOOLEAN);
-		msg.setDiagonalScreenSize(TestValues.GENERAL_DOUBLE);
-		msg.setPixelPerInch(TestValues.GENERAL_DOUBLE);
-		msg.setScale(TestValues.GENERAL_DOUBLE);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		List<VideoStreamingFormat> format = msg.getSupportedFormats();
-		ImageResolution res = msg.getPreferredResolution();
-		Integer maxBitrate = msg.getMaxBitrate();
-		Boolean isHapticSpatialDataSupported = msg.getIsHapticSpatialDataSupported();
-		Double diagonalScreenSize = msg.getDiagonalScreenSize();
-		Double pixelPerInch = msg.getPixelPerInch();
-		Double scale = msg.getScale();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (List<VideoStreamingFormat>) TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST, format);
-		assertEquals(TestValues.MATCH, (ImageResolution) TestValues.GENERAL_IMAGERESOLUTION, res);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, maxBitrate);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, isHapticSpatialDataSupported);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, diagonalScreenSize);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, pixelPerInch);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, scale);
-
-		// Invalid/Null Tests
-		VideoStreamingCapability msg = new VideoStreamingCapability();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getMaxBitrate());
-		assertNull(TestValues.NULL, msg.getPreferredResolution());
-		assertNull(TestValues.NULL, msg.getSupportedFormats());
-		assertNull(TestValues.NULL, msg.getIsHapticSpatialDataSupported());
-		assertNull(TestValues.NULL, msg.getDiagonalScreenSize());
-		assertNull(TestValues.NULL, msg.getPixelPerInch());
-		assertNull(TestValues.NULL, msg.getScale());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(VideoStreamingCapability.KEY_MAX_BITRATE, TestValues.GENERAL_INT);
-			reference.put(VideoStreamingCapability.KEY_PREFERRED_RESOLUTION, TestValues.GENERAL_IMAGERESOLUTION);
-			reference.put(VideoStreamingCapability.KEY_SUPPORTED_FORMATS, TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST);
-			reference.put(VideoStreamingCapability.KEY_HAPTIC_SPATIAL_DATA_SUPPORTED, TestValues.GENERAL_BOOLEAN);
-			reference.put(VideoStreamingCapability.KEY_DIAGONAL_SCREEN_SIZE, TestValues.GENERAL_DOUBLE);
-			reference.put(VideoStreamingCapability.KEY_PIXEL_PER_INCH, TestValues.GENERAL_DOUBLE);
-			reference.put(VideoStreamingCapability.KEY_SCALE, TestValues.GENERAL_DOUBLE);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				if (key.equals(VideoStreamingCapability.KEY_MAX_BITRATE) || key.equals(VideoStreamingCapability.KEY_HAPTIC_SPATIAL_DATA_SUPPORTED)) {
-					assertTrue(TestValues.TRUE, JsonUtils.readIntegerFromJsonObject(reference, key) == JsonUtils.readIntegerFromJsonObject(underTest, key));
-				} else if (key.equals(VideoStreamingCapability.KEY_PREFERRED_RESOLUTION)) {
-					ImageResolution irReference = (ImageResolution) JsonUtils.readObjectFromJsonObject(reference, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(underTest, key));
-					assertTrue(Validator.validateImageResolution(irReference, new ImageResolution(hashTest)));
-				} else if (key.equals(VideoStreamingCapability.KEY_SUPPORTED_FORMATS)){
-					List<VideoStreamingFormat> vsfReference = (List<VideoStreamingFormat>) JsonUtils.readObjectFromJsonObject(reference, key);
-					JSONArray vsfArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					int i = 0;
-					for(VideoStreamingFormat vsf : vsfReference){
-						assertTrue(Validator.validateSupportedFormats(vsf, new VideoStreamingFormat(JsonRPCMarshaller.deserializeJSONObject(vsfArray.getJSONObject(i++)))));
-					}
-				} else if (key.equals(VideoStreamingCapability.KEY_DIAGONAL_SCREEN_SIZE) || key.equals(VideoStreamingCapability.KEY_PIXEL_PER_INCH) ||
-						key.equals(VideoStreamingCapability.KEY_SCALE)) {
-					assertEquals(JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key), 0.0005);
-				}
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private VideoStreamingCapability msg;
+
+    @Override
+    public void setUp() {
+        msg = new VideoStreamingCapability();
+        msg.setSupportedFormats(TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST);
+        msg.setPreferredResolution(TestValues.GENERAL_IMAGERESOLUTION);
+        msg.setMaxBitrate(TestValues.GENERAL_INT);
+        msg.setIsHapticSpatialDataSupported(TestValues.GENERAL_BOOLEAN);
+        msg.setDiagonalScreenSize(TestValues.GENERAL_DOUBLE);
+        msg.setPixelPerInch(TestValues.GENERAL_DOUBLE);
+        msg.setScale(TestValues.GENERAL_DOUBLE);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        List<VideoStreamingFormat> format = msg.getSupportedFormats();
+        ImageResolution res = msg.getPreferredResolution();
+        Integer maxBitrate = msg.getMaxBitrate();
+        Boolean isHapticSpatialDataSupported = msg.getIsHapticSpatialDataSupported();
+        Double diagonalScreenSize = msg.getDiagonalScreenSize();
+        Double pixelPerInch = msg.getPixelPerInch();
+        Double scale = msg.getScale();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (List<VideoStreamingFormat>) TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST, format);
+        assertEquals(TestValues.MATCH, (ImageResolution) TestValues.GENERAL_IMAGERESOLUTION, res);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, maxBitrate);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, isHapticSpatialDataSupported);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, diagonalScreenSize);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, pixelPerInch);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, scale);
+
+        // Invalid/Null Tests
+        VideoStreamingCapability msg = new VideoStreamingCapability();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getMaxBitrate());
+        assertNull(TestValues.NULL, msg.getPreferredResolution());
+        assertNull(TestValues.NULL, msg.getSupportedFormats());
+        assertNull(TestValues.NULL, msg.getIsHapticSpatialDataSupported());
+        assertNull(TestValues.NULL, msg.getDiagonalScreenSize());
+        assertNull(TestValues.NULL, msg.getPixelPerInch());
+        assertNull(TestValues.NULL, msg.getScale());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(VideoStreamingCapability.KEY_MAX_BITRATE, TestValues.GENERAL_INT);
+            reference.put(VideoStreamingCapability.KEY_PREFERRED_RESOLUTION, TestValues.GENERAL_IMAGERESOLUTION);
+            reference.put(VideoStreamingCapability.KEY_SUPPORTED_FORMATS, TestValues.GENERAL_VIDEOSTREAMINGFORMAT_LIST);
+            reference.put(VideoStreamingCapability.KEY_HAPTIC_SPATIAL_DATA_SUPPORTED, TestValues.GENERAL_BOOLEAN);
+            reference.put(VideoStreamingCapability.KEY_DIAGONAL_SCREEN_SIZE, TestValues.GENERAL_DOUBLE);
+            reference.put(VideoStreamingCapability.KEY_PIXEL_PER_INCH, TestValues.GENERAL_DOUBLE);
+            reference.put(VideoStreamingCapability.KEY_SCALE, TestValues.GENERAL_DOUBLE);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(VideoStreamingCapability.KEY_MAX_BITRATE) || key.equals(VideoStreamingCapability.KEY_HAPTIC_SPATIAL_DATA_SUPPORTED)) {
+                    assertTrue(TestValues.TRUE, JsonUtils.readIntegerFromJsonObject(reference, key) == JsonUtils.readIntegerFromJsonObject(underTest, key));
+                } else if (key.equals(VideoStreamingCapability.KEY_PREFERRED_RESOLUTION)) {
+                    ImageResolution irReference = (ImageResolution) JsonUtils.readObjectFromJsonObject(reference, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(JsonUtils.readJsonObjectFromJsonObject(underTest, key));
+                    assertTrue(Validator.validateImageResolution(irReference, new ImageResolution(hashTest)));
+                } else if (key.equals(VideoStreamingCapability.KEY_SUPPORTED_FORMATS)) {
+                    List<VideoStreamingFormat> vsfReference = (List<VideoStreamingFormat>) JsonUtils.readObjectFromJsonObject(reference, key);
+                    JSONArray vsfArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    int i = 0;
+                    for (VideoStreamingFormat vsf : vsfReference) {
+                        assertTrue(Validator.validateSupportedFormats(vsf, new VideoStreamingFormat(JsonRPCMarshaller.deserializeJSONObject(vsfArray.getJSONObject(i++)))));
+                    }
+                } else if (key.equals(VideoStreamingCapability.KEY_DIAGONAL_SCREEN_SIZE) || key.equals(VideoStreamingCapability.KEY_PIXEL_PER_INCH) ||
+                        key.equals(VideoStreamingCapability.KEY_SCALE)) {
+                    assertEquals(JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key), 0.0005);
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java
index 935751483..8a8390726 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VideoStreamingFormatTests.java
@@ -15,54 +15,54 @@ import java.util.Iterator;
 
 public class VideoStreamingFormatTests extends TestCase {
 
-	private VideoStreamingFormat msg;
-
-	@Override
-	public void setUp() {
-		msg = new VideoStreamingFormat();
-		msg.setProtocol(TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL);
-		msg.setCodec(TestValues.GENERAL_VIDEOSTREAMINGCODEC);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		VideoStreamingProtocol protocol = msg.getProtocol();
-		VideoStreamingCodec codec = msg.getCodec();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (VideoStreamingProtocol) TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL, protocol);
-		assertEquals(TestValues.MATCH, (VideoStreamingCodec) TestValues.GENERAL_VIDEOSTREAMINGCODEC, codec);
-
-		// Invalid/Null Tests
-		VideoStreamingFormat msg = new VideoStreamingFormat();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getProtocol());
-		assertNull(TestValues.NULL, msg.getCodec());
-	}
-
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {
-			reference.put(VideoStreamingFormat.KEY_PROTOCOL, TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL);
-			reference.put(VideoStreamingFormat.KEY_CODEC, TestValues.GENERAL_VIDEOSTREAMINGCODEC);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private VideoStreamingFormat msg;
+
+    @Override
+    public void setUp() {
+        msg = new VideoStreamingFormat();
+        msg.setProtocol(TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL);
+        msg.setCodec(TestValues.GENERAL_VIDEOSTREAMINGCODEC);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        VideoStreamingProtocol protocol = msg.getProtocol();
+        VideoStreamingCodec codec = msg.getCodec();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (VideoStreamingProtocol) TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL, protocol);
+        assertEquals(TestValues.MATCH, (VideoStreamingCodec) TestValues.GENERAL_VIDEOSTREAMINGCODEC, codec);
+
+        // Invalid/Null Tests
+        VideoStreamingFormat msg = new VideoStreamingFormat();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getProtocol());
+        assertNull(TestValues.NULL, msg.getCodec());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(VideoStreamingFormat.KEY_PROTOCOL, TestValues.GENERAL_VIDEOSTREAMINGPROTOCOL);
+            reference.put(VideoStreamingFormat.KEY_CODEC, TestValues.GENERAL_VIDEOSTREAMINGCODEC);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
index a60615042..b1db6a7e5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
@@ -16,70 +16,70 @@ import java.util.Hashtable;
 import java.util.Iterator;
 
 public class VrHelpItemTest extends TestCase {
-	
-	private VrHelpItem msg;
 
-	@Override
-	public void setUp() {		
-		msg = new VrHelpItem();
-		
-		msg.setText(TestValues.GENERAL_STRING);
-		msg.setImage(TestValues.GENERAL_IMAGE);
-		msg.setPosition(TestValues.GENERAL_INT);
+    private VrHelpItem msg;
 
-	}
+    @Override
+    public void setUp() {
+        msg = new VrHelpItem();
+
+        msg.setText(TestValues.GENERAL_STRING);
+        msg.setImage(TestValues.GENERAL_IMAGE);
+        msg.setPosition(TestValues.GENERAL_INT);
+
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
-    public void testRpcValues () {
-    	// Test Values
-		String text = msg.getText();
-		Image image = msg.getImage();
-		Integer position = msg.getPosition();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, position);
-		assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image));
-		
-		// Invalid/Null Tests
-		VrHelpItem msg = new VrHelpItem();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getImage());
-		assertNull(TestValues.NULL, msg.getText());
-		assertNull(TestValues.NULL, msg.getPosition());
-	}
-	
-	public void testJson() {
-		JSONObject reference = new JSONObject();
-
-		try {	        
-			reference.put(VrHelpItem.KEY_IMAGE, TestValues.JSON_IMAGE);
-			reference.put(VrHelpItem.KEY_TEXT, TestValues.GENERAL_STRING);
-			reference.put(VrHelpItem.KEY_POSITION, TestValues.GENERAL_INT);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				
-				if(key.equals(VrHelpItem.KEY_IMAGE)){
-                	JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-                	JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-                	Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
-                	Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-                	
-	                assertTrue(TestValues.TRUE, Validator.validateImage(new Image(hashReference), new Image(hashTest)));
-	            } else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-	            }
-			}
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        String text = msg.getText();
+        Image image = msg.getImage();
+        Integer position = msg.getPosition();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, text);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, position);
+        assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, image));
+
+        // Invalid/Null Tests
+        VrHelpItem msg = new VrHelpItem();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getImage());
+        assertNull(TestValues.NULL, msg.getText());
+        assertNull(TestValues.NULL, msg.getPosition());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(VrHelpItem.KEY_IMAGE, TestValues.JSON_IMAGE);
+            reference.put(VrHelpItem.KEY_TEXT, TestValues.GENERAL_STRING);
+            reference.put(VrHelpItem.KEY_POSITION, TestValues.GENERAL_INT);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(VrHelpItem.KEY_IMAGE)) {
+                    JSONObject objectEquals = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject testEquals = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashReference = JsonRPCMarshaller.deserializeJSONObject(objectEquals);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+
+                    assertTrue(TestValues.TRUE, Validator.validateImage(new Image(hashReference), new Image(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java
index f3537a29b..9fa289cb5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherAlertTests.java
@@ -23,90 +23,90 @@ import java.util.List;
  */
 public class WeatherAlertTests extends TestCase {
 
-	private WeatherAlert msg;
-
-	@Override
-	public void setUp(){
-
-		msg = new WeatherAlert();
-		msg.setExpires(TestValues.GENERAL_DATETIME);
-		msg.setTimeIssued(TestValues.GENERAL_DATETIME);
-		msg.setRegions(TestValues.GENERAL_STRING_LIST);
-		msg.setSeverity(TestValues.GENERAL_STRING);
-		msg.setSummary(TestValues.GENERAL_STRING);
-		msg.setTitle(TestValues.GENERAL_STRING);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		DateTime expires = msg.getExpires();
-		DateTime issued = msg.getTimeIssued();
-		List<String> regions = msg.getRegions();
-		String severity = msg.getSeverity();
-		String summary = msg.getSummary();
-		String title = msg.getTitle();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, expires, TestValues.GENERAL_DATETIME);
-		assertEquals(TestValues.MATCH, issued, TestValues.GENERAL_DATETIME);
-		assertEquals(TestValues.MATCH, regions, TestValues.GENERAL_STRING_LIST);
-		assertEquals(TestValues.MATCH, severity, TestValues.GENERAL_STRING);
-		assertEquals(TestValues.MATCH, summary, TestValues.GENERAL_STRING);
-		assertEquals(TestValues.MATCH, title, TestValues.GENERAL_STRING);
-
-		// Invalid/Null Tests
-		WeatherAlert msg = new WeatherAlert();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getExpires());
-		assertNull(TestValues.NULL, msg.getTimeIssued());
-		assertNull(TestValues.NULL, msg.getRegions());
-		assertNull(TestValues.NULL, msg.getSeverity());
-		assertNull(TestValues.NULL, msg.getSummary());
-		assertNull(TestValues.NULL, msg.getTitle());
-	}
-
-	public void testRequiredParamsConstructor(){
-		msg = new WeatherAlert(TestValues.GENERAL_STRING_LIST);
-		List<String> regions = msg.getRegions();
-		assertEquals(TestValues.MATCH, regions, TestValues.GENERAL_STRING_LIST);
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(WeatherAlert.KEY_EXPIRES, TestValues.GENERAL_DATETIME);
-			reference.put(WeatherAlert.KEY_TIME_ISSUED, TestValues.GENERAL_DATETIME);
-			reference.put(WeatherAlert.KEY_REGIONS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
-			reference.put(WeatherAlert.KEY_SEVERITY, TestValues.GENERAL_STRING);
-			reference.put(WeatherAlert.KEY_SUMMARY, TestValues.GENERAL_STRING);
-			reference.put(WeatherAlert.KEY_TITLE, TestValues.GENERAL_STRING);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()) {
-				String key = (String) iterator.next();
-				if (key.equals(WeatherAlert.KEY_EXPIRES)||key.equals(WeatherAlert.KEY_TIME_ISSUED)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest)));
-				} else if (key.equals(WeatherAlert.KEY_REGIONS)){
-					JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-					JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
-					assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key)));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private WeatherAlert msg;
+
+    @Override
+    public void setUp() {
+
+        msg = new WeatherAlert();
+        msg.setExpires(TestValues.GENERAL_DATETIME);
+        msg.setTimeIssued(TestValues.GENERAL_DATETIME);
+        msg.setRegions(TestValues.GENERAL_STRING_LIST);
+        msg.setSeverity(TestValues.GENERAL_STRING);
+        msg.setSummary(TestValues.GENERAL_STRING);
+        msg.setTitle(TestValues.GENERAL_STRING);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        DateTime expires = msg.getExpires();
+        DateTime issued = msg.getTimeIssued();
+        List<String> regions = msg.getRegions();
+        String severity = msg.getSeverity();
+        String summary = msg.getSummary();
+        String title = msg.getTitle();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, expires, TestValues.GENERAL_DATETIME);
+        assertEquals(TestValues.MATCH, issued, TestValues.GENERAL_DATETIME);
+        assertEquals(TestValues.MATCH, regions, TestValues.GENERAL_STRING_LIST);
+        assertEquals(TestValues.MATCH, severity, TestValues.GENERAL_STRING);
+        assertEquals(TestValues.MATCH, summary, TestValues.GENERAL_STRING);
+        assertEquals(TestValues.MATCH, title, TestValues.GENERAL_STRING);
+
+        // Invalid/Null Tests
+        WeatherAlert msg = new WeatherAlert();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getExpires());
+        assertNull(TestValues.NULL, msg.getTimeIssued());
+        assertNull(TestValues.NULL, msg.getRegions());
+        assertNull(TestValues.NULL, msg.getSeverity());
+        assertNull(TestValues.NULL, msg.getSummary());
+        assertNull(TestValues.NULL, msg.getTitle());
+    }
+
+    public void testRequiredParamsConstructor() {
+        msg = new WeatherAlert(TestValues.GENERAL_STRING_LIST);
+        List<String> regions = msg.getRegions();
+        assertEquals(TestValues.MATCH, regions, TestValues.GENERAL_STRING_LIST);
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(WeatherAlert.KEY_EXPIRES, TestValues.GENERAL_DATETIME);
+            reference.put(WeatherAlert.KEY_TIME_ISSUED, TestValues.GENERAL_DATETIME);
+            reference.put(WeatherAlert.KEY_REGIONS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
+            reference.put(WeatherAlert.KEY_SEVERITY, TestValues.GENERAL_STRING);
+            reference.put(WeatherAlert.KEY_SUMMARY, TestValues.GENERAL_STRING);
+            reference.put(WeatherAlert.KEY_TITLE, TestValues.GENERAL_STRING);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                if (key.equals(WeatherAlert.KEY_EXPIRES) || key.equals(WeatherAlert.KEY_TIME_ISSUED)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest)));
+                } else if (key.equals(WeatherAlert.KEY_REGIONS)) {
+                    JSONArray referenceArray = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                    JSONArray underTestArray = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
+                    assertTrue(TestValues.TRUE, Validator.validateStringList(JsonUtils.readStringListFromJsonObject(reference, key), JsonUtils.readStringListFromJsonObject(underTest, key)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java
index cbebce592..66ba0a0e5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherDataTests.java
@@ -23,167 +23,167 @@ import java.util.Iterator;
  */
 public class WeatherDataTests extends TestCase {
 
-	private WeatherData msg;
-
-	@Override
-	public void setUp(){
-
-		msg = new WeatherData();
-		msg.setCurrentTemperature(TestValues.GENERAL_TEMPERATURE);
-		msg.setTemperatureHigh(TestValues.GENERAL_TEMPERATURE);
-		msg.setTemperatureLow(TestValues.GENERAL_TEMPERATURE);
-		msg.setApparentTemperature(TestValues.GENERAL_TEMPERATURE);
-		msg.setApparentTemperatureHigh(TestValues.GENERAL_TEMPERATURE);
-		msg.setApparentTemperatureLow(TestValues.GENERAL_TEMPERATURE);
-		msg.setWeatherSummary(TestValues.GENERAL_STRING);
-		msg.setTime(TestValues.GENERAL_DATETIME);
-		msg.setHumidity(TestValues.GENERAL_FLOAT);
-		msg.setCloudCover(TestValues.GENERAL_FLOAT);
-		msg.setMoonPhase(TestValues.GENERAL_FLOAT);
-		msg.setWindBearing(TestValues.GENERAL_INTEGER);
-		msg.setWindGust(TestValues.GENERAL_FLOAT);
-		msg.setWindSpeed(TestValues.GENERAL_FLOAT);
-		msg.setNearestStormBearing(TestValues.GENERAL_INTEGER);
-		msg.setNearestStormDistance(TestValues.GENERAL_INTEGER);
-		msg.setPrecipAccumulation(TestValues.GENERAL_FLOAT);
-		msg.setPrecipIntensity(TestValues.GENERAL_FLOAT);
-		msg.setPrecipProbability(TestValues.GENERAL_FLOAT);
-		msg.setPrecipType(TestValues.GENERAL_STRING);
-		msg.setVisibility(TestValues.GENERAL_FLOAT);
-		msg.setWeatherIcon(TestValues.GENERAL_IMAGE);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		Temperature currentTemperature = msg.getCurrentTemperature();
-		Temperature temperatureHigh = msg.getTemperatureHigh();
-		Temperature temperatureLow = msg.getTemperatureLow();
-		Temperature apparentTemperature = msg.getApparentTemperature();
-		Temperature apparentTemperatureHigh = msg.getApparentTemperatureHigh();
-		String weatherSummary = msg.getWeatherSummary();
-		DateTime time = msg.getTime();
-		Float humidity = msg.getHumidity();
-		Float cloudCover = msg.getCloudCover();
-		Float moonPhase = msg.getMoonPhase();
-		Integer windBearing = msg.getWindBearing();
-		Float windGust = msg.getWindGust();
-		Float windSpeed = msg.getWindSpeed();
-		Integer nearestStormBearing = msg.getNearestStormBearing();
-		Integer nearestStormDistance = msg.getNearestStormDistance();
-		Float precipAccumulation = msg.getPrecipAccumulation();
-		Float precipIntensity = msg.getPrecipIntensity();
-		Float precipProbability = msg.getPrecipProbability();
-		String precipType = msg.getPrecipType();
-		Float visibility = msg.getVisibility();
-		Image weatherIcon = msg.getWeatherIcon();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, currentTemperature, TestValues.GENERAL_TEMPERATURE);
-		assertEquals(TestValues.MATCH, temperatureHigh, TestValues.GENERAL_TEMPERATURE);
-		assertEquals(TestValues.MATCH, temperatureLow, TestValues.GENERAL_TEMPERATURE);
-		assertEquals(TestValues.MATCH, apparentTemperature, TestValues.GENERAL_TEMPERATURE);
-		assertEquals(TestValues.MATCH, apparentTemperatureHigh, TestValues.GENERAL_TEMPERATURE);
-		assertEquals(TestValues.MATCH, weatherSummary, TestValues.GENERAL_STRING);
-		assertEquals(TestValues.MATCH, time, TestValues.GENERAL_DATETIME);
-		assertEquals(TestValues.MATCH, humidity, TestValues.GENERAL_FLOAT);
-		assertEquals(TestValues.MATCH, cloudCover, TestValues.GENERAL_FLOAT);
-		assertEquals(TestValues.MATCH, moonPhase, TestValues.GENERAL_FLOAT);
-		assertEquals(TestValues.MATCH, windBearing, TestValues.GENERAL_INTEGER);
-		assertEquals(TestValues.MATCH, windGust, TestValues.GENERAL_FLOAT);
-		assertEquals(TestValues.MATCH, windSpeed, TestValues.GENERAL_FLOAT);
-		assertEquals(TestValues.MATCH, nearestStormBearing, TestValues.GENERAL_INTEGER);
-		assertEquals(TestValues.MATCH, nearestStormDistance, TestValues.GENERAL_INTEGER);
-		assertEquals(TestValues.MATCH, precipAccumulation, TestValues.GENERAL_FLOAT);
-		assertEquals(TestValues.MATCH, precipIntensity, TestValues.GENERAL_FLOAT);
-		assertEquals(TestValues.MATCH, precipProbability, TestValues.GENERAL_FLOAT);
-		assertEquals(TestValues.MATCH, precipType, TestValues.GENERAL_STRING);
-		assertEquals(TestValues.MATCH, visibility, TestValues.GENERAL_FLOAT);
-		assertEquals(TestValues.MATCH, weatherIcon, TestValues.GENERAL_IMAGE);
-
-		// Invalid/Null Tests
-		WeatherData msg = new WeatherData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getCurrentTemperature());
-		assertNull(TestValues.NULL, msg.getTemperatureHigh());
-		assertNull(TestValues.NULL, msg.getTemperatureLow());
-		assertNull(TestValues.NULL, msg.getApparentTemperature());
-		assertNull(TestValues.NULL, msg.getApparentTemperatureHigh());
-		assertNull(TestValues.NULL, msg.getApparentTemperatureLow());
-		assertNull(TestValues.NULL, msg.getWeatherSummary());
-		assertNull(TestValues.NULL, msg.getTime());
-		assertNull(TestValues.NULL, msg.getHumidity());
-		assertNull(TestValues.NULL, msg.getCloudCover());
-		assertNull(TestValues.NULL, msg.getMoonPhase());
-		assertNull(TestValues.NULL, msg.getWindBearing());
-		assertNull(TestValues.NULL, msg.getWindGust());
-		assertNull(TestValues.NULL, msg.getWindSpeed());
-		assertNull(TestValues.NULL, msg.getNearestStormBearing());
-		assertNull(TestValues.NULL, msg.getNearestStormDistance());
-		assertNull(TestValues.NULL, msg.getPrecipAccumulation());
-		assertNull(TestValues.NULL, msg.getPrecipIntensity());
-		assertNull(TestValues.NULL, msg.getPrecipProbability());
-		assertNull(TestValues.NULL, msg.getPrecipType());
-		assertNull(TestValues.NULL, msg.getVisibility());
-		assertNull(TestValues.NULL, msg.getWeatherIcon());
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(WeatherData.KEY_CURRENT_TEMPERATURE, TestValues.GENERAL_TEMPERATURE);
-			reference.put(WeatherData.KEY_TEMPERATURE_HIGH, TestValues.GENERAL_TEMPERATURE);
-			reference.put(WeatherData.KEY_TEMPERATURE_LOW, TestValues.GENERAL_TEMPERATURE);
-			reference.put(WeatherData.KEY_APPARENT_TEMPERATURE, TestValues.GENERAL_TEMPERATURE);
-			reference.put(WeatherData.KEY_APPARENT_TEMPERATURE_HIGH, TestValues.GENERAL_TEMPERATURE);
-			reference.put(WeatherData.KEY_APPARENT_TEMPERATURE_LOW, TestValues.GENERAL_TEMPERATURE);
-			reference.put(WeatherData.KEY_WEATHER_SUMMARY, TestValues.GENERAL_STRING);
-			reference.put(WeatherData.KEY_TIME, TestValues.GENERAL_DATETIME);
-			reference.put(WeatherData.KEY_HUMIDITY, TestValues.GENERAL_FLOAT);
-			reference.put(WeatherData.KEY_CLOUD_COVER, TestValues.GENERAL_FLOAT);
-			reference.put(WeatherData.KEY_MOON_PHASE, TestValues.GENERAL_FLOAT);
-			reference.put(WeatherData.KEY_WIND_BEARING, TestValues.GENERAL_INTEGER);
-			reference.put(WeatherData.KEY_WIND_GUST, TestValues.GENERAL_FLOAT);
-			reference.put(WeatherData.KEY_WIND_SPEED, TestValues.GENERAL_FLOAT);
-			reference.put(WeatherData.KEY_NEAREST_STORM_BEARING, TestValues.GENERAL_INTEGER);
-			reference.put(WeatherData.KEY_NEAREST_STORM_DISTANCE, TestValues.GENERAL_INTEGER);
-			reference.put(WeatherData.KEY_PRECIP_ACCUMULATION, TestValues.GENERAL_FLOAT);
-			reference.put(WeatherData.KEY_PRECIP_INTENSITY, TestValues.GENERAL_FLOAT);
-			reference.put(WeatherData.KEY_PRECIP_PROBABILITY, TestValues.GENERAL_FLOAT);
-			reference.put(WeatherData.KEY_PRECIP_TYPE, TestValues.GENERAL_STRING);
-			reference.put(WeatherData.KEY_VISIBILITY, TestValues.GENERAL_FLOAT);
-			reference.put(WeatherData.KEY_WEATHER_ICON, TestValues.GENERAL_STRING);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()) {
-				String key = (String) iterator.next();
-				if (key.equals(WeatherData.KEY_CURRENT_TEMPERATURE) || key.equals(WeatherData.KEY_TEMPERATURE_HIGH)||
-						key.equals(WeatherData.KEY_TEMPERATURE_LOW) || key.equals(WeatherData.KEY_APPARENT_TEMPERATURE)||
-						key.equals(WeatherData.KEY_APPARENT_TEMPERATURE_HIGH) || key.equals(WeatherData.KEY_APPARENT_TEMPERATURE_LOW)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateTemperature(TestValues.GENERAL_TEMPERATURE, new Temperature(hashTest)));
-				} else if (key.equals(WeatherData.KEY_TIME)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest)));
-				} else if (key.equals(WeatherData.KEY_WEATHER_ICON)){
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, new Image(hashTest)));
-				} else {
-					assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private WeatherData msg;
+
+    @Override
+    public void setUp() {
+
+        msg = new WeatherData();
+        msg.setCurrentTemperature(TestValues.GENERAL_TEMPERATURE);
+        msg.setTemperatureHigh(TestValues.GENERAL_TEMPERATURE);
+        msg.setTemperatureLow(TestValues.GENERAL_TEMPERATURE);
+        msg.setApparentTemperature(TestValues.GENERAL_TEMPERATURE);
+        msg.setApparentTemperatureHigh(TestValues.GENERAL_TEMPERATURE);
+        msg.setApparentTemperatureLow(TestValues.GENERAL_TEMPERATURE);
+        msg.setWeatherSummary(TestValues.GENERAL_STRING);
+        msg.setTime(TestValues.GENERAL_DATETIME);
+        msg.setHumidity(TestValues.GENERAL_FLOAT);
+        msg.setCloudCover(TestValues.GENERAL_FLOAT);
+        msg.setMoonPhase(TestValues.GENERAL_FLOAT);
+        msg.setWindBearing(TestValues.GENERAL_INTEGER);
+        msg.setWindGust(TestValues.GENERAL_FLOAT);
+        msg.setWindSpeed(TestValues.GENERAL_FLOAT);
+        msg.setNearestStormBearing(TestValues.GENERAL_INTEGER);
+        msg.setNearestStormDistance(TestValues.GENERAL_INTEGER);
+        msg.setPrecipAccumulation(TestValues.GENERAL_FLOAT);
+        msg.setPrecipIntensity(TestValues.GENERAL_FLOAT);
+        msg.setPrecipProbability(TestValues.GENERAL_FLOAT);
+        msg.setPrecipType(TestValues.GENERAL_STRING);
+        msg.setVisibility(TestValues.GENERAL_FLOAT);
+        msg.setWeatherIcon(TestValues.GENERAL_IMAGE);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        Temperature currentTemperature = msg.getCurrentTemperature();
+        Temperature temperatureHigh = msg.getTemperatureHigh();
+        Temperature temperatureLow = msg.getTemperatureLow();
+        Temperature apparentTemperature = msg.getApparentTemperature();
+        Temperature apparentTemperatureHigh = msg.getApparentTemperatureHigh();
+        String weatherSummary = msg.getWeatherSummary();
+        DateTime time = msg.getTime();
+        Float humidity = msg.getHumidity();
+        Float cloudCover = msg.getCloudCover();
+        Float moonPhase = msg.getMoonPhase();
+        Integer windBearing = msg.getWindBearing();
+        Float windGust = msg.getWindGust();
+        Float windSpeed = msg.getWindSpeed();
+        Integer nearestStormBearing = msg.getNearestStormBearing();
+        Integer nearestStormDistance = msg.getNearestStormDistance();
+        Float precipAccumulation = msg.getPrecipAccumulation();
+        Float precipIntensity = msg.getPrecipIntensity();
+        Float precipProbability = msg.getPrecipProbability();
+        String precipType = msg.getPrecipType();
+        Float visibility = msg.getVisibility();
+        Image weatherIcon = msg.getWeatherIcon();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, currentTemperature, TestValues.GENERAL_TEMPERATURE);
+        assertEquals(TestValues.MATCH, temperatureHigh, TestValues.GENERAL_TEMPERATURE);
+        assertEquals(TestValues.MATCH, temperatureLow, TestValues.GENERAL_TEMPERATURE);
+        assertEquals(TestValues.MATCH, apparentTemperature, TestValues.GENERAL_TEMPERATURE);
+        assertEquals(TestValues.MATCH, apparentTemperatureHigh, TestValues.GENERAL_TEMPERATURE);
+        assertEquals(TestValues.MATCH, weatherSummary, TestValues.GENERAL_STRING);
+        assertEquals(TestValues.MATCH, time, TestValues.GENERAL_DATETIME);
+        assertEquals(TestValues.MATCH, humidity, TestValues.GENERAL_FLOAT);
+        assertEquals(TestValues.MATCH, cloudCover, TestValues.GENERAL_FLOAT);
+        assertEquals(TestValues.MATCH, moonPhase, TestValues.GENERAL_FLOAT);
+        assertEquals(TestValues.MATCH, windBearing, TestValues.GENERAL_INTEGER);
+        assertEquals(TestValues.MATCH, windGust, TestValues.GENERAL_FLOAT);
+        assertEquals(TestValues.MATCH, windSpeed, TestValues.GENERAL_FLOAT);
+        assertEquals(TestValues.MATCH, nearestStormBearing, TestValues.GENERAL_INTEGER);
+        assertEquals(TestValues.MATCH, nearestStormDistance, TestValues.GENERAL_INTEGER);
+        assertEquals(TestValues.MATCH, precipAccumulation, TestValues.GENERAL_FLOAT);
+        assertEquals(TestValues.MATCH, precipIntensity, TestValues.GENERAL_FLOAT);
+        assertEquals(TestValues.MATCH, precipProbability, TestValues.GENERAL_FLOAT);
+        assertEquals(TestValues.MATCH, precipType, TestValues.GENERAL_STRING);
+        assertEquals(TestValues.MATCH, visibility, TestValues.GENERAL_FLOAT);
+        assertEquals(TestValues.MATCH, weatherIcon, TestValues.GENERAL_IMAGE);
+
+        // Invalid/Null Tests
+        WeatherData msg = new WeatherData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getCurrentTemperature());
+        assertNull(TestValues.NULL, msg.getTemperatureHigh());
+        assertNull(TestValues.NULL, msg.getTemperatureLow());
+        assertNull(TestValues.NULL, msg.getApparentTemperature());
+        assertNull(TestValues.NULL, msg.getApparentTemperatureHigh());
+        assertNull(TestValues.NULL, msg.getApparentTemperatureLow());
+        assertNull(TestValues.NULL, msg.getWeatherSummary());
+        assertNull(TestValues.NULL, msg.getTime());
+        assertNull(TestValues.NULL, msg.getHumidity());
+        assertNull(TestValues.NULL, msg.getCloudCover());
+        assertNull(TestValues.NULL, msg.getMoonPhase());
+        assertNull(TestValues.NULL, msg.getWindBearing());
+        assertNull(TestValues.NULL, msg.getWindGust());
+        assertNull(TestValues.NULL, msg.getWindSpeed());
+        assertNull(TestValues.NULL, msg.getNearestStormBearing());
+        assertNull(TestValues.NULL, msg.getNearestStormDistance());
+        assertNull(TestValues.NULL, msg.getPrecipAccumulation());
+        assertNull(TestValues.NULL, msg.getPrecipIntensity());
+        assertNull(TestValues.NULL, msg.getPrecipProbability());
+        assertNull(TestValues.NULL, msg.getPrecipType());
+        assertNull(TestValues.NULL, msg.getVisibility());
+        assertNull(TestValues.NULL, msg.getWeatherIcon());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(WeatherData.KEY_CURRENT_TEMPERATURE, TestValues.GENERAL_TEMPERATURE);
+            reference.put(WeatherData.KEY_TEMPERATURE_HIGH, TestValues.GENERAL_TEMPERATURE);
+            reference.put(WeatherData.KEY_TEMPERATURE_LOW, TestValues.GENERAL_TEMPERATURE);
+            reference.put(WeatherData.KEY_APPARENT_TEMPERATURE, TestValues.GENERAL_TEMPERATURE);
+            reference.put(WeatherData.KEY_APPARENT_TEMPERATURE_HIGH, TestValues.GENERAL_TEMPERATURE);
+            reference.put(WeatherData.KEY_APPARENT_TEMPERATURE_LOW, TestValues.GENERAL_TEMPERATURE);
+            reference.put(WeatherData.KEY_WEATHER_SUMMARY, TestValues.GENERAL_STRING);
+            reference.put(WeatherData.KEY_TIME, TestValues.GENERAL_DATETIME);
+            reference.put(WeatherData.KEY_HUMIDITY, TestValues.GENERAL_FLOAT);
+            reference.put(WeatherData.KEY_CLOUD_COVER, TestValues.GENERAL_FLOAT);
+            reference.put(WeatherData.KEY_MOON_PHASE, TestValues.GENERAL_FLOAT);
+            reference.put(WeatherData.KEY_WIND_BEARING, TestValues.GENERAL_INTEGER);
+            reference.put(WeatherData.KEY_WIND_GUST, TestValues.GENERAL_FLOAT);
+            reference.put(WeatherData.KEY_WIND_SPEED, TestValues.GENERAL_FLOAT);
+            reference.put(WeatherData.KEY_NEAREST_STORM_BEARING, TestValues.GENERAL_INTEGER);
+            reference.put(WeatherData.KEY_NEAREST_STORM_DISTANCE, TestValues.GENERAL_INTEGER);
+            reference.put(WeatherData.KEY_PRECIP_ACCUMULATION, TestValues.GENERAL_FLOAT);
+            reference.put(WeatherData.KEY_PRECIP_INTENSITY, TestValues.GENERAL_FLOAT);
+            reference.put(WeatherData.KEY_PRECIP_PROBABILITY, TestValues.GENERAL_FLOAT);
+            reference.put(WeatherData.KEY_PRECIP_TYPE, TestValues.GENERAL_STRING);
+            reference.put(WeatherData.KEY_VISIBILITY, TestValues.GENERAL_FLOAT);
+            reference.put(WeatherData.KEY_WEATHER_ICON, TestValues.GENERAL_STRING);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                if (key.equals(WeatherData.KEY_CURRENT_TEMPERATURE) || key.equals(WeatherData.KEY_TEMPERATURE_HIGH) ||
+                        key.equals(WeatherData.KEY_TEMPERATURE_LOW) || key.equals(WeatherData.KEY_APPARENT_TEMPERATURE) ||
+                        key.equals(WeatherData.KEY_APPARENT_TEMPERATURE_HIGH) || key.equals(WeatherData.KEY_APPARENT_TEMPERATURE_LOW)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateTemperature(TestValues.GENERAL_TEMPERATURE, new Temperature(hashTest)));
+                } else if (key.equals(WeatherData.KEY_TIME)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateDateTime(TestValues.GENERAL_DATETIME, new DateTime(hashTest)));
+                } else if (key.equals(WeatherData.KEY_WEATHER_ICON)) {
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, new Image(hashTest)));
+                } else {
+                    assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java
index 3e3e26d95..10d40ddfc 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceDataTests.java
@@ -27,116 +27,116 @@ import java.util.List;
  */
 public class WeatherServiceDataTests extends TestCase {
 
-	private WeatherServiceData msg;
-
-	@Override
-	public void setUp(){
-
-		msg = new WeatherServiceData();
-		msg.setLocation(TestValues.GENERAL_LOCATIONDETAILS);
-		msg.setCurrentForecast(TestValues.GENERAL_WEATHERDATA);
-		msg.setMinuteForecast(TestValues.GENERAL_WEATHERDATA_LIST);
-		msg.setHourlyForecast(TestValues.GENERAL_WEATHERDATA_LIST);
-		msg.setMultidayForecast(TestValues.GENERAL_WEATHERDATA_LIST);
-		msg.setAlerts(TestValues.GENERAL_WEATHERALERT_LIST);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		LocationDetails location = msg.getLocation();
-		WeatherData currentForecast = msg.getCurrentForecast();
-		List<WeatherData> minuteForecast = msg.getMinuteForecast();
-		List<WeatherData> hourlyForecast = msg.getHourlyForecast();
-		List<WeatherData> multidayForecast = msg.getMultidayForecast();
-		List<WeatherAlert> alerts = msg.getAlerts();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_LOCATIONDETAILS, location);
-		assertEquals(TestValues.GENERAL_WEATHERDATA, currentForecast);
-		assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, minuteForecast);
-		assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, hourlyForecast);
-		assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, multidayForecast);
-		assertEquals(TestValues.GENERAL_WEATHERALERT_LIST, alerts);
-
-		// Invalid/Null Tests
-		WeatherServiceData msg = new WeatherServiceData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getLocation());
-		assertNull(TestValues.NULL, msg.getCurrentForecast());
-		assertNull(TestValues.NULL, msg.getMinuteForecast());
-		assertNull(TestValues.NULL, msg.getHourlyForecast());
-		assertNull(TestValues.NULL, msg.getMultidayForecast());
-		assertNull(TestValues.NULL, msg.getAlerts());
-	}
-
-	public void testRequiredParamsConstructor(){
-		msg = new WeatherServiceData(TestValues.GENERAL_LOCATIONDETAILS);
-		LocationDetails location = msg.getLocation();
-		assertEquals(TestValues.GENERAL_LOCATIONDETAILS, location);
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(WeatherServiceData.KEY_LOCATION, TestValues.GENERAL_LOCATIONDETAILS);
-			reference.put(WeatherServiceData.KEY_CURRENT_FORECAST, TestValues.GENERAL_WEATHERDATA);
-			reference.put(WeatherServiceData.KEY_MINUTE_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST);
-			reference.put(WeatherServiceData.KEY_HOURLY_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST);
-			reference.put(WeatherServiceData.KEY_MULTIDAY_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST);
-			reference.put(WeatherServiceData.KEY_ALERTS, TestValues.GENERAL_WEATHERALERT_LIST);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-
-				if(key.equals(WeatherServiceData.KEY_LOCATION)){
-
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateLocationDetails( TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest)));
-
-				} else if(key.equals(WeatherServiceData.KEY_CURRENT_FORECAST)){
-
-					JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
-					Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
-					assertTrue(TestValues.TRUE, Validator.validateWeatherData( TestValues.GENERAL_WEATHERDATA, new WeatherData(hashTest)));
-
-				} else if(key.equals(WeatherServiceData.KEY_MINUTE_FORECAST) || key.equals(WeatherServiceData.KEY_HOURLY_FORECAST)
-						|| key.equals(WeatherServiceData.KEY_MULTIDAY_FORECAST)){
-
-					JSONArray weatherDataArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					List<WeatherData> weatherDataUnderTestList = new ArrayList<>();
-					for (int index = 0; index < weatherDataArrayObjTest.length(); index++) {
-						WeatherData weatherData1 = new WeatherData(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)weatherDataArrayObjTest.get(index) ));
-						weatherDataUnderTestList.add(weatherData1);
-					}
-
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateWeatherDataList(TestValues.GENERAL_WEATHERDATA_LIST, weatherDataUnderTestList));
-
-				} else if(key.equals(WeatherServiceData.KEY_ALERTS)){
-
-					JSONArray weatherAlertArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					List<WeatherAlert> weatherAlertUnderTestList = new ArrayList<>();
-					for (int index = 0; index < weatherAlertArrayObjTest.length(); index++) {
-						WeatherAlert weatherAlert1 = new WeatherAlert(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)weatherAlertArrayObjTest.get(index) ));
-						weatherAlertUnderTestList.add(weatherAlert1);
-					}
-
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateWeatherAlertList(TestValues.GENERAL_WEATHERALERT_LIST, weatherAlertUnderTestList));
-				}
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private WeatherServiceData msg;
+
+    @Override
+    public void setUp() {
+
+        msg = new WeatherServiceData();
+        msg.setLocation(TestValues.GENERAL_LOCATIONDETAILS);
+        msg.setCurrentForecast(TestValues.GENERAL_WEATHERDATA);
+        msg.setMinuteForecast(TestValues.GENERAL_WEATHERDATA_LIST);
+        msg.setHourlyForecast(TestValues.GENERAL_WEATHERDATA_LIST);
+        msg.setMultidayForecast(TestValues.GENERAL_WEATHERDATA_LIST);
+        msg.setAlerts(TestValues.GENERAL_WEATHERALERT_LIST);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        LocationDetails location = msg.getLocation();
+        WeatherData currentForecast = msg.getCurrentForecast();
+        List<WeatherData> minuteForecast = msg.getMinuteForecast();
+        List<WeatherData> hourlyForecast = msg.getHourlyForecast();
+        List<WeatherData> multidayForecast = msg.getMultidayForecast();
+        List<WeatherAlert> alerts = msg.getAlerts();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_LOCATIONDETAILS, location);
+        assertEquals(TestValues.GENERAL_WEATHERDATA, currentForecast);
+        assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, minuteForecast);
+        assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, hourlyForecast);
+        assertEquals(TestValues.GENERAL_WEATHERDATA_LIST, multidayForecast);
+        assertEquals(TestValues.GENERAL_WEATHERALERT_LIST, alerts);
+
+        // Invalid/Null Tests
+        WeatherServiceData msg = new WeatherServiceData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getLocation());
+        assertNull(TestValues.NULL, msg.getCurrentForecast());
+        assertNull(TestValues.NULL, msg.getMinuteForecast());
+        assertNull(TestValues.NULL, msg.getHourlyForecast());
+        assertNull(TestValues.NULL, msg.getMultidayForecast());
+        assertNull(TestValues.NULL, msg.getAlerts());
+    }
+
+    public void testRequiredParamsConstructor() {
+        msg = new WeatherServiceData(TestValues.GENERAL_LOCATIONDETAILS);
+        LocationDetails location = msg.getLocation();
+        assertEquals(TestValues.GENERAL_LOCATIONDETAILS, location);
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(WeatherServiceData.KEY_LOCATION, TestValues.GENERAL_LOCATIONDETAILS);
+            reference.put(WeatherServiceData.KEY_CURRENT_FORECAST, TestValues.GENERAL_WEATHERDATA);
+            reference.put(WeatherServiceData.KEY_MINUTE_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST);
+            reference.put(WeatherServiceData.KEY_HOURLY_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST);
+            reference.put(WeatherServiceData.KEY_MULTIDAY_FORECAST, TestValues.GENERAL_WEATHERDATA_LIST);
+            reference.put(WeatherServiceData.KEY_ALERTS, TestValues.GENERAL_WEATHERALERT_LIST);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(WeatherServiceData.KEY_LOCATION)) {
+
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateLocationDetails(TestValues.GENERAL_LOCATIONDETAILS, new LocationDetails(hashTest)));
+
+                } else if (key.equals(WeatherServiceData.KEY_CURRENT_FORECAST)) {
+
+                    JSONObject testEquals = (JSONObject) JsonUtils.readObjectFromJsonObject(underTest, key);
+                    Hashtable<String, Object> hashTest = JsonRPCMarshaller.deserializeJSONObject(testEquals);
+                    assertTrue(TestValues.TRUE, Validator.validateWeatherData(TestValues.GENERAL_WEATHERDATA, new WeatherData(hashTest)));
+
+                } else if (key.equals(WeatherServiceData.KEY_MINUTE_FORECAST) || key.equals(WeatherServiceData.KEY_HOURLY_FORECAST)
+                        || key.equals(WeatherServiceData.KEY_MULTIDAY_FORECAST)) {
+
+                    JSONArray weatherDataArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    List<WeatherData> weatherDataUnderTestList = new ArrayList<>();
+                    for (int index = 0; index < weatherDataArrayObjTest.length(); index++) {
+                        WeatherData weatherData1 = new WeatherData(JsonRPCMarshaller.deserializeJSONObject((JSONObject) weatherDataArrayObjTest.get(index)));
+                        weatherDataUnderTestList.add(weatherData1);
+                    }
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateWeatherDataList(TestValues.GENERAL_WEATHERDATA_LIST, weatherDataUnderTestList));
+
+                } else if (key.equals(WeatherServiceData.KEY_ALERTS)) {
+
+                    JSONArray weatherAlertArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    List<WeatherAlert> weatherAlertUnderTestList = new ArrayList<>();
+                    for (int index = 0; index < weatherAlertArrayObjTest.length(); index++) {
+                        WeatherAlert weatherAlert1 = new WeatherAlert(JsonRPCMarshaller.deserializeJSONObject((JSONObject) weatherAlertArrayObjTest.get(index)));
+                        weatherAlertUnderTestList.add(weatherAlert1);
+                    }
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateWeatherAlertList(TestValues.GENERAL_WEATHERALERT_LIST, weatherAlertUnderTestList));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java
index 7a576569b..87c1e4639 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WeatherServiceManifestTests.java
@@ -17,68 +17,68 @@ import java.util.Iterator;
  */
 public class WeatherServiceManifestTests extends TestCase {
 
-	private WeatherServiceManifest msg;
-
-	@Override
-	public void setUp(){
-		msg = new WeatherServiceManifest();
-
-		msg.setCurrentForecastSupported(TestValues.GENERAL_BOOLEAN);
-		msg.setMaxHourlyForecastAmount(TestValues.GENERAL_INT);
-		msg.setMaxMinutelyForecastAmount(TestValues.GENERAL_INT);
-		msg.setMaxMultidayForecastAmount(TestValues.GENERAL_INT);
-		msg.setWeatherForLocationSupported(TestValues.GENERAL_BOOLEAN);
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	public void testRpcValues () {
-		// Test Values
-		boolean currentForecastSupported = msg.getCurrentForecastSupported();
-		boolean weatherForLocationSupported = msg.getWeatherForLocationSupported();
-		Integer getMaxHourlyForecastAmt = msg.getMaxHourlyForecastAmount();
-		Integer getMaxMinutelyForecastAmt = msg.getMaxMinutelyForecastAmount();
-		Integer getMaxMultidayForecastAmt = msg.getMaxMultidayForecastAmount();
-
-		// Valid Tests
-		assertEquals(TestValues.GENERAL_BOOLEAN, currentForecastSupported);
-		assertEquals(TestValues.GENERAL_BOOLEAN, weatherForLocationSupported);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxHourlyForecastAmt);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxMinutelyForecastAmt);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxMultidayForecastAmt);
-
-		// Invalid/Null Tests
-		WeatherServiceManifest msg = new WeatherServiceManifest();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		assertNull(TestValues.NULL, msg.getCurrentForecastSupported());
-		assertNull(TestValues.NULL, msg.getWeatherForLocationSupported());
-		assertNull(TestValues.NULL, msg.getMaxHourlyForecastAmount());
-		assertNull(TestValues.NULL, msg.getMaxMinutelyForecastAmount());
-		assertNull(TestValues.NULL, msg.getMaxMultidayForecastAmount());
-	}
-
-	public void testJson(){
-		JSONObject reference = new JSONObject();
-
-		try{
-			reference.put(WeatherServiceManifest.KEY_CURRENT_FORECAST_SUPPORTED, TestValues.GENERAL_BOOLEAN);
-			reference.put(WeatherServiceManifest.KEY_WEATHER_FOR_LOCATION_SUPPORTED, TestValues.GENERAL_BOOLEAN);
-			reference.put(WeatherServiceManifest.KEY_MAX_HOURLY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER);
-			reference.put(WeatherServiceManifest.KEY_MAX_MINUTELY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER);
-			reference.put(WeatherServiceManifest.KEY_MAX_MULTIDAY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER);
-
-			JSONObject underTest = msg.serializeJSON();
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			while(iterator.hasNext()){
-				String key = (String) iterator.next();
-				assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-			}
-		} catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    private WeatherServiceManifest msg;
+
+    @Override
+    public void setUp() {
+        msg = new WeatherServiceManifest();
+
+        msg.setCurrentForecastSupported(TestValues.GENERAL_BOOLEAN);
+        msg.setMaxHourlyForecastAmount(TestValues.GENERAL_INT);
+        msg.setMaxMinutelyForecastAmount(TestValues.GENERAL_INT);
+        msg.setMaxMultidayForecastAmount(TestValues.GENERAL_INT);
+        msg.setWeatherForLocationSupported(TestValues.GENERAL_BOOLEAN);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    public void testRpcValues() {
+        // Test Values
+        boolean currentForecastSupported = msg.getCurrentForecastSupported();
+        boolean weatherForLocationSupported = msg.getWeatherForLocationSupported();
+        Integer getMaxHourlyForecastAmt = msg.getMaxHourlyForecastAmount();
+        Integer getMaxMinutelyForecastAmt = msg.getMaxMinutelyForecastAmount();
+        Integer getMaxMultidayForecastAmt = msg.getMaxMultidayForecastAmount();
+
+        // Valid Tests
+        assertEquals(TestValues.GENERAL_BOOLEAN, currentForecastSupported);
+        assertEquals(TestValues.GENERAL_BOOLEAN, weatherForLocationSupported);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxHourlyForecastAmt);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxMinutelyForecastAmt);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, getMaxMultidayForecastAmt);
+
+        // Invalid/Null Tests
+        WeatherServiceManifest msg = new WeatherServiceManifest();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        assertNull(TestValues.NULL, msg.getCurrentForecastSupported());
+        assertNull(TestValues.NULL, msg.getWeatherForLocationSupported());
+        assertNull(TestValues.NULL, msg.getMaxHourlyForecastAmount());
+        assertNull(TestValues.NULL, msg.getMaxMinutelyForecastAmount());
+        assertNull(TestValues.NULL, msg.getMaxMultidayForecastAmount());
+    }
+
+    public void testJson() {
+        JSONObject reference = new JSONObject();
+
+        try {
+            reference.put(WeatherServiceManifest.KEY_CURRENT_FORECAST_SUPPORTED, TestValues.GENERAL_BOOLEAN);
+            reference.put(WeatherServiceManifest.KEY_WEATHER_FOR_LOCATION_SUPPORTED, TestValues.GENERAL_BOOLEAN);
+            reference.put(WeatherServiceManifest.KEY_MAX_HOURLY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER);
+            reference.put(WeatherServiceManifest.KEY_MAX_MINUTELY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER);
+            reference.put(WeatherServiceManifest.KEY_MAX_MULTIDAY_FORECAST_AMOUNT, TestValues.GENERAL_INTEGER);
+
+            JSONObject underTest = msg.serializeJSON();
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+                assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java
index 6ddee819b..cee5b5f84 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/WindowCapabilityTests.java
@@ -92,7 +92,7 @@ public class WindowCapabilityTests extends TestCase {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.get(i), templatesAvailable.get(i));
         }
 
-        for(int i = 0; i < TestValues.GENERAL_MENU_LAYOUT_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_MENU_LAYOUT_LIST.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_MENU_LAYOUT_LIST.get(i), menuLayouts.get(i));
         }
 
@@ -210,8 +210,8 @@ public class WindowCapabilityTests extends TestCase {
                     assertEquals(TestValues.MATCH, referenceArray.length(), underTestArray.length());
 
                     for (int i = 0; i < referenceArray.length(); i++) {
-                        imageFieldNameListReference.add( (ImageFieldName) referenceArray.get(i));
-                        imageFieldNameListTest.add( (ImageFieldName) underTestArray.get(i));
+                        imageFieldNameListReference.add((ImageFieldName) referenceArray.get(i));
+                        imageFieldNameListTest.add((ImageFieldName) underTestArray.get(i));
                     }
                     assertTrue(TestValues.TRUE, imageFieldNameListReference.containsAll(imageFieldNameListTest) && imageFieldNameListTest.containsAll(imageFieldNameListReference));
                 } else {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
index adc398eff..5c90c09ed 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
@@ -9,89 +9,87 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.AmbientLightStatus}
  */
 public class AmbientLightStatusTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {	
-		
-		String example = "DAY";
-		AmbientLightStatus enumDay = AmbientLightStatus.valueForString(example);
-		example = "NIGHT";
-		AmbientLightStatus enumNight = AmbientLightStatus.valueForString(example);
-		example = "UNKNOWN";
-		AmbientLightStatus enumUnknown = AmbientLightStatus.valueForString(example);
-		example = "INVALID";
-		AmbientLightStatus enumInvalid = AmbientLightStatus.valueForString(example);
-		example = "TWILIGHT_1";
-		AmbientLightStatus enumTwilight1 = AmbientLightStatus.valueForString(example);
-		example = "TWILIGHT_2";
-		AmbientLightStatus enumTwilight2 = AmbientLightStatus.valueForString(example);
-		example = "TWILIGHT_3";
-		AmbientLightStatus enumTwilight3 = AmbientLightStatus.valueForString(example);
-		example = "TWILIGHT_4";
-		AmbientLightStatus enumTwilight4 = AmbientLightStatus.valueForString(example);
-			
-		assertNotNull("DAY returned null", enumDay);
-		assertNotNull("NIGHT returned null", enumNight);
-		assertNotNull("UNKNOWN returned null", enumUnknown);
-		assertNotNull("INVALID returned null", enumInvalid);
-		assertNotNull("TWILIGHT_1 returned null", enumTwilight1);
-		assertNotNull("TWILIGHT_2 returned null", enumTwilight2);
-		assertNotNull("TWILIGHT_3 returned null", enumTwilight3);
-		assertNotNull("TWILIGHT_4 returned null", enumTwilight4);		
-	}	
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "niGHt";
-		try {
-		    AmbientLightStatus temp = AmbientLightStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+
+        String example = "DAY";
+        AmbientLightStatus enumDay = AmbientLightStatus.valueForString(example);
+        example = "NIGHT";
+        AmbientLightStatus enumNight = AmbientLightStatus.valueForString(example);
+        example = "UNKNOWN";
+        AmbientLightStatus enumUnknown = AmbientLightStatus.valueForString(example);
+        example = "INVALID";
+        AmbientLightStatus enumInvalid = AmbientLightStatus.valueForString(example);
+        example = "TWILIGHT_1";
+        AmbientLightStatus enumTwilight1 = AmbientLightStatus.valueForString(example);
+        example = "TWILIGHT_2";
+        AmbientLightStatus enumTwilight2 = AmbientLightStatus.valueForString(example);
+        example = "TWILIGHT_3";
+        AmbientLightStatus enumTwilight3 = AmbientLightStatus.valueForString(example);
+        example = "TWILIGHT_4";
+        AmbientLightStatus enumTwilight4 = AmbientLightStatus.valueForString(example);
+
+        assertNotNull("DAY returned null", enumDay);
+        assertNotNull("NIGHT returned null", enumNight);
+        assertNotNull("UNKNOWN returned null", enumUnknown);
+        assertNotNull("INVALID returned null", enumInvalid);
+        assertNotNull("TWILIGHT_1 returned null", enumTwilight1);
+        assertNotNull("TWILIGHT_2 returned null", enumTwilight2);
+        assertNotNull("TWILIGHT_3 returned null", enumTwilight3);
+        assertNotNull("TWILIGHT_4 returned null", enumTwilight4);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "niGHt";
+        try {
+            AmbientLightStatus temp = AmbientLightStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    AmbientLightStatus temp = AmbientLightStatus.valueForString(example);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            AmbientLightStatus temp = AmbientLightStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
-	
-	/**
-	 * Verifies the possible enum values of AmbientLightStatus.
-	 */
-	public void testListEnum() {
- 		List<AmbientLightStatus> enumValueList = Arrays.asList(AmbientLightStatus.values()); 		
-		List<AmbientLightStatus> enumTestList = new ArrayList<AmbientLightStatus>();
-		
-		enumTestList.add(AmbientLightStatus.DAY);
-		enumTestList.add(AmbientLightStatus.NIGHT);
-		enumTestList.add(AmbientLightStatus.UNKNOWN);		
-		enumTestList.add(AmbientLightStatus.INVALID);
-		enumTestList.add(AmbientLightStatus.TWILIGHT_1);
-		enumTestList.add(AmbientLightStatus.TWILIGHT_2);
-		enumTestList.add(AmbientLightStatus.TWILIGHT_3);
-		enumTestList.add(AmbientLightStatus.TWILIGHT_4);
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of AmbientLightStatus.
+     */
+    public void testListEnum() {
+        List<AmbientLightStatus> enumValueList = Arrays.asList(AmbientLightStatus.values());
+        List<AmbientLightStatus> enumTestList = new ArrayList<AmbientLightStatus>();
+
+        enumTestList.add(AmbientLightStatus.DAY);
+        enumTestList.add(AmbientLightStatus.NIGHT);
+        enumTestList.add(AmbientLightStatus.UNKNOWN);
+        enumTestList.add(AmbientLightStatus.INVALID);
+        enumTestList.add(AmbientLightStatus.TWILIGHT_1);
+        enumTestList.add(AmbientLightStatus.TWILIGHT_2);
+        enumTestList.add(AmbientLightStatus.TWILIGHT_3);
+        enumTestList.add(AmbientLightStatus.TWILIGHT_4);
 
-		assertTrue("Enum value list does not match enum class list.", 
-					enumValueList.containsAll(enumTestList) && 
-					enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
index af0881ad6..32e1d1284 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
@@ -9,107 +9,105 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "COMMUNICATION";
-		AppHMIType enumCommunication = AppHMIType.valueForString(example);
-		example = "MEDIA";
-		AppHMIType enumMedia = AppHMIType.valueForString(example);
-		example = "MESSAGING";
-		AppHMIType enumMessaging = AppHMIType.valueForString(example);
-		example = "NAVIGATION";
-		AppHMIType enumNavigation = AppHMIType.valueForString(example);
-		example = "INFORMATION";
-		AppHMIType enumInformation = AppHMIType.valueForString(example);
-		example = "SOCIAL";
-		AppHMIType enumSocial = AppHMIType.valueForString(example);
-		example = "BACKGROUND_PROCESS";
-		AppHMIType enumBackgroundProcess = AppHMIType.valueForString(example);
-		example = "PROJECTION";
-		AppHMIType enumProjection = AppHMIType.valueForString(example);
-		example = "TESTING";
-		AppHMIType enumTesting = AppHMIType.valueForString(example);
-		example = "SYSTEM";
-		AppHMIType enumSystem = AppHMIType.valueForString(example);
-		example = "REMOTE_CONTROL";
-		AppHMIType enumRemoteControl = AppHMIType.valueForString(example);
-		example = "WEB_VIEW";
-		AppHMIType enumWebView = AppHMIType.valueForString(example);
-		
-		assertNotNull("DEFAULT returned null", enumDefault);
-		assertNotNull("COMMUNICATION returned null", enumCommunication);
-		assertNotNull("MEDIA returned null", enumMedia);
-		assertNotNull("MESSAGING returned null", enumMessaging);
-		assertNotNull("NAVIGATION returned null", enumNavigation);
-		assertNotNull("INFORMATION returned null", enumInformation);
-		assertNotNull("SOCIAL returned null", enumSocial);
-		assertNotNull("BACKGROUND_PROCESS returned null", enumBackgroundProcess);
-		assertNotNull("PROJECTION returned null", enumProjection);
-		assertNotNull("TESTING returned null", enumTesting);
-		assertNotNull("SYSTEM returned null", enumSystem);
-		assertNotNull("REMOTE_CONTROL returned null", enumRemoteControl);
-		assertNotNull("WEB_VIEW returned null", enumWebView);
-	}
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "deFaUlt";
-		try {
-		    AppHMIType temp = AppHMIType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "DEFAULT";
+        AppHMIType enumDefault = AppHMIType.valueForString(example);
+        example = "COMMUNICATION";
+        AppHMIType enumCommunication = AppHMIType.valueForString(example);
+        example = "MEDIA";
+        AppHMIType enumMedia = AppHMIType.valueForString(example);
+        example = "MESSAGING";
+        AppHMIType enumMessaging = AppHMIType.valueForString(example);
+        example = "NAVIGATION";
+        AppHMIType enumNavigation = AppHMIType.valueForString(example);
+        example = "INFORMATION";
+        AppHMIType enumInformation = AppHMIType.valueForString(example);
+        example = "SOCIAL";
+        AppHMIType enumSocial = AppHMIType.valueForString(example);
+        example = "BACKGROUND_PROCESS";
+        AppHMIType enumBackgroundProcess = AppHMIType.valueForString(example);
+        example = "PROJECTION";
+        AppHMIType enumProjection = AppHMIType.valueForString(example);
+        example = "TESTING";
+        AppHMIType enumTesting = AppHMIType.valueForString(example);
+        example = "SYSTEM";
+        AppHMIType enumSystem = AppHMIType.valueForString(example);
+        example = "REMOTE_CONTROL";
+        AppHMIType enumRemoteControl = AppHMIType.valueForString(example);
+        example = "WEB_VIEW";
+        AppHMIType enumWebView = AppHMIType.valueForString(example);
+
+        assertNotNull("DEFAULT returned null", enumDefault);
+        assertNotNull("COMMUNICATION returned null", enumCommunication);
+        assertNotNull("MEDIA returned null", enumMedia);
+        assertNotNull("MESSAGING returned null", enumMessaging);
+        assertNotNull("NAVIGATION returned null", enumNavigation);
+        assertNotNull("INFORMATION returned null", enumInformation);
+        assertNotNull("SOCIAL returned null", enumSocial);
+        assertNotNull("BACKGROUND_PROCESS returned null", enumBackgroundProcess);
+        assertNotNull("PROJECTION returned null", enumProjection);
+        assertNotNull("TESTING returned null", enumTesting);
+        assertNotNull("SYSTEM returned null", enumSystem);
+        assertNotNull("REMOTE_CONTROL returned null", enumRemoteControl);
+        assertNotNull("WEB_VIEW returned null", enumWebView);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "deFaUlt";
+        try {
+            AppHMIType temp = AppHMIType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    AppHMIType temp = AppHMIType.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            AppHMIType temp = AppHMIType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of AmbientLightStatus.
-	 */
-	public void testListEnum() {
- 		List<AppHMIType> enumValueList = Arrays.asList(AppHMIType.values());
- 		
-		List<AppHMIType> enumTestList = new ArrayList<AppHMIType>();
-		enumTestList.add(AppHMIType.DEFAULT);
-		enumTestList.add(AppHMIType.COMMUNICATION);
-		enumTestList.add(AppHMIType.MEDIA);
-		enumTestList.add(AppHMIType.MESSAGING);
-		enumTestList.add(AppHMIType.NAVIGATION);
-		enumTestList.add(AppHMIType.INFORMATION);		
-		enumTestList.add(AppHMIType.SOCIAL);
-		enumTestList.add(AppHMIType.BACKGROUND_PROCESS);
-		enumTestList.add(AppHMIType.PROJECTION);
-		enumTestList.add(AppHMIType.TESTING);
-		enumTestList.add(AppHMIType.SYSTEM);
-		enumTestList.add(AppHMIType.REMOTE_CONTROL);
-		enumTestList.add(AppHMIType.WEB_VIEW);
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of AmbientLightStatus.
+     */
+    public void testListEnum() {
+        List<AppHMIType> enumValueList = Arrays.asList(AppHMIType.values());
+
+        List<AppHMIType> enumTestList = new ArrayList<AppHMIType>();
+        enumTestList.add(AppHMIType.DEFAULT);
+        enumTestList.add(AppHMIType.COMMUNICATION);
+        enumTestList.add(AppHMIType.MEDIA);
+        enumTestList.add(AppHMIType.MESSAGING);
+        enumTestList.add(AppHMIType.NAVIGATION);
+        enumTestList.add(AppHMIType.INFORMATION);
+        enumTestList.add(AppHMIType.SOCIAL);
+        enumTestList.add(AppHMIType.BACKGROUND_PROCESS);
+        enumTestList.add(AppHMIType.PROJECTION);
+        enumTestList.add(AppHMIType.TESTING);
+        enumTestList.add(AppHMIType.SYSTEM);
+        enumTestList.add(AppHMIType.REMOTE_CONTROL);
+        enumTestList.add(AppHMIType.WEB_VIEW);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
index 333ff8d52..056f57597 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
@@ -9,111 +9,109 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.AppInterfaceUnregisteredReason}
  */
 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);
-		example = "IGNITION_OFF";
-		AppInterfaceUnregisteredReason enumIgnitionOff = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "BLUETOOTH_OFF";
-		AppInterfaceUnregisteredReason enumBluetoothOff = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "USB_DISCONNECTED";
-		AppInterfaceUnregisteredReason enumUsbDisconnected = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "REQUEST_WHILE_IN_NONE_HMI_LEVEL";
-		AppInterfaceUnregisteredReason enumRequestWhileInNoneHmiLevel = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "TOO_MANY_REQUESTS";
-		AppInterfaceUnregisteredReason enumTooManyRequests = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "DRIVER_DISTRACTION_VIOLATION";
-		AppInterfaceUnregisteredReason enumDriverDistractionViolation = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "LANGUAGE_CHANGE";
-		AppInterfaceUnregisteredReason enumLanguageChange = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "MASTER_RESET";
-		AppInterfaceUnregisteredReason enumMasterReset = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "FACTORY_DEFAULTS";
-		AppInterfaceUnregisteredReason enumFactoryDefaults = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "APP_UNAUTHORIZED";
-		AppInterfaceUnregisteredReason enumAppAuthorized = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "PROTOCOL_VIOLATION";
-		AppInterfaceUnregisteredReason enumProtocolViolation = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "UNSUPPORTED_HMI_RESOURCE";
-		AppInterfaceUnregisteredReason enumUnsupportedHMIResource = AppInterfaceUnregisteredReason.valueForString(example);
-		example = "RESOURCE_CONSTRAINT";
-		AppInterfaceUnregisteredReason enumResourceConstraint = AppInterfaceUnregisteredReason.valueForString(example);
-				
-		assertNotNull("USER_EXIT returned null", enumUserExit);
-		assertNotNull("IGNITION_OFF returned null", enumIgnitionOff);
-		assertNotNull("BLUETOOTH_OFF returned null", enumBluetoothOff);
-		assertNotNull("USB_DISCONNECTED returned null", enumUsbDisconnected);
-		assertNotNull("REQUEST_WHILE_IN_NONE_HMI_LEVEL returned null", enumRequestWhileInNoneHmiLevel);
-		assertNotNull("TOO_MANY_REQUESTS returned null", enumTooManyRequests);
-		assertNotNull("DRIVER_DISTRACTION_VIOLATION returned null", enumDriverDistractionViolation);
-		assertNotNull("LANGUAGE_CHANGE returned null", enumLanguageChange);
-		assertNotNull("MASTER_RESET returned null", enumMasterReset);
-		assertNotNull("FACTORY_DEFAULTS returned null", enumFactoryDefaults);
-		assertNotNull("APP_UNAUTHORIZED returned null", enumAppAuthorized);
-		assertNotNull("PROTOCOL_VIOLATION returned null", enumProtocolViolation);
-		assertNotNull("UNSUPPORTED_HMI_RESOURCE returned null", enumUnsupportedHMIResource);
-		assertNotNull("RESOURCE_CONSTRAINT returned null", enumResourceConstraint);
-	}
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "uSer_ExiT";
-		try {
-		    AppInterfaceUnregisteredReason temp = AppInterfaceUnregisteredReason.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "USER_EXIT";
+        AppInterfaceUnregisteredReason enumUserExit = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "IGNITION_OFF";
+        AppInterfaceUnregisteredReason enumIgnitionOff = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "BLUETOOTH_OFF";
+        AppInterfaceUnregisteredReason enumBluetoothOff = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "USB_DISCONNECTED";
+        AppInterfaceUnregisteredReason enumUsbDisconnected = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "REQUEST_WHILE_IN_NONE_HMI_LEVEL";
+        AppInterfaceUnregisteredReason enumRequestWhileInNoneHmiLevel = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "TOO_MANY_REQUESTS";
+        AppInterfaceUnregisteredReason enumTooManyRequests = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "DRIVER_DISTRACTION_VIOLATION";
+        AppInterfaceUnregisteredReason enumDriverDistractionViolation = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "LANGUAGE_CHANGE";
+        AppInterfaceUnregisteredReason enumLanguageChange = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "MASTER_RESET";
+        AppInterfaceUnregisteredReason enumMasterReset = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "FACTORY_DEFAULTS";
+        AppInterfaceUnregisteredReason enumFactoryDefaults = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "APP_UNAUTHORIZED";
+        AppInterfaceUnregisteredReason enumAppAuthorized = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "PROTOCOL_VIOLATION";
+        AppInterfaceUnregisteredReason enumProtocolViolation = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "UNSUPPORTED_HMI_RESOURCE";
+        AppInterfaceUnregisteredReason enumUnsupportedHMIResource = AppInterfaceUnregisteredReason.valueForString(example);
+        example = "RESOURCE_CONSTRAINT";
+        AppInterfaceUnregisteredReason enumResourceConstraint = AppInterfaceUnregisteredReason.valueForString(example);
+
+        assertNotNull("USER_EXIT returned null", enumUserExit);
+        assertNotNull("IGNITION_OFF returned null", enumIgnitionOff);
+        assertNotNull("BLUETOOTH_OFF returned null", enumBluetoothOff);
+        assertNotNull("USB_DISCONNECTED returned null", enumUsbDisconnected);
+        assertNotNull("REQUEST_WHILE_IN_NONE_HMI_LEVEL returned null", enumRequestWhileInNoneHmiLevel);
+        assertNotNull("TOO_MANY_REQUESTS returned null", enumTooManyRequests);
+        assertNotNull("DRIVER_DISTRACTION_VIOLATION returned null", enumDriverDistractionViolation);
+        assertNotNull("LANGUAGE_CHANGE returned null", enumLanguageChange);
+        assertNotNull("MASTER_RESET returned null", enumMasterReset);
+        assertNotNull("FACTORY_DEFAULTS returned null", enumFactoryDefaults);
+        assertNotNull("APP_UNAUTHORIZED returned null", enumAppAuthorized);
+        assertNotNull("PROTOCOL_VIOLATION returned null", enumProtocolViolation);
+        assertNotNull("UNSUPPORTED_HMI_RESOURCE returned null", enumUnsupportedHMIResource);
+        assertNotNull("RESOURCE_CONSTRAINT returned null", enumResourceConstraint);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "uSer_ExiT";
+        try {
+            AppInterfaceUnregisteredReason temp = AppInterfaceUnregisteredReason.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    AppInterfaceUnregisteredReason temp = AppInterfaceUnregisteredReason.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            AppInterfaceUnregisteredReason temp = AppInterfaceUnregisteredReason.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of AppInterfaceUnregisteredReason.
-	 */
-	public void testListEnum() {
- 		List<AppInterfaceUnregisteredReason> enumValueList = Arrays.asList(AppInterfaceUnregisteredReason.values());
+    /**
+     * Verifies the possible enum values of AppInterfaceUnregisteredReason.
+     */
+    public void testListEnum() {
+        List<AppInterfaceUnregisteredReason> enumValueList = Arrays.asList(AppInterfaceUnregisteredReason.values());
 
-		List<AppInterfaceUnregisteredReason> enumTestList = new ArrayList<AppInterfaceUnregisteredReason>();
-		enumTestList.add(AppInterfaceUnregisteredReason.USER_EXIT);
-		enumTestList.add(AppInterfaceUnregisteredReason.IGNITION_OFF);
-		enumTestList.add(AppInterfaceUnregisteredReason.BLUETOOTH_OFF);
-		enumTestList.add(AppInterfaceUnregisteredReason.USB_DISCONNECTED);
-		enumTestList.add(AppInterfaceUnregisteredReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL);
-		enumTestList.add(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS);		
-		enumTestList.add(AppInterfaceUnregisteredReason.DRIVER_DISTRACTION_VIOLATION);
-		enumTestList.add(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE);	
-		enumTestList.add(AppInterfaceUnregisteredReason.MASTER_RESET);
-		enumTestList.add(AppInterfaceUnregisteredReason.FACTORY_DEFAULTS);	
-		enumTestList.add(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED);
-		enumTestList.add(AppInterfaceUnregisteredReason.PROTOCOL_VIOLATION);
-		enumTestList.add(AppInterfaceUnregisteredReason.UNSUPPORTED_HMI_RESOURCE);
-		enumTestList.add(AppInterfaceUnregisteredReason.RESOURCE_CONSTRAINT);
+        List<AppInterfaceUnregisteredReason> enumTestList = new ArrayList<AppInterfaceUnregisteredReason>();
+        enumTestList.add(AppInterfaceUnregisteredReason.USER_EXIT);
+        enumTestList.add(AppInterfaceUnregisteredReason.IGNITION_OFF);
+        enumTestList.add(AppInterfaceUnregisteredReason.BLUETOOTH_OFF);
+        enumTestList.add(AppInterfaceUnregisteredReason.USB_DISCONNECTED);
+        enumTestList.add(AppInterfaceUnregisteredReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL);
+        enumTestList.add(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS);
+        enumTestList.add(AppInterfaceUnregisteredReason.DRIVER_DISTRACTION_VIOLATION);
+        enumTestList.add(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE);
+        enumTestList.add(AppInterfaceUnregisteredReason.MASTER_RESET);
+        enumTestList.add(AppInterfaceUnregisteredReason.FACTORY_DEFAULTS);
+        enumTestList.add(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED);
+        enumTestList.add(AppInterfaceUnregisteredReason.PROTOCOL_VIOLATION);
+        enumTestList.add(AppInterfaceUnregisteredReason.UNSUPPORTED_HMI_RESOURCE);
+        enumTestList.add(AppInterfaceUnregisteredReason.RESOURCE_CONSTRAINT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java
index ce4867e41..5cecebdd2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppServiceTypeTests.java
@@ -14,62 +14,60 @@ import java.util.List;
  */
 public class AppServiceTypeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "MEDIA";
-		AppServiceType enumMedia = AppServiceType.valueForString(example);
-		example = "WEATHER";
-		AppServiceType enumWeather = AppServiceType.valueForString(example);
-		example = "NAVIGATION";
-		AppServiceType enumNavigation = AppServiceType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "MEDIA";
+        AppServiceType enumMedia = AppServiceType.valueForString(example);
+        example = "WEATHER";
+        AppServiceType enumWeather = AppServiceType.valueForString(example);
+        example = "NAVIGATION";
+        AppServiceType enumNavigation = AppServiceType.valueForString(example);
 
-		assertNotNull("MEDIA returned null", enumMedia);
-		assertNotNull("WEATHER returned null", enumWeather);
-		assertNotNull("NAVIGATION returned null", enumNavigation);
-	}
+        assertNotNull("MEDIA returned null", enumMedia);
+        assertNotNull("WEATHER returned null", enumWeather);
+        assertNotNull("NAVIGATION returned null", enumNavigation);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "MedIas";
-		try {
-			AppServiceType temp = AppServiceType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "MedIas";
+        try {
+            AppServiceType temp = AppServiceType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			AppServiceType temp = AppServiceType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            AppServiceType temp = AppServiceType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of AppServiceType.
-	 */
-	public void testListEnum() {
-		List<AppServiceType> enumValueList = Arrays.asList(AppServiceType.values());
+    /**
+     * Verifies the possible enum values of AppServiceType.
+     */
+    public void testListEnum() {
+        List<AppServiceType> enumValueList = Arrays.asList(AppServiceType.values());
 
-		List<AppServiceType> enumTestList = new ArrayList<>();
-		enumTestList.add(AppServiceType.MEDIA);
-		enumTestList.add(AppServiceType.NAVIGATION);
-		enumTestList.add(AppServiceType.WEATHER);
+        List<AppServiceType> enumTestList = new ArrayList<>();
+        enumTestList.add(AppServiceType.MEDIA);
+        enumTestList.add(AppServiceType.NAVIGATION);
+        enumTestList.add(AppServiceType.WEATHER);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java
index 0d7f17c76..81c4dbd84 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingIndicatorTests.java
@@ -14,67 +14,65 @@ import java.util.List;
  */
 public class AudioStreamingIndicatorTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "PLAY_PAUSE";
-		AudioStreamingIndicator enumPlayPause = AudioStreamingIndicator.valueForString(example);
-		example = "PLAY";
-		AudioStreamingIndicator enumPlay = AudioStreamingIndicator.valueForString(example);
-		example = "PAUSE";
-		AudioStreamingIndicator enumPause = AudioStreamingIndicator.valueForString(example);
-		example = "STOP";
-		AudioStreamingIndicator enumStop = AudioStreamingIndicator.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "PLAY_PAUSE";
+        AudioStreamingIndicator enumPlayPause = AudioStreamingIndicator.valueForString(example);
+        example = "PLAY";
+        AudioStreamingIndicator enumPlay = AudioStreamingIndicator.valueForString(example);
+        example = "PAUSE";
+        AudioStreamingIndicator enumPause = AudioStreamingIndicator.valueForString(example);
+        example = "STOP";
+        AudioStreamingIndicator enumStop = AudioStreamingIndicator.valueForString(example);
 
 
-		assertNotNull("PLAY_PAUSE returned null", enumPlayPause);
-		assertNotNull("PLAY returned null", enumPlay);
-		assertNotNull("PAUSE returned null", enumPause);
-		assertNotNull("STOP returned null", enumStop);
-	}
+        assertNotNull("PLAY_PAUSE returned null", enumPlayPause);
+        assertNotNull("PLAY returned null", enumPlay);
+        assertNotNull("PAUSE returned null", enumPause);
+        assertNotNull("STOP returned null", enumStop);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "pLayPauZe";
-		try {
-			AudioStreamingIndicator temp = AudioStreamingIndicator.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "pLayPauZe";
+        try {
+            AudioStreamingIndicator temp = AudioStreamingIndicator.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			AudioStreamingIndicator temp = AudioStreamingIndicator.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            AudioStreamingIndicator temp = AudioStreamingIndicator.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of AudioStreamingIndicator.
-	 */
-	public void testListEnum() {
-		List<AudioStreamingIndicator> enumValueList = Arrays.asList(AudioStreamingIndicator.values());
+    /**
+     * Verifies the possible enum values of AudioStreamingIndicator.
+     */
+    public void testListEnum() {
+        List<AudioStreamingIndicator> enumValueList = Arrays.asList(AudioStreamingIndicator.values());
 
-		List<AudioStreamingIndicator> enumTestList = new ArrayList<>();
-		enumTestList.add(AudioStreamingIndicator.PLAY_PAUSE);
-		enumTestList.add(AudioStreamingIndicator.PLAY);
-		enumTestList.add(AudioStreamingIndicator.PAUSE);
-		enumTestList.add(AudioStreamingIndicator.STOP);
+        List<AudioStreamingIndicator> enumTestList = new ArrayList<>();
+        enumTestList.add(AudioStreamingIndicator.PLAY_PAUSE);
+        enumTestList.add(AudioStreamingIndicator.PLAY);
+        enumTestList.add(AudioStreamingIndicator.PAUSE);
+        enumTestList.add(AudioStreamingIndicator.STOP);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
index cf9cd87d4..ab6fe5369 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
@@ -9,68 +9,66 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.AudioStreamingState}
  */
 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);
-		example = "ATTENUATED";
-		AudioStreamingState enumAttentuated = AudioStreamingState.valueForString(example);
-		example = "NOT_AUDIBLE";
-		AudioStreamingState enumNotAudible = AudioStreamingState.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "AUDIBLE";
+        AudioStreamingState enumAudible = AudioStreamingState.valueForString(example);
+        example = "ATTENUATED";
+        AudioStreamingState enumAttentuated = AudioStreamingState.valueForString(example);
+        example = "NOT_AUDIBLE";
+        AudioStreamingState enumNotAudible = AudioStreamingState.valueForString(example);
 
-		
-		assertNotNull("AUDIBLE returned null", enumAudible);
-		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 {
-		    AudioStreamingState temp = AudioStreamingState.valueForString(example);
+        assertNotNull("AUDIBLE returned null", enumAudible);
+        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 {
+            AudioStreamingState temp = AudioStreamingState.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    AudioStreamingState temp = AudioStreamingState.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            AudioStreamingState temp = AudioStreamingState.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of AudioStreamingState.
-	 */
-	public void testListEnum() {
- 		List<AudioStreamingState> enumValueList = Arrays.asList(AudioStreamingState.values());
+    /**
+     * Verifies the possible enum values of AudioStreamingState.
+     */
+    public void testListEnum() {
+        List<AudioStreamingState> enumValueList = Arrays.asList(AudioStreamingState.values());
 
-		List<AudioStreamingState> enumTestList = new ArrayList<AudioStreamingState>();
-		enumTestList.add(AudioStreamingState.AUDIBLE);
-		enumTestList.add(AudioStreamingState.ATTENUATED);
-		enumTestList.add(AudioStreamingState.NOT_AUDIBLE);
+        List<AudioStreamingState> enumTestList = new ArrayList<AudioStreamingState>();
+        enumTestList.add(AudioStreamingState.AUDIBLE);
+        enumTestList.add(AudioStreamingState.ATTENUATED);
+        enumTestList.add(AudioStreamingState.NOT_AUDIBLE);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
index 8daea233f..714265d3a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
@@ -9,60 +9,58 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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 the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "PCM";
+        AudioType enumPcm = AudioType.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "pCM";
-		try {
-		    AudioType temp = AudioType.valueForString(example);
+        assertNotNull("PCM returned null", enumPcm);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "pCM";
+        try {
+            AudioType temp = AudioType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    AudioType temp = AudioType.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            AudioType temp = AudioType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
+        }
+    }
+
 
-	/**
-	 * Verifies the possible enum values of AudioType.
-	 */
-	public void testListEnum() {
- 		List<AudioType> enumValueList = Arrays.asList(AudioType.values());
+    /**
+     * Verifies the possible enum values of AudioType.
+     */
+    public void testListEnum() {
+        List<AudioType> enumValueList = Arrays.asList(AudioType.values());
 
-		List<AudioType> enumTestList = new ArrayList<AudioType>();
-		enumTestList.add(AudioType.PCM);
+        List<AudioType> enumTestList = new ArrayList<AudioType>();
+        enumTestList.add(AudioType.PCM);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
index f45b6a1de..43ae36e1e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
@@ -9,63 +9,61 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "16_BIT";
-		BitsPerSample enum16Bit = BitsPerSample.valueForString(example);
-		
-		assertNotNull("8_BIT returned null", enum8Bit);
-		assertNotNull("16_BIT returned null", enum16Bit);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "8_BIT";
+        BitsPerSample enum8Bit = BitsPerSample.valueForString(example);
+        example = "16_BIT";
+        BitsPerSample enum16Bit = BitsPerSample.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "8_biT";
-		try {
-		    BitsPerSample temp = BitsPerSample.valueForString(example);
+        assertNotNull("8_BIT returned null", enum8Bit);
+        assertNotNull("16_BIT returned null", enum16Bit);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "8_biT";
+        try {
+            BitsPerSample temp = BitsPerSample.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    BitsPerSample temp = BitsPerSample.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            BitsPerSample temp = BitsPerSample.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of BitsPerSample.
-	 */
-	public void testListEnum() {
- 		List<BitsPerSample> enumValueList = Arrays.asList(BitsPerSample.values());
+    /**
+     * Verifies the possible enum values of BitsPerSample.
+     */
+    public void testListEnum() {
+        List<BitsPerSample> enumValueList = Arrays.asList(BitsPerSample.values());
 
-		List<BitsPerSample> enumTestList = new ArrayList<BitsPerSample>();
-		enumTestList.add(BitsPerSample._8_BIT);
-		enumTestList.add(BitsPerSample._16_BIT);
+        List<BitsPerSample> enumTestList = new ArrayList<BitsPerSample>();
+        enumTestList.add(BitsPerSample._8_BIT);
+        enumTestList.add(BitsPerSample._16_BIT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
index 330d739a2..97d775be9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
@@ -9,63 +9,61 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "BUTTONDOWN";
-		ButtonEventMode enumButtonDown = ButtonEventMode.valueForString(example);
-		
-		assertNotNull("BUTTONUP returned null", enumButtonUp);
-		assertNotNull("BUTTONDOWN returned null", enumButtonDown);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "BUTTONUP";
+        ButtonEventMode enumButtonUp = ButtonEventMode.valueForString(example);
+        example = "BUTTONDOWN";
+        ButtonEventMode enumButtonDown = ButtonEventMode.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "buTTonUp";
-		try {
-			ButtonEventMode temp = ButtonEventMode.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        assertNotNull("BUTTONUP returned null", enumButtonUp);
+        assertNotNull("BUTTONDOWN returned null", enumButtonDown);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "buTTonUp";
+        try {
+            ButtonEventMode temp = ButtonEventMode.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    ButtonEventMode temp = ButtonEventMode.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            ButtonEventMode temp = ButtonEventMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of ButtonEventMode.
-	 */
-	public void testListEnum() {
- 		List<ButtonEventMode> enumValueList = Arrays.asList(ButtonEventMode.values());
+    /**
+     * Verifies the possible enum values of ButtonEventMode.
+     */
+    public void testListEnum() {
+        List<ButtonEventMode> enumValueList = Arrays.asList(ButtonEventMode.values());
 
-		List<ButtonEventMode> enumTestList = new ArrayList<ButtonEventMode>();
-		enumTestList.add(ButtonEventMode.BUTTONUP);
-		enumTestList.add(ButtonEventMode.BUTTONDOWN);	
+        List<ButtonEventMode> enumTestList = new ArrayList<ButtonEventMode>();
+        enumTestList.add(ButtonEventMode.BUTTONUP);
+        enumTestList.add(ButtonEventMode.BUTTONDOWN);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
index da768fc0d..10075849a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
@@ -9,250 +9,246 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "SEEKLEFT";
-		ButtonName enumSeekLeft = ButtonName.valueForString(example);
-		example = "SEEKRIGHT";
-		ButtonName enumSeekRight = ButtonName.valueForString(example);
-		example = "TUNEUP";
-		ButtonName enumTuneUp = ButtonName.valueForString(example);
-		example = "TUNEDOWN";
-		ButtonName enumTuneDown = ButtonName.valueForString(example);
-		example = "PRESET_0";
-		ButtonName enumPreset0 = ButtonName.valueForString(example);
-		example = "PRESET_1";
-		ButtonName enumPreset1 = ButtonName.valueForString(example);
-		example = "PRESET_2";
-		ButtonName enumPreset2 = ButtonName.valueForString(example);
-		example = "PRESET_3";
-		ButtonName enumPreset3 = ButtonName.valueForString(example);
-		example = "PRESET_4";
-		ButtonName enumPreset4 = ButtonName.valueForString(example);
-		example = "PRESET_5";
-		ButtonName enumPreset5 = ButtonName.valueForString(example);
-		example = "PRESET_6";
-		ButtonName enumPreset6 = ButtonName.valueForString(example);
-		example = "PRESET_7";
-		ButtonName enumPreset7 = ButtonName.valueForString(example);
-		example = "PRESET_8";
-		ButtonName enumPreset8 = ButtonName.valueForString(example);
-		example = "PRESET_9";
-		ButtonName enumPreset9 = ButtonName.valueForString(example);
-		example = "CUSTOM_BUTTON";
-		ButtonName enumCustomButton = ButtonName.valueForString(example);
-		example = "SEARCH";
-		ButtonName enumSearch = ButtonName.valueForString(example);
-		example = "AC_MAX";
-		ButtonName enumAcMax = ButtonName.valueForString(example);
-		example = "AC";
-		ButtonName enumAc = ButtonName.valueForString(example);
-		example = "RECIRCULATE";
-		ButtonName enumRecirculate = ButtonName.valueForString(example);
-		example = "FAN_UP";
-		ButtonName enumFanUp = ButtonName.valueForString(example);
-		example = "FAN_DOWN";
-		ButtonName enumFanDown = ButtonName.valueForString(example);
-		example = "TEMP_UP";
-		ButtonName enumTempUp = ButtonName.valueForString(example);
-		example = "TEMP_DOWN";
-		ButtonName enumTempDown = ButtonName.valueForString(example);
-		example = "DEFROST_MAX";
-		ButtonName enumDefrostMax = ButtonName.valueForString(example);
-		example = "DEFROST";
-		ButtonName enumDefrost = ButtonName.valueForString(example);
-		example = "DEFROST_REAR";
-		ButtonName enumDefrostRear = ButtonName.valueForString(example);
-		example = "UPPER_VENT";
-		ButtonName enumUpperVent = ButtonName.valueForString(example);
-		example = "LOWER_VENT";
-		ButtonName enumLowerVent = ButtonName.valueForString(example);
-		example = "VOLUME_UP";
-		ButtonName enumVolumeUp = ButtonName.valueForString(example);
-		example = "VOLUME_DOWN";
-		ButtonName enumVolumeDown = ButtonName.valueForString(example);
-		example = "EJECT";
-		ButtonName enumEject = ButtonName.valueForString(example);
-		example = "SOURCE";
-		ButtonName enumSource = ButtonName.valueForString(example);
-		example = "SHUFFLE";
-		ButtonName enumShuffle = ButtonName.valueForString(example);
-		example = "REPEAT";
-		ButtonName enumRepeat = ButtonName.valueForString(example);
-
-
-		
-		assertNotNull("OK returned null", enumOk);
-		assertNotNull("SEEKLEFT returned null", enumSeekLeft);
-		assertNotNull("SEEKRIGHT returned null", enumSeekRight);
-		assertNotNull("TUNEUP returned null", enumTuneUp);
-		assertNotNull("TUNEDOWN returned null", enumTuneDown);
-		assertNotNull("PRESET_0 returned null", enumPreset0);
-		assertNotNull("PRESET_1 returned null", enumPreset1);
-		assertNotNull("PRESET_2 returned null", enumPreset2);
-		assertNotNull("PRESET_3 returned null", enumPreset3);
-		assertNotNull("PRESET_4 returned null", enumPreset4);
-		assertNotNull("PRESET_5 returned null", enumPreset5);
-		assertNotNull("PRESET_6 returned null", enumPreset6);
-		assertNotNull("PRESET_7 returned null", enumPreset7);
-		assertNotNull("PRESET_8 returned null", enumPreset8);
-		assertNotNull("PRESET_9 returned null", enumPreset9);
-		assertNotNull("CUSTOM_BUTTON returned null", enumCustomButton);
-		assertNotNull("SEARCH returned null", enumSearch);
-		assertNotNull("AC_MAX returned null", enumAcMax);
-		assertNotNull("AC returned null", enumAc);
-		assertNotNull("RECIRCULATE returned null", enumRecirculate);
-		assertNotNull("FAN_UP returned null", enumFanUp);
-		assertNotNull("FAN_DOWN returned null", enumFanDown);
-		assertNotNull("TEMP_UP returned null", enumTempUp);
-		assertNotNull("TEMP_DOWN returned null", enumTempDown);
-		assertNotNull("DEFROST_MAX returned null", enumDefrostMax);
-		assertNotNull("DEFROST returned null", enumDefrost);
-		assertNotNull("DEFROST_REAR returned null", enumDefrostRear);
-		assertNotNull("UPPER_VENT returned null", enumUpperVent);
-		assertNotNull("LOWER_VENT returned null", enumLowerVent);
-		assertNotNull("VOLUME_UP returned null", enumVolumeUp);
-		assertNotNull("VOLUME_DOWN returned null", enumVolumeDown);
-		assertNotNull("EJECT returned null", enumEject);
-		assertNotNull("SOURCE returned null", enumSource);
-		assertNotNull("SHUFFLE returned null", enumShuffle);
-		assertNotNull("REPEAT returned null", enumRepeat);
-	}
-
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "oK";
-		try {
-		    ButtonName temp = ButtonName.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "OK";
+        ButtonName enumOk = ButtonName.valueForString(example);
+        example = "SEEKLEFT";
+        ButtonName enumSeekLeft = ButtonName.valueForString(example);
+        example = "SEEKRIGHT";
+        ButtonName enumSeekRight = ButtonName.valueForString(example);
+        example = "TUNEUP";
+        ButtonName enumTuneUp = ButtonName.valueForString(example);
+        example = "TUNEDOWN";
+        ButtonName enumTuneDown = ButtonName.valueForString(example);
+        example = "PRESET_0";
+        ButtonName enumPreset0 = ButtonName.valueForString(example);
+        example = "PRESET_1";
+        ButtonName enumPreset1 = ButtonName.valueForString(example);
+        example = "PRESET_2";
+        ButtonName enumPreset2 = ButtonName.valueForString(example);
+        example = "PRESET_3";
+        ButtonName enumPreset3 = ButtonName.valueForString(example);
+        example = "PRESET_4";
+        ButtonName enumPreset4 = ButtonName.valueForString(example);
+        example = "PRESET_5";
+        ButtonName enumPreset5 = ButtonName.valueForString(example);
+        example = "PRESET_6";
+        ButtonName enumPreset6 = ButtonName.valueForString(example);
+        example = "PRESET_7";
+        ButtonName enumPreset7 = ButtonName.valueForString(example);
+        example = "PRESET_8";
+        ButtonName enumPreset8 = ButtonName.valueForString(example);
+        example = "PRESET_9";
+        ButtonName enumPreset9 = ButtonName.valueForString(example);
+        example = "CUSTOM_BUTTON";
+        ButtonName enumCustomButton = ButtonName.valueForString(example);
+        example = "SEARCH";
+        ButtonName enumSearch = ButtonName.valueForString(example);
+        example = "AC_MAX";
+        ButtonName enumAcMax = ButtonName.valueForString(example);
+        example = "AC";
+        ButtonName enumAc = ButtonName.valueForString(example);
+        example = "RECIRCULATE";
+        ButtonName enumRecirculate = ButtonName.valueForString(example);
+        example = "FAN_UP";
+        ButtonName enumFanUp = ButtonName.valueForString(example);
+        example = "FAN_DOWN";
+        ButtonName enumFanDown = ButtonName.valueForString(example);
+        example = "TEMP_UP";
+        ButtonName enumTempUp = ButtonName.valueForString(example);
+        example = "TEMP_DOWN";
+        ButtonName enumTempDown = ButtonName.valueForString(example);
+        example = "DEFROST_MAX";
+        ButtonName enumDefrostMax = ButtonName.valueForString(example);
+        example = "DEFROST";
+        ButtonName enumDefrost = ButtonName.valueForString(example);
+        example = "DEFROST_REAR";
+        ButtonName enumDefrostRear = ButtonName.valueForString(example);
+        example = "UPPER_VENT";
+        ButtonName enumUpperVent = ButtonName.valueForString(example);
+        example = "LOWER_VENT";
+        ButtonName enumLowerVent = ButtonName.valueForString(example);
+        example = "VOLUME_UP";
+        ButtonName enumVolumeUp = ButtonName.valueForString(example);
+        example = "VOLUME_DOWN";
+        ButtonName enumVolumeDown = ButtonName.valueForString(example);
+        example = "EJECT";
+        ButtonName enumEject = ButtonName.valueForString(example);
+        example = "SOURCE";
+        ButtonName enumSource = ButtonName.valueForString(example);
+        example = "SHUFFLE";
+        ButtonName enumShuffle = ButtonName.valueForString(example);
+        example = "REPEAT";
+        ButtonName enumRepeat = ButtonName.valueForString(example);
+
+
+        assertNotNull("OK returned null", enumOk);
+        assertNotNull("SEEKLEFT returned null", enumSeekLeft);
+        assertNotNull("SEEKRIGHT returned null", enumSeekRight);
+        assertNotNull("TUNEUP returned null", enumTuneUp);
+        assertNotNull("TUNEDOWN returned null", enumTuneDown);
+        assertNotNull("PRESET_0 returned null", enumPreset0);
+        assertNotNull("PRESET_1 returned null", enumPreset1);
+        assertNotNull("PRESET_2 returned null", enumPreset2);
+        assertNotNull("PRESET_3 returned null", enumPreset3);
+        assertNotNull("PRESET_4 returned null", enumPreset4);
+        assertNotNull("PRESET_5 returned null", enumPreset5);
+        assertNotNull("PRESET_6 returned null", enumPreset6);
+        assertNotNull("PRESET_7 returned null", enumPreset7);
+        assertNotNull("PRESET_8 returned null", enumPreset8);
+        assertNotNull("PRESET_9 returned null", enumPreset9);
+        assertNotNull("CUSTOM_BUTTON returned null", enumCustomButton);
+        assertNotNull("SEARCH returned null", enumSearch);
+        assertNotNull("AC_MAX returned null", enumAcMax);
+        assertNotNull("AC returned null", enumAc);
+        assertNotNull("RECIRCULATE returned null", enumRecirculate);
+        assertNotNull("FAN_UP returned null", enumFanUp);
+        assertNotNull("FAN_DOWN returned null", enumFanDown);
+        assertNotNull("TEMP_UP returned null", enumTempUp);
+        assertNotNull("TEMP_DOWN returned null", enumTempDown);
+        assertNotNull("DEFROST_MAX returned null", enumDefrostMax);
+        assertNotNull("DEFROST returned null", enumDefrost);
+        assertNotNull("DEFROST_REAR returned null", enumDefrostRear);
+        assertNotNull("UPPER_VENT returned null", enumUpperVent);
+        assertNotNull("LOWER_VENT returned null", enumLowerVent);
+        assertNotNull("VOLUME_UP returned null", enumVolumeUp);
+        assertNotNull("VOLUME_DOWN returned null", enumVolumeDown);
+        assertNotNull("EJECT returned null", enumEject);
+        assertNotNull("SOURCE returned null", enumSource);
+        assertNotNull("SHUFFLE returned null", enumShuffle);
+        assertNotNull("REPEAT returned null", enumRepeat);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "oK";
+        try {
+            ButtonName temp = ButtonName.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    ButtonName temp = ButtonName.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            ButtonName temp = ButtonName.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-
-	/**
-	 * Verifies the possible enum values of ButtonName.
-	 */
-	public void testListEnum() {
- 		List<ButtonName> enumValueList = Arrays.asList(ButtonName.values());
-
-		List<ButtonName> enumTestList = new ArrayList<ButtonName>();
-		
-		enumTestList.add(ButtonName.OK);
-		enumTestList.add(ButtonName.SEEKLEFT);
-		enumTestList.add(ButtonName.SEEKRIGHT);
-		enumTestList.add(ButtonName.TUNEUP);
-		enumTestList.add(ButtonName.TUNEDOWN);
-		enumTestList.add(ButtonName.PRESET_0);		
-		enumTestList.add(ButtonName.PRESET_1);
-		enumTestList.add(ButtonName.PRESET_2);	
-		enumTestList.add(ButtonName.PRESET_3);
-		enumTestList.add(ButtonName.PRESET_4);	
-		enumTestList.add(ButtonName.PRESET_5);	
-		enumTestList.add(ButtonName.PRESET_6);
-		enumTestList.add(ButtonName.PRESET_7);	
-		enumTestList.add(ButtonName.PRESET_8);
-		enumTestList.add(ButtonName.PRESET_9);	
-		enumTestList.add(ButtonName.CUSTOM_BUTTON);	
-		enumTestList.add(ButtonName.SEARCH);
-		enumTestList.add(ButtonName.AC_MAX);
-		enumTestList.add(ButtonName.AC);
-		enumTestList.add(ButtonName.RECIRCULATE);
-		enumTestList.add(ButtonName.FAN_UP);
-		enumTestList.add(ButtonName.FAN_DOWN);
-		enumTestList.add(ButtonName.TEMP_UP);
-		enumTestList.add(ButtonName.TEMP_DOWN);
-		enumTestList.add(ButtonName.DEFROST_MAX);
-		enumTestList.add(ButtonName.DEFROST);
-		enumTestList.add(ButtonName.DEFROST_REAR);
-		enumTestList.add(ButtonName.UPPER_VENT);
-		enumTestList.add(ButtonName.LOWER_VENT);
-		enumTestList.add(ButtonName.VOLUME_UP);
-		enumTestList.add(ButtonName.VOLUME_DOWN);
-		enumTestList.add(ButtonName.EJECT);
-		enumTestList.add(ButtonName.SOURCE);
-		enumTestList.add(ButtonName.SHUFFLE);
-		enumTestList.add(ButtonName.REPEAT);
-		enumTestList.add(ButtonName.PLAY_PAUSE);
-		enumTestList.add(ButtonName.NAV_CENTER_LOCATION);
-		enumTestList.add(ButtonName.NAV_ZOOM_IN);
-		enumTestList.add(ButtonName.NAV_ZOOM_OUT);
-		enumTestList.add(ButtonName.NAV_PAN_UP);
-		enumTestList.add(ButtonName.NAV_PAN_UP_RIGHT);
-		enumTestList.add(ButtonName.NAV_PAN_RIGHT);
-		enumTestList.add(ButtonName.NAV_PAN_DOWN_RIGHT);
-		enumTestList.add(ButtonName.NAV_PAN_DOWN);
-		enumTestList.add(ButtonName.NAV_PAN_DOWN_LEFT);
-		enumTestList.add(ButtonName.NAV_PAN_LEFT);
-		enumTestList.add(ButtonName.NAV_PAN_UP_LEFT);
-		enumTestList.add(ButtonName.NAV_TILT_TOGGLE);
-		enumTestList.add(ButtonName.NAV_ROTATE_CLOCKWISE);
-		enumTestList.add(ButtonName.NAV_ROTATE_COUNTERCLOCKWISE);
-		enumTestList.add(ButtonName.NAV_HEADING_TOGGLE);
-
-
-		assertTrue("Enum value list does not match enum class list", 
-				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, 
-				ButtonName.PRESET_5, ButtonName.PRESET_6, ButtonName.PRESET_7, ButtonName.PRESET_8, ButtonName.PRESET_9,
-				ButtonName.OK};
-		
-		Integer[] expectedValuesArray = new Integer[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, null};
-
-		for (int index = 0; index < inputPresetArray.length; index++) {
-			ButtonName input = inputPresetArray[index];
-			Integer expect = expectedValuesArray[index];
-			
-			Integer result = ButtonName.indexForPresetButton(input);
-			assertSame("Enum input " + result + " does not match expected value " + expect, result, expect);
-		}
-	}
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of ButtonName.
+     */
+    public void testListEnum() {
+        List<ButtonName> enumValueList = Arrays.asList(ButtonName.values());
+
+        List<ButtonName> enumTestList = new ArrayList<ButtonName>();
+
+        enumTestList.add(ButtonName.OK);
+        enumTestList.add(ButtonName.SEEKLEFT);
+        enumTestList.add(ButtonName.SEEKRIGHT);
+        enumTestList.add(ButtonName.TUNEUP);
+        enumTestList.add(ButtonName.TUNEDOWN);
+        enumTestList.add(ButtonName.PRESET_0);
+        enumTestList.add(ButtonName.PRESET_1);
+        enumTestList.add(ButtonName.PRESET_2);
+        enumTestList.add(ButtonName.PRESET_3);
+        enumTestList.add(ButtonName.PRESET_4);
+        enumTestList.add(ButtonName.PRESET_5);
+        enumTestList.add(ButtonName.PRESET_6);
+        enumTestList.add(ButtonName.PRESET_7);
+        enumTestList.add(ButtonName.PRESET_8);
+        enumTestList.add(ButtonName.PRESET_9);
+        enumTestList.add(ButtonName.CUSTOM_BUTTON);
+        enumTestList.add(ButtonName.SEARCH);
+        enumTestList.add(ButtonName.AC_MAX);
+        enumTestList.add(ButtonName.AC);
+        enumTestList.add(ButtonName.RECIRCULATE);
+        enumTestList.add(ButtonName.FAN_UP);
+        enumTestList.add(ButtonName.FAN_DOWN);
+        enumTestList.add(ButtonName.TEMP_UP);
+        enumTestList.add(ButtonName.TEMP_DOWN);
+        enumTestList.add(ButtonName.DEFROST_MAX);
+        enumTestList.add(ButtonName.DEFROST);
+        enumTestList.add(ButtonName.DEFROST_REAR);
+        enumTestList.add(ButtonName.UPPER_VENT);
+        enumTestList.add(ButtonName.LOWER_VENT);
+        enumTestList.add(ButtonName.VOLUME_UP);
+        enumTestList.add(ButtonName.VOLUME_DOWN);
+        enumTestList.add(ButtonName.EJECT);
+        enumTestList.add(ButtonName.SOURCE);
+        enumTestList.add(ButtonName.SHUFFLE);
+        enumTestList.add(ButtonName.REPEAT);
+        enumTestList.add(ButtonName.PLAY_PAUSE);
+        enumTestList.add(ButtonName.NAV_CENTER_LOCATION);
+        enumTestList.add(ButtonName.NAV_ZOOM_IN);
+        enumTestList.add(ButtonName.NAV_ZOOM_OUT);
+        enumTestList.add(ButtonName.NAV_PAN_UP);
+        enumTestList.add(ButtonName.NAV_PAN_UP_RIGHT);
+        enumTestList.add(ButtonName.NAV_PAN_RIGHT);
+        enumTestList.add(ButtonName.NAV_PAN_DOWN_RIGHT);
+        enumTestList.add(ButtonName.NAV_PAN_DOWN);
+        enumTestList.add(ButtonName.NAV_PAN_DOWN_LEFT);
+        enumTestList.add(ButtonName.NAV_PAN_LEFT);
+        enumTestList.add(ButtonName.NAV_PAN_UP_LEFT);
+        enumTestList.add(ButtonName.NAV_TILT_TOGGLE);
+        enumTestList.add(ButtonName.NAV_ROTATE_CLOCKWISE);
+        enumTestList.add(ButtonName.NAV_ROTATE_COUNTERCLOCKWISE);
+        enumTestList.add(ButtonName.NAV_HEADING_TOGGLE);
+
+
+        assertTrue("Enum value list does not match enum class list",
+                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,
+                ButtonName.PRESET_5, ButtonName.PRESET_6, ButtonName.PRESET_7, ButtonName.PRESET_8, ButtonName.PRESET_9,
+                ButtonName.OK};
+
+        Integer[] expectedValuesArray = new Integer[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, null};
+
+        for (int index = 0; index < inputPresetArray.length; index++) {
+            ButtonName input = inputPresetArray[index];
+            Integer expect = expectedValuesArray[index];
+
+            Integer result = ButtonName.indexForPresetButton(input);
+            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));
+        } catch (NullPointerException exc) {
+            fail("Passing null as a parameter throws a NullPointerException");
+        }
+
+    }
 
-	/**
-	 * 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));
-		}
-		catch (NullPointerException exc){
-			fail("Passing null as a parameter throws a NullPointerException");
-		}
-		
-	}
-	
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
index 57f354dc0..5f2de389d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
@@ -9,63 +9,61 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "SHORT";
-		ButtonPressMode enumShort = ButtonPressMode.valueForString(example);
-		
-		assertNotNull("LONG returned null", enumLong);
-		assertNotNull("SHORT returned null", enumShort);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "LONG";
+        ButtonPressMode enumLong = ButtonPressMode.valueForString(example);
+        example = "SHORT";
+        ButtonPressMode enumShort = ButtonPressMode.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "lONg";
-		try {
-		    ButtonPressMode temp = ButtonPressMode.valueForString(example);
+        assertNotNull("LONG returned null", enumLong);
+        assertNotNull("SHORT returned null", enumShort);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "lONg";
+        try {
+            ButtonPressMode temp = ButtonPressMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    ButtonPressMode temp = ButtonPressMode.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            ButtonPressMode temp = ButtonPressMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of ButtonPressMode.
-	 */
-	public void testListEnum() {
- 		List<ButtonPressMode> enumValueList = Arrays.asList(ButtonPressMode.values());
+    /**
+     * Verifies the possible enum values of ButtonPressMode.
+     */
+    public void testListEnum() {
+        List<ButtonPressMode> enumValueList = Arrays.asList(ButtonPressMode.values());
 
-		List<ButtonPressMode> enumTestList = new ArrayList<ButtonPressMode>();
-		enumTestList.add(ButtonPressMode.LONG);
-		enumTestList.add(ButtonPressMode.SHORT);
+        List<ButtonPressMode> enumTestList = new ArrayList<ButtonPressMode>();
+        enumTestList.add(ButtonPressMode.LONG);
+        enumTestList.add(ButtonPressMode.SHORT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CapacityUnitTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CapacityUnitTests.java
index 4da32bebf..755f03637 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CapacityUnitTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CapacityUnitTests.java
@@ -13,7 +13,7 @@ public class CapacityUnitTests extends TestCase {
     /**
      * Verifies that the enum values are not null upon valid assignment.
      */
-    public void testValidEnums () {
+    public void testValidEnums() {
         String example = "LITERS";
         CapacityUnit enumLiters = CapacityUnit.valueForString(example);
         example = "KILOWATTHOURS";
@@ -29,13 +29,12 @@ public class CapacityUnitTests extends TestCase {
     /**
      * Verifies that an invalid assignment is null.
      */
-    public void testInvalidEnum () {
+    public void testInvalidEnum() {
         String example = "lONg";
         try {
             CapacityUnit temp = CapacityUnit.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-        }
-        catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
         }
     }
@@ -43,13 +42,12 @@ public class CapacityUnitTests extends TestCase {
     /**
      * Verifies that a null assignment is invalid.
      */
-    public void testNullEnum () {
+    public void testNullEnum() {
         String example = null;
         try {
             CapacityUnit temp = CapacityUnit.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-        }
-        catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
index 74a32defa..1ff08ed47 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
@@ -9,71 +9,69 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "FACTORY";
-		CarModeStatus enumFactory = CarModeStatus.valueForString(example);
-		example = "TRANSPORT";
-		CarModeStatus enumTransport = CarModeStatus.valueForString(example);
-		example = "CRASH";
-		CarModeStatus enumCrash = CarModeStatus.valueForString(example);
-		
-		assertNotNull("NORMAL returned null", enumNormal);
-		assertNotNull("FACTORY returned null", enumFactory);
-		assertNotNull("TRANSPORT returned null", enumTransport);
-		assertNotNull("CRASH returned null", enumCrash);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NORMAL";
+        CarModeStatus enumNormal = CarModeStatus.valueForString(example);
+        example = "FACTORY";
+        CarModeStatus enumFactory = CarModeStatus.valueForString(example);
+        example = "TRANSPORT";
+        CarModeStatus enumTransport = CarModeStatus.valueForString(example);
+        example = "CRASH";
+        CarModeStatus enumCrash = CarModeStatus.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "noRmaL";
-		try {
-		    CarModeStatus temp = CarModeStatus.valueForString(example);
+        assertNotNull("NORMAL returned null", enumNormal);
+        assertNotNull("FACTORY returned null", enumFactory);
+        assertNotNull("TRANSPORT returned null", enumTransport);
+        assertNotNull("CRASH returned null", enumCrash);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "noRmaL";
+        try {
+            CarModeStatus temp = CarModeStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    CarModeStatus temp = CarModeStatus.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            CarModeStatus temp = CarModeStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of CarModeStatus.
-	 */
-	public void testListEnum() {
- 		List<CarModeStatus> enumValueList = Arrays.asList(CarModeStatus.values());
+    /**
+     * Verifies the possible enum values of CarModeStatus.
+     */
+    public void testListEnum() {
+        List<CarModeStatus> enumValueList = Arrays.asList(CarModeStatus.values());
 
-		List<CarModeStatus> enumTestList = new ArrayList<CarModeStatus>();
-		enumTestList.add(CarModeStatus.NORMAL);
-		enumTestList.add(CarModeStatus.FACTORY);
-		enumTestList.add(CarModeStatus.TRANSPORT);
-		enumTestList.add(CarModeStatus.CRASH);
+        List<CarModeStatus> enumTestList = new ArrayList<CarModeStatus>();
+        enumTestList.add(CarModeStatus.NORMAL);
+        enumTestList.add(CarModeStatus.FACTORY);
+        enumTestList.add(CarModeStatus.TRANSPORT);
+        enumTestList.add(CarModeStatus.CRASH);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
index f84e9c595..1128833d9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
@@ -9,83 +9,81 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "TYPE5SET";
-		CharacterSet enumType5Set = CharacterSet.valueForString(example);
-		example = "CID1SET";
-		CharacterSet enumCid1Set = CharacterSet.valueForString(example);
-		example = "CID2SET";
-		CharacterSet enumCid2Set = CharacterSet.valueForString(example);
-		example = "ASCII";
-		CharacterSet enumAsciiSet = CharacterSet.valueForString(example);
-		example = "ISO_8859_1";
-		CharacterSet enumIsoSet = CharacterSet.valueForString(example);
-		example = "UTF_8";
-		CharacterSet enumUtfSet = CharacterSet.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "TYPE2SET";
+        CharacterSet enumType2Set = CharacterSet.valueForString(example);
+        example = "TYPE5SET";
+        CharacterSet enumType5Set = CharacterSet.valueForString(example);
+        example = "CID1SET";
+        CharacterSet enumCid1Set = CharacterSet.valueForString(example);
+        example = "CID2SET";
+        CharacterSet enumCid2Set = CharacterSet.valueForString(example);
+        example = "ASCII";
+        CharacterSet enumAsciiSet = CharacterSet.valueForString(example);
+        example = "ISO_8859_1";
+        CharacterSet enumIsoSet = CharacterSet.valueForString(example);
+        example = "UTF_8";
+        CharacterSet enumUtfSet = CharacterSet.valueForString(example);
 
-		assertNotNull("TYPE2SET returned null", enumType2Set);
-		assertNotNull("TYPE5SET returned null", enumType5Set);
-		assertNotNull("CID1SET returned null", enumCid1Set);
-		assertNotNull("CID2SET returned null", enumCid2Set);
-		assertNotNull("ASCII returned null", enumAsciiSet);
-		assertNotNull("ISO_8859_1 returned null", enumIsoSet);
-		assertNotNull("UTF_8 returned null", enumUtfSet);
-	}
+        assertNotNull("TYPE2SET returned null", enumType2Set);
+        assertNotNull("TYPE5SET returned null", enumType5Set);
+        assertNotNull("CID1SET returned null", enumCid1Set);
+        assertNotNull("CID2SET returned null", enumCid2Set);
+        assertNotNull("ASCII returned null", enumAsciiSet);
+        assertNotNull("ISO_8859_1 returned null", enumIsoSet);
+        assertNotNull("UTF_8 returned null", enumUtfSet);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "tyPe2SeT";
-		try {
-		    CharacterSet temp = CharacterSet.valueForString(example);
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "tyPe2SeT";
+        try {
+            CharacterSet temp = CharacterSet.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    CharacterSet temp = CharacterSet.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            CharacterSet temp = CharacterSet.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of CharacterSet.
-	 */
-	public void testListEnum() {
- 		List<CharacterSet> enumValueList = Arrays.asList(CharacterSet.values());
+    /**
+     * Verifies the possible enum values of CharacterSet.
+     */
+    public void testListEnum() {
+        List<CharacterSet> enumValueList = Arrays.asList(CharacterSet.values());
 
-		List<CharacterSet> enumTestList = new ArrayList<CharacterSet>();
-		enumTestList.add(CharacterSet.TYPE2SET);
-		enumTestList.add(CharacterSet.TYPE5SET);
-		enumTestList.add(CharacterSet.CID1SET);
-		enumTestList.add(CharacterSet.CID2SET);
-		enumTestList.add(CharacterSet.ASCII);
-		enumTestList.add(CharacterSet.ISO_8859_1);
-		enumTestList.add(CharacterSet.UTF_8);
+        List<CharacterSet> enumTestList = new ArrayList<CharacterSet>();
+        enumTestList.add(CharacterSet.TYPE2SET);
+        enumTestList.add(CharacterSet.TYPE5SET);
+        enumTestList.add(CharacterSet.CID1SET);
+        enumTestList.add(CharacterSet.CID2SET);
+        enumTestList.add(CharacterSet.ASCII);
+        enumTestList.add(CharacterSet.ISO_8859_1);
+        enumTestList.add(CharacterSet.UTF_8);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
index 3f776bb00..4f7d7267e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
@@ -9,87 +9,85 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "NORTHWEST";
-		CompassDirection enumNorthWest = CompassDirection.valueForString(example);
-		example = "WEST";
-		CompassDirection enumWest = CompassDirection.valueForString(example);
-		example = "SOUTHWEST";
-		CompassDirection enumSouthWest = CompassDirection.valueForString(example);
-		example = "SOUTH";
-		CompassDirection enumSouth = CompassDirection.valueForString(example);
-		example = "SOUTHEAST";
-		CompassDirection enumSouthEast = CompassDirection.valueForString(example);
-		example = "EAST";
-		CompassDirection enumEast = CompassDirection.valueForString(example);
-		example = "NORTHEAST";
-		CompassDirection enumNorthEast = CompassDirection.valueForString(example);
-		
-		assertNotNull("NORTH returned null", enumNorth);
-		assertNotNull("NORTHWEST returned null", enumNorthWest);
-		assertNotNull("WEST returned null", enumWest);
-		assertNotNull("SOUTHWEST returned null", enumSouthWest);
-		assertNotNull("SOUTH returned null", enumSouth);
-		assertNotNull("SOUTHEAST returned null", enumSouthEast);
-		assertNotNull("EAST returned null", enumEast);
-		assertNotNull("NORTHEAST returned null", enumNorthEast);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NORTH";
+        CompassDirection enumNorth = CompassDirection.valueForString(example);
+        example = "NORTHWEST";
+        CompassDirection enumNorthWest = CompassDirection.valueForString(example);
+        example = "WEST";
+        CompassDirection enumWest = CompassDirection.valueForString(example);
+        example = "SOUTHWEST";
+        CompassDirection enumSouthWest = CompassDirection.valueForString(example);
+        example = "SOUTH";
+        CompassDirection enumSouth = CompassDirection.valueForString(example);
+        example = "SOUTHEAST";
+        CompassDirection enumSouthEast = CompassDirection.valueForString(example);
+        example = "EAST";
+        CompassDirection enumEast = CompassDirection.valueForString(example);
+        example = "NORTHEAST";
+        CompassDirection enumNorthEast = CompassDirection.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "noRTh";
-		try {
-		    CompassDirection temp = CompassDirection.valueForString(example);
+        assertNotNull("NORTH returned null", enumNorth);
+        assertNotNull("NORTHWEST returned null", enumNorthWest);
+        assertNotNull("WEST returned null", enumWest);
+        assertNotNull("SOUTHWEST returned null", enumSouthWest);
+        assertNotNull("SOUTH returned null", enumSouth);
+        assertNotNull("SOUTHEAST returned null", enumSouthEast);
+        assertNotNull("EAST returned null", enumEast);
+        assertNotNull("NORTHEAST returned null", enumNorthEast);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "noRTh";
+        try {
+            CompassDirection temp = CompassDirection.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    CompassDirection temp = CompassDirection.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            CompassDirection temp = CompassDirection.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of CompassDirection.
-	 */
-	public void testListEnum() {
- 		List<CompassDirection> enumValueList = Arrays.asList(CompassDirection.values());
+    /**
+     * Verifies the possible enum values of CompassDirection.
+     */
+    public void testListEnum() {
+        List<CompassDirection> enumValueList = Arrays.asList(CompassDirection.values());
 
-		List<CompassDirection> enumTestList = new ArrayList<CompassDirection>();
-		enumTestList.add(CompassDirection.NORTH);
-		enumTestList.add(CompassDirection.NORTHWEST);
-		enumTestList.add(CompassDirection.WEST);
-		enumTestList.add(CompassDirection.SOUTHWEST);
-		enumTestList.add(CompassDirection.SOUTH);
-		enumTestList.add(CompassDirection.SOUTHEAST);		
-		enumTestList.add(CompassDirection.EAST);
-		enumTestList.add(CompassDirection.NORTHEAST);	
+        List<CompassDirection> enumTestList = new ArrayList<CompassDirection>();
+        enumTestList.add(CompassDirection.NORTH);
+        enumTestList.add(CompassDirection.NORTHWEST);
+        enumTestList.add(CompassDirection.WEST);
+        enumTestList.add(CompassDirection.SOUTHWEST);
+        enumTestList.add(CompassDirection.SOUTH);
+        enumTestList.add(CompassDirection.SOUTHEAST);
+        enumTestList.add(CompassDirection.EAST);
+        enumTestList.add(CompassDirection.NORTHEAST);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
index 4583efe16..4ba6b8ebb 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
@@ -9,79 +9,77 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "NORMAL";
-		ComponentVolumeStatus enumNormal = ComponentVolumeStatus.valueForString(example);
-		example = "LOW";
-		ComponentVolumeStatus enumLow = ComponentVolumeStatus.valueForString(example);
-		example = "FAULT";
-		ComponentVolumeStatus enumFault = ComponentVolumeStatus.valueForString(example);
-		example = "ALERT";
-		ComponentVolumeStatus enumAlert = ComponentVolumeStatus.valueForString(example);
-		example = "NOT_SUPPORTED";
-		ComponentVolumeStatus enumNotSupported = ComponentVolumeStatus.valueForString(example);
-		
-		assertNotNull("UNKNOWN returned null", enumUnknown);
-		assertNotNull("NORMAL returned null", enumNormal);
-		assertNotNull("LOW returned null", enumLow);
-		assertNotNull("FAULT returned null", enumFault);
-		assertNotNull("ALERT returned null", enumAlert);
-		assertNotNull("NOT_SUPPORTED returned null", enumNotSupported);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "UNKNOWN";
+        ComponentVolumeStatus enumUnknown = ComponentVolumeStatus.valueForString(example);
+        example = "NORMAL";
+        ComponentVolumeStatus enumNormal = ComponentVolumeStatus.valueForString(example);
+        example = "LOW";
+        ComponentVolumeStatus enumLow = ComponentVolumeStatus.valueForString(example);
+        example = "FAULT";
+        ComponentVolumeStatus enumFault = ComponentVolumeStatus.valueForString(example);
+        example = "ALERT";
+        ComponentVolumeStatus enumAlert = ComponentVolumeStatus.valueForString(example);
+        example = "NOT_SUPPORTED";
+        ComponentVolumeStatus enumNotSupported = ComponentVolumeStatus.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "unKNowN";
-		try {
-		    ComponentVolumeStatus temp = ComponentVolumeStatus.valueForString(example);
+        assertNotNull("UNKNOWN returned null", enumUnknown);
+        assertNotNull("NORMAL returned null", enumNormal);
+        assertNotNull("LOW returned null", enumLow);
+        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 {
+            ComponentVolumeStatus temp = ComponentVolumeStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    ComponentVolumeStatus temp = ComponentVolumeStatus.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            ComponentVolumeStatus temp = ComponentVolumeStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of ComponentVolumeStatus.
-	 */
-	public void testListEnum() {
- 		List<ComponentVolumeStatus> enumValueList = Arrays.asList(ComponentVolumeStatus.values());
+    /**
+     * Verifies the possible enum values of ComponentVolumeStatus.
+     */
+    public void testListEnum() {
+        List<ComponentVolumeStatus> enumValueList = Arrays.asList(ComponentVolumeStatus.values());
 
-		List<ComponentVolumeStatus> enumTestList = new ArrayList<ComponentVolumeStatus>();
-		enumTestList.add(ComponentVolumeStatus.UNKNOWN);
-		enumTestList.add(ComponentVolumeStatus.NORMAL);
-		enumTestList.add(ComponentVolumeStatus.LOW);
-		enumTestList.add(ComponentVolumeStatus.FAULT);
-		enumTestList.add(ComponentVolumeStatus.ALERT);
-		enumTestList.add(ComponentVolumeStatus.NOT_SUPPORTED);		
+        List<ComponentVolumeStatus> enumTestList = new ArrayList<ComponentVolumeStatus>();
+        enumTestList.add(ComponentVolumeStatus.UNKNOWN);
+        enumTestList.add(ComponentVolumeStatus.NORMAL);
+        enumTestList.add(ComponentVolumeStatus.LOW);
+        enumTestList.add(ComponentVolumeStatus.FAULT);
+        enumTestList.add(ComponentVolumeStatus.ALERT);
+        enumTestList.add(ComponentVolumeStatus.NOT_SUPPORTED);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java
index 44d7a6241..422bb4428 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DefrostZoneTests.java
@@ -9,71 +9,69 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.DefrostZone}
  */
 public class DefrostZoneTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {	
-		String example = "FRONT";
-		DefrostZone enumFront = DefrostZone.valueForString(example);
-		example = "REAR";
-		DefrostZone enumRear = DefrostZone.valueForString(example);
-		example = "ALL";
-		DefrostZone enumAll = DefrostZone.valueForString(example);
-		example = "NONE";
-		DefrostZone enumNone = DefrostZone.valueForString(example);
-		
-		assertNotNull("FRONT returned null", enumFront);
-		assertNotNull("REAR returned null", enumRear);
-		assertNotNull("ALL returned null", enumAll);
-		assertNotNull("NONE returned null", enumNone);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "FRONT";
+        DefrostZone enumFront = DefrostZone.valueForString(example);
+        example = "REAR";
+        DefrostZone enumRear = DefrostZone.valueForString(example);
+        example = "ALL";
+        DefrostZone enumAll = DefrostZone.valueForString(example);
+        example = "NONE";
+        DefrostZone enumNone = DefrostZone.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "fRONT";
-		try {
-			DefrostZone temp = DefrostZone.valueForString(example);
+        assertNotNull("FRONT returned null", enumFront);
+        assertNotNull("REAR returned null", enumRear);
+        assertNotNull("ALL returned null", enumAll);
+        assertNotNull("NONE returned null", enumNone);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "fRONT";
+        try {
+            DefrostZone temp = DefrostZone.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			DefrostZone temp = DefrostZone.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            DefrostZone temp = DefrostZone.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of DefrostZone.
-	 */
-	public void testListEnum() {
- 		List<DefrostZone> enumValueList = Arrays.asList(DefrostZone.values());
+    /**
+     * Verifies the possible enum values of DefrostZone.
+     */
+    public void testListEnum() {
+        List<DefrostZone> enumValueList = Arrays.asList(DefrostZone.values());
 
-		List<DefrostZone> enumTestList = new ArrayList<DefrostZone>();
-		enumTestList.add(DefrostZone.FRONT);
-		enumTestList.add(DefrostZone.REAR);
-		enumTestList.add(DefrostZone.ALL);
-		enumTestList.add(DefrostZone.NONE);
+        List<DefrostZone> enumTestList = new ArrayList<DefrostZone>();
+        enumTestList.add(DefrostZone.FRONT);
+        enumTestList.add(DefrostZone.REAR);
+        enumTestList.add(DefrostZone.ALL);
+        enumTestList.add(DefrostZone.NONE);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
index 5b60dc6d2..cb8b23120 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
@@ -9,79 +9,77 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.DeviceLevelStatus}
  */
-public class DeviceLevelStatusTests extends TestCase{
+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);
-		example = "ONE_LEVEL_BARS";
-		DeviceLevelStatus enumOneLevel = DeviceLevelStatus.valueForString(example);
-		example = "TWO_LEVEL_BARS";
-		DeviceLevelStatus enumTwoLevel = DeviceLevelStatus.valueForString(example);
-		example = "THREE_LEVEL_BARS";
-		DeviceLevelStatus enumThreeLevel = DeviceLevelStatus.valueForString(example);
-		example = "FOUR_LEVEL_BARS";
-		DeviceLevelStatus enumFourLevel = DeviceLevelStatus.valueForString(example);
-		example = "NOT_PROVIDED";
-		DeviceLevelStatus enumNotProvided = DeviceLevelStatus.valueForString(example);
-				
-		assertNotNull("ZERO_LEVEL_BARS returned null", enumZeroLevel);
-		assertNotNull("ONE_LEVEL_BARS returned null", enumOneLevel);
-		assertNotNull("TWO_LEVEL_BARS returned null", enumTwoLevel);
-		assertNotNull("THREE_LEVEL_BARS returned null", enumThreeLevel);
-		assertNotNull("FOUR_LEVEL_BARS returned null", enumFourLevel);
-		assertNotNull("NOT_PROVIDED returned null", enumNotProvided);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "ZERO_LEVEL_BARS";
+        DeviceLevelStatus enumZeroLevel = DeviceLevelStatus.valueForString(example);
+        example = "ONE_LEVEL_BARS";
+        DeviceLevelStatus enumOneLevel = DeviceLevelStatus.valueForString(example);
+        example = "TWO_LEVEL_BARS";
+        DeviceLevelStatus enumTwoLevel = DeviceLevelStatus.valueForString(example);
+        example = "THREE_LEVEL_BARS";
+        DeviceLevelStatus enumThreeLevel = DeviceLevelStatus.valueForString(example);
+        example = "FOUR_LEVEL_BARS";
+        DeviceLevelStatus enumFourLevel = DeviceLevelStatus.valueForString(example);
+        example = "NOT_PROVIDED";
+        DeviceLevelStatus enumNotProvided = DeviceLevelStatus.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "onE_LeVeL_barS";
-		try {
-		    DeviceLevelStatus temp = DeviceLevelStatus.valueForString(example);
+        assertNotNull("ZERO_LEVEL_BARS returned null", enumZeroLevel);
+        assertNotNull("ONE_LEVEL_BARS returned null", enumOneLevel);
+        assertNotNull("TWO_LEVEL_BARS returned null", enumTwoLevel);
+        assertNotNull("THREE_LEVEL_BARS returned null", enumThreeLevel);
+        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 {
+            DeviceLevelStatus temp = DeviceLevelStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    DeviceLevelStatus temp = DeviceLevelStatus.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            DeviceLevelStatus temp = DeviceLevelStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of DeviceLevelStatus.
+     */
+    public void testListEnum() {
+        List<DeviceLevelStatus> enumValueList = Arrays.asList(DeviceLevelStatus.values());
 
-	/**
-	 * Verifies the possible enum values of DeviceLevelStatus.
-	 */
-	public void testListEnum() {
- 		List<DeviceLevelStatus> enumValueList = Arrays.asList(DeviceLevelStatus.values());
- 		
-		List<DeviceLevelStatus> enumTestList = new ArrayList<DeviceLevelStatus>();
-		enumTestList.add(DeviceLevelStatus.ZERO_LEVEL_BARS);
-		enumTestList.add(DeviceLevelStatus.ONE_LEVEL_BARS);
-		enumTestList.add(DeviceLevelStatus.TWO_LEVEL_BARS);
-		enumTestList.add(DeviceLevelStatus.THREE_LEVEL_BARS);
-		enumTestList.add(DeviceLevelStatus.FOUR_LEVEL_BARS);
-		enumTestList.add(DeviceLevelStatus.NOT_PROVIDED);		
+        List<DeviceLevelStatus> enumTestList = new ArrayList<DeviceLevelStatus>();
+        enumTestList.add(DeviceLevelStatus.ZERO_LEVEL_BARS);
+        enumTestList.add(DeviceLevelStatus.ONE_LEVEL_BARS);
+        enumTestList.add(DeviceLevelStatus.TWO_LEVEL_BARS);
+        enumTestList.add(DeviceLevelStatus.THREE_LEVEL_BARS);
+        enumTestList.add(DeviceLevelStatus.FOUR_LEVEL_BARS);
+        enumTestList.add(DeviceLevelStatus.NOT_PROVIDED);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java
index ec2d9ec23..60e8d2255 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "2D";
-		Dimension enum2D = Dimension.valueForString(example);
-		example = "3D";
-		Dimension enum3D = Dimension.valueForString(example);
-		
-		assertNotNull("NO_FIX returned null", enumNoFix);
-		assertNotNull("2D returned null", enum2D);
-		assertNotNull("3D returned null", enum3D);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NO_FIX";
+        Dimension enumNoFix = Dimension.valueForString(example);
+        example = "2D";
+        Dimension enum2D = Dimension.valueForString(example);
+        example = "3D";
+        Dimension enum3D = Dimension.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "no_FiX";
-		try {
-		    Dimension temp = Dimension.valueForString(example);
+        assertNotNull("NO_FIX returned null", enumNoFix);
+        assertNotNull("2D returned null", enum2D);
+        assertNotNull("3D returned null", enum3D);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "no_FiX";
+        try {
+            Dimension temp = Dimension.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    Dimension temp = Dimension.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            Dimension temp = Dimension.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
-	
-	/**
-	 * Verifies the possible enum values of Dimension.
-	 */
-	public void testListEnum() {
- 		List<Dimension> enumValueList = Arrays.asList(Dimension.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of Dimension.
+     */
+    public void testListEnum() {
+        List<Dimension> enumValueList = Arrays.asList(Dimension.values());
 
-		List<Dimension> enumTestList = new ArrayList<Dimension>();
-		enumTestList.add(Dimension.NO_FIX);
-		enumTestList.add(Dimension._2D);
-		enumTestList.add(Dimension._3D);
+        List<Dimension> enumTestList = new ArrayList<Dimension>();
+        enumTestList.add(Dimension.NO_FIX);
+        enumTestList.add(Dimension._2D);
+        enumTestList.add(Dimension._3D);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java
index 76492878d..1d6c67f1d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DirectionTests.java
@@ -14,58 +14,56 @@ import java.util.List;
  */
 public class DirectionTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "LEFT";
-		Direction enumLeft = Direction.valueForString(example);
-		example = "RIGHT";
-		Direction enumRight = Direction.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "LEFT";
+        Direction enumLeft = Direction.valueForString(example);
+        example = "RIGHT";
+        Direction enumRight = Direction.valueForString(example);
 
-		assertNotNull("LEFT returned null", enumLeft);
-		assertNotNull("RIGHT returned null", enumRight);
-	}
+        assertNotNull("LEFT returned null", enumLeft);
+        assertNotNull("RIGHT returned null", enumRight);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "fRONT";
-		try {
-			Direction temp = Direction.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "fRONT";
+        try {
+            Direction temp = Direction.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			Direction temp = Direction.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            Direction temp = Direction.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of Direction.
-	 */
-	public void testListEnum() {
-		List<Direction> enumValueList = Arrays.asList(Direction.values());
+    /**
+     * Verifies the possible enum values of Direction.
+     */
+    public void testListEnum() {
+        List<Direction> enumValueList = Arrays.asList(Direction.values());
 
-		List<Direction> enumTestList = new ArrayList<>();
-		enumTestList.add(Direction.LEFT);
-		enumTestList.add(Direction.RIGHT);
+        List<Direction> enumTestList = new ArrayList<>();
+        enumTestList.add(Direction.LEFT);
+        enumTestList.add(Direction.RIGHT);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java
index cb8073804..07d6a2f7d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayModeTests.java
@@ -15,60 +15,60 @@ import java.util.List;
  */
 public class DisplayModeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "DAY";
-		DisplayMode enumDay = DisplayMode.valueForString(example);
-		example = "NIGHT";
-		DisplayMode enumNight = DisplayMode.valueForString(example);
-		example = "AUTO";
-		DisplayMode enumAuto = DisplayMode.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "DAY";
+        DisplayMode enumDay = DisplayMode.valueForString(example);
+        example = "NIGHT";
+        DisplayMode enumNight = DisplayMode.valueForString(example);
+        example = "AUTO";
+        DisplayMode enumAuto = DisplayMode.valueForString(example);
 
-		assertNotNull("DAY returned null", enumDay);
-		assertNotNull("NIGHT returned null", enumNight);
-		assertNotNull("AUTO returned null", enumAuto);
-	}
+        assertNotNull("DAY returned null", enumDay);
+        assertNotNull("NIGHT returned null", enumNight);
+        assertNotNull("AUTO returned null", enumAuto);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "dAY";
-		try {
-			DisplayMode temp = DisplayMode.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "dAY";
+        try {
+            DisplayMode temp = DisplayMode.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			DisplayMode temp = DisplayMode.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            DisplayMode temp = DisplayMode.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of DisplayMode.
-	 */
-	public void testListEnum() {
-		List<DisplayMode> enumValueList = Arrays.asList(DisplayMode.values());
+    /**
+     * Verifies the possible enum values of DisplayMode.
+     */
+    public void testListEnum() {
+        List<DisplayMode> enumValueList = Arrays.asList(DisplayMode.values());
 
-		List<DisplayMode> enumTestList = new ArrayList<DisplayMode>();
-		enumTestList.add(DisplayMode.DAY);
-		enumTestList.add(DisplayMode.NIGHT);
-		enumTestList.add(DisplayMode.AUTO);
+        List<DisplayMode> enumTestList = new ArrayList<DisplayMode>();
+        enumTestList.add(DisplayMode.DAY);
+        enumTestList.add(DisplayMode.NIGHT);
+        enumTestList.add(DisplayMode.AUTO);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
index 71b738782..a60183e42 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
@@ -14,94 +14,92 @@ import java.util.List;
  */
 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);
-		example = "TYPE2";
-		DisplayType enumType2 = DisplayType.valueForString(example);
-		example = "TYPE5";
-		DisplayType enumType5 = DisplayType.valueForString(example);
-		example = "NGN";
-		DisplayType enumNgn = DisplayType.valueForString(example);
-		example = "GEN2_8_DMA";
-		DisplayType enumGen2_8Dma = DisplayType.valueForString(example);
-		example = "GEN2_6_DMA";
-		DisplayType enumGen2_6Dma = DisplayType.valueForString(example);
-		example = "MFD3";
-		DisplayType enumMfd3 = DisplayType.valueForString(example);
-		example = "MFD4";
-		DisplayType enumMfd4 = DisplayType.valueForString(example);
-		example = "MFD5";
-		DisplayType enumMfd5 = DisplayType.valueForString(example);
-		example = "GEN3_8-INCH";
-		DisplayType enumGen3_8Inch = DisplayType.valueForString(example);
-		example = "SDL_GENERIC";
-		DisplayType enumGeneric = DisplayType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "CID";
+        DisplayType enumCid = DisplayType.valueForString(example);
+        example = "TYPE2";
+        DisplayType enumType2 = DisplayType.valueForString(example);
+        example = "TYPE5";
+        DisplayType enumType5 = DisplayType.valueForString(example);
+        example = "NGN";
+        DisplayType enumNgn = DisplayType.valueForString(example);
+        example = "GEN2_8_DMA";
+        DisplayType enumGen2_8Dma = DisplayType.valueForString(example);
+        example = "GEN2_6_DMA";
+        DisplayType enumGen2_6Dma = DisplayType.valueForString(example);
+        example = "MFD3";
+        DisplayType enumMfd3 = DisplayType.valueForString(example);
+        example = "MFD4";
+        DisplayType enumMfd4 = DisplayType.valueForString(example);
+        example = "MFD5";
+        DisplayType enumMfd5 = DisplayType.valueForString(example);
+        example = "GEN3_8-INCH";
+        DisplayType enumGen3_8Inch = DisplayType.valueForString(example);
+        example = "SDL_GENERIC";
+        DisplayType enumGeneric = DisplayType.valueForString(example);
 
-		assertNotNull("CID returned null", enumCid);
-		assertNotNull("TYPE2 returned null", enumType2);
-		assertNotNull("TYPE5 returned null", enumType5);
-		assertNotNull("NGN returned null", enumNgn);
-		assertNotNull("GEN2_8_DMA returned null", enumGen2_8Dma);
-		assertNotNull("GEN2_6_DMA returned null", enumGen2_6Dma);
-		assertNotNull("MFD3 returned null", enumMfd3);
-		assertNotNull("MFD4 returned null", enumMfd4);
-		assertNotNull("MFD5 returned null", enumMfd5);
-		assertNotNull("GEN3_8-INCH returned null", enumGen3_8Inch);
-		assertNotNull("SDL_GENERIC returned null", enumGeneric);
-	}
+        assertNotNull("CID returned null", enumCid);
+        assertNotNull("TYPE2 returned null", enumType2);
+        assertNotNull("TYPE5 returned null", enumType5);
+        assertNotNull("NGN returned null", enumNgn);
+        assertNotNull("GEN2_8_DMA returned null", enumGen2_8Dma);
+        assertNotNull("GEN2_6_DMA returned null", enumGen2_6Dma);
+        assertNotNull("MFD3 returned null", enumMfd3);
+        assertNotNull("MFD4 returned null", enumMfd4);
+        assertNotNull("MFD5 returned null", enumMfd5);
+        assertNotNull("GEN3_8-INCH returned null", enumGen3_8Inch);
+        assertNotNull("SDL_GENERIC returned null", enumGeneric);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "cId";
-		try {
-			DisplayType temp = DisplayType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "cId";
+        try {
+            DisplayType temp = DisplayType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			DisplayType temp = DisplayType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            DisplayType temp = DisplayType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of DisplayType.
-	 */
-	public void testListEnum() {
-		List<DisplayType> enumValueList = Arrays.asList(DisplayType.values());
+    /**
+     * Verifies the possible enum values of DisplayType.
+     */
+    public void testListEnum() {
+        List<DisplayType> enumValueList = Arrays.asList(DisplayType.values());
 
-		List<DisplayType> enumTestList = new ArrayList<DisplayType>();
-		enumTestList.add(DisplayType.CID);
-		enumTestList.add(DisplayType.TYPE2);
-		enumTestList.add(DisplayType.TYPE5);
-		enumTestList.add(DisplayType.NGN);
-		enumTestList.add(DisplayType.GEN2_8_DMA);
-		enumTestList.add(DisplayType.GEN2_6_DMA);
-		enumTestList.add(DisplayType.MFD3);
-		enumTestList.add(DisplayType.MFD4);
-		enumTestList.add(DisplayType.MFD5);
-		enumTestList.add(DisplayType.GEN3_8_INCH);
-		enumTestList.add(DisplayType.SDL_GENERIC);
+        List<DisplayType> enumTestList = new ArrayList<DisplayType>();
+        enumTestList.add(DisplayType.CID);
+        enumTestList.add(DisplayType.TYPE2);
+        enumTestList.add(DisplayType.TYPE5);
+        enumTestList.add(DisplayType.NGN);
+        enumTestList.add(DisplayType.GEN2_8_DMA);
+        enumTestList.add(DisplayType.GEN2_6_DMA);
+        enumTestList.add(DisplayType.MFD3);
+        enumTestList.add(DisplayType.MFD4);
+        enumTestList.add(DisplayType.MFD5);
+        enumTestList.add(DisplayType.GEN3_8_INCH);
+        enumTestList.add(DisplayType.SDL_GENERIC);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java
index a0e491e37..6d2933e62 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DistanceUnitTests.java
@@ -15,55 +15,55 @@ import java.util.List;
  */
 public class DistanceUnitTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "MILES";
-		DistanceUnit enumMiles = DistanceUnit.valueForString(example);
-		example = "KILOMETERS";
-		DistanceUnit enumKilometers = DistanceUnit.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "MILES";
+        DistanceUnit enumMiles = DistanceUnit.valueForString(example);
+        example = "KILOMETERS";
+        DistanceUnit enumKilometers = DistanceUnit.valueForString(example);
 
-		assertNotNull("MILES returned null", enumMiles);
-		assertNotNull("KILOMETERS returned null", enumKilometers);
-	}
+        assertNotNull("MILES returned null", enumMiles);
+        assertNotNull("KILOMETERS returned null", enumKilometers);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "mILES";
-		try {
-			DistanceUnit temp = DistanceUnit.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "mILES";
+        try {
+            DistanceUnit temp = DistanceUnit.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			DistanceUnit temp = DistanceUnit.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            DistanceUnit temp = DistanceUnit.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of DistanceUnit.
-	 */
-	public void testListEnum() {
-		List<DistanceUnit> enumValueList = Arrays.asList(DistanceUnit.values());
-		List<DistanceUnit> enumTestList = new ArrayList<DistanceUnit>();
-		enumTestList.add(DistanceUnit.MILES);
-		enumTestList.add(DistanceUnit.KILOMETERS);
+    /**
+     * Verifies the possible enum values of DistanceUnit.
+     */
+    public void testListEnum() {
+        List<DistanceUnit> enumValueList = Arrays.asList(DistanceUnit.values());
+        List<DistanceUnit> enumTestList = new ArrayList<DistanceUnit>();
+        enumTestList.add(DistanceUnit.MILES);
+        enumTestList.add(DistanceUnit.KILOMETERS);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
index 672b8b91d..d63d9ff15 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
@@ -9,63 +9,61 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "DD_OFF";
-		DriverDistractionState enumDdOff = DriverDistractionState.valueForString(example);
-		
-		assertNotNull("DD_ON returned null", enumDdOn);
-		assertNotNull("DD_OFF returned null", enumDdOff);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "DD_ON";
+        DriverDistractionState enumDdOn = DriverDistractionState.valueForString(example);
+        example = "DD_OFF";
+        DriverDistractionState enumDdOff = DriverDistractionState.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "dD_oN";
-		try {
-		    DriverDistractionState temp = DriverDistractionState.valueForString(example);
+        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 {
+            DriverDistractionState temp = DriverDistractionState.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    DriverDistractionState temp = DriverDistractionState.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            DriverDistractionState temp = DriverDistractionState.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of DriverDistractionState.
-	 */
-	public void testListEnum() {
- 		List<DriverDistractionState> enumValueList = Arrays.asList(DriverDistractionState.values());
+    /**
+     * Verifies the possible enum values of DriverDistractionState.
+     */
+    public void testListEnum() {
+        List<DriverDistractionState> enumValueList = Arrays.asList(DriverDistractionState.values());
 
-		List<DriverDistractionState> enumTestList = new ArrayList<DriverDistractionState>();
-		enumTestList.add(DriverDistractionState.DD_ON);
-		enumTestList.add(DriverDistractionState.DD_OFF);
+        List<DriverDistractionState> enumTestList = new ArrayList<DriverDistractionState>();
+        enumTestList.add(DriverDistractionState.DD_ON);
+        enumTestList.add(DriverDistractionState.DD_OFF);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
index b7b79fcaf..9135281fa 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
@@ -9,83 +9,81 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "CALL_IN_PROGRESS";
-		ECallConfirmationStatus enumCallInProgress = ECallConfirmationStatus.valueForString(example);
-		example = "CALL_CANCELLED";
-		ECallConfirmationStatus enumCancelled = ECallConfirmationStatus.valueForString(example);
-		example = "CALL_COMPLETED";
-		ECallConfirmationStatus enumCompleted = ECallConfirmationStatus.valueForString(example);
-		example = "CALL_UNSUCCESSFUL";
-		ECallConfirmationStatus enumUnsuccessful = ECallConfirmationStatus.valueForString(example);
-		example = "ECALL_CONFIGURED_OFF";
-		ECallConfirmationStatus enumConfiguredOff = ECallConfirmationStatus.valueForString(example);
-		example = "CALL_COMPLETE_DTMF_TIMEOUT";
-		ECallConfirmationStatus enumCompleteDtmfTimeout = ECallConfirmationStatus.valueForString(example);
-		
-		assertNotNull("NORMAL returned null", enumNormal);
-		assertNotNull("CALL_IN_PROGRESS returned null", enumCallInProgress);
-		assertNotNull("CALL_CANCELLED returned null", enumCancelled);
-		assertNotNull("CALL_COMPLETED returned null", enumCompleted);
-		assertNotNull("CALL_UNSUCCESSFUL returned null", enumUnsuccessful);
-		assertNotNull("ECALL_CONFIGURED_OFF returned null", enumConfiguredOff);
-		assertNotNull("CALL_COMPLETE_DTMF_TIMEOUT returned null", enumCompleteDtmfTimeout);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NORMAL";
+        ECallConfirmationStatus enumNormal = ECallConfirmationStatus.valueForString(example);
+        example = "CALL_IN_PROGRESS";
+        ECallConfirmationStatus enumCallInProgress = ECallConfirmationStatus.valueForString(example);
+        example = "CALL_CANCELLED";
+        ECallConfirmationStatus enumCancelled = ECallConfirmationStatus.valueForString(example);
+        example = "CALL_COMPLETED";
+        ECallConfirmationStatus enumCompleted = ECallConfirmationStatus.valueForString(example);
+        example = "CALL_UNSUCCESSFUL";
+        ECallConfirmationStatus enumUnsuccessful = ECallConfirmationStatus.valueForString(example);
+        example = "ECALL_CONFIGURED_OFF";
+        ECallConfirmationStatus enumConfiguredOff = ECallConfirmationStatus.valueForString(example);
+        example = "CALL_COMPLETE_DTMF_TIMEOUT";
+        ECallConfirmationStatus enumCompleteDtmfTimeout = ECallConfirmationStatus.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "noRMal";
-		try {
-		    ECallConfirmationStatus temp = ECallConfirmationStatus.valueForString(example);
+        assertNotNull("NORMAL returned null", enumNormal);
+        assertNotNull("CALL_IN_PROGRESS returned null", enumCallInProgress);
+        assertNotNull("CALL_CANCELLED returned null", enumCancelled);
+        assertNotNull("CALL_COMPLETED returned null", enumCompleted);
+        assertNotNull("CALL_UNSUCCESSFUL returned null", enumUnsuccessful);
+        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 {
+            ECallConfirmationStatus temp = ECallConfirmationStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    ECallConfirmationStatus temp = ECallConfirmationStatus.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            ECallConfirmationStatus temp = ECallConfirmationStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of ECallConfirmationStatus.
-	 */
-	public void testListEnum() {
- 		List<ECallConfirmationStatus> enumValueList = Arrays.asList(ECallConfirmationStatus.values());
+    /**
+     * Verifies the possible enum values of ECallConfirmationStatus.
+     */
+    public void testListEnum() {
+        List<ECallConfirmationStatus> enumValueList = Arrays.asList(ECallConfirmationStatus.values());
 
-		List<ECallConfirmationStatus> enumTestList = new ArrayList<ECallConfirmationStatus>();
-		enumTestList.add(ECallConfirmationStatus.NORMAL);
-		enumTestList.add(ECallConfirmationStatus.CALL_IN_PROGRESS);
-		enumTestList.add(ECallConfirmationStatus.CALL_CANCELLED);
-		enumTestList.add(ECallConfirmationStatus.CALL_COMPLETED);
-		enumTestList.add(ECallConfirmationStatus.CALL_UNSUCCESSFUL);
-		enumTestList.add(ECallConfirmationStatus.ECALL_CONFIGURED_OFF);		
-		enumTestList.add(ECallConfirmationStatus.CALL_COMPLETE_DTMF_TIMEOUT);
+        List<ECallConfirmationStatus> enumTestList = new ArrayList<ECallConfirmationStatus>();
+        enumTestList.add(ECallConfirmationStatus.NORMAL);
+        enumTestList.add(ECallConfirmationStatus.CALL_IN_PROGRESS);
+        enumTestList.add(ECallConfirmationStatus.CALL_CANCELLED);
+        enumTestList.add(ECallConfirmationStatus.CALL_COMPLETED);
+        enumTestList.add(ECallConfirmationStatus.CALL_UNSUCCESSFUL);
+        enumTestList.add(ECallConfirmationStatus.ECALL_CONFIGURED_OFF);
+        enumTestList.add(ECallConfirmationStatus.CALL_COMPLETE_DTMF_TIMEOUT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java
index 10e89fe7f..1d775d710 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ElectronicParkBrakeStatusTests.java
@@ -13,70 +13,68 @@ import java.util.List;
  * {@link com.smartdevicelink.proxy.rpc.enums.ElectronicParkBrakeStatus}
  */
 public class ElectronicParkBrakeStatusTests extends TestCase {
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "CLOSED";
-		ElectronicParkBrakeStatus enumClosed = ElectronicParkBrakeStatus.valueForString(example);
-		example = "TRANSITION";
-		ElectronicParkBrakeStatus enumTransition = ElectronicParkBrakeStatus.valueForString(example);
-		example = "OPEN";
-		ElectronicParkBrakeStatus enumOpen = ElectronicParkBrakeStatus.valueForString(example);
-		example = "DRIVE_ACTIVE";
-		ElectronicParkBrakeStatus enumDriveActive = ElectronicParkBrakeStatus.valueForString(example);
-		example = "FAULT";
-		ElectronicParkBrakeStatus enumFault = ElectronicParkBrakeStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "CLOSED";
+        ElectronicParkBrakeStatus enumClosed = ElectronicParkBrakeStatus.valueForString(example);
+        example = "TRANSITION";
+        ElectronicParkBrakeStatus enumTransition = ElectronicParkBrakeStatus.valueForString(example);
+        example = "OPEN";
+        ElectronicParkBrakeStatus enumOpen = ElectronicParkBrakeStatus.valueForString(example);
+        example = "DRIVE_ACTIVE";
+        ElectronicParkBrakeStatus enumDriveActive = ElectronicParkBrakeStatus.valueForString(example);
+        example = "FAULT";
+        ElectronicParkBrakeStatus enumFault = ElectronicParkBrakeStatus.valueForString(example);
 
-		assertNotNull("CLOSED returned null", enumClosed);
-		assertNotNull("TRANSITION returned null", enumTransition);
-		assertNotNull("OPEN returned null", enumOpen);
-		assertNotNull("DRIVE_ACTIVE returned null", enumDriveActive);
-		assertNotNull("FAULT returned null", enumFault);
-	}
+        assertNotNull("CLOSED returned null", enumClosed);
+        assertNotNull("TRANSITION returned null", enumTransition);
+        assertNotNull("OPEN returned null", enumOpen);
+        assertNotNull("DRIVE_ACTIVE returned null", enumDriveActive);
+        assertNotNull("FAULT returned null", enumFault);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "Clsoed";
-		try {
-			ElectronicParkBrakeStatus temp = ElectronicParkBrakeStatus.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "Clsoed";
+        try {
+            ElectronicParkBrakeStatus temp = ElectronicParkBrakeStatus.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			ElectronicParkBrakeStatus temp = ElectronicParkBrakeStatus.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            ElectronicParkBrakeStatus temp = ElectronicParkBrakeStatus.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of Electronic Brake Status.
-	 */
-	public void testListEnum() {
-		List<ElectronicParkBrakeStatus> enumValueList = Arrays.asList(ElectronicParkBrakeStatus.values());
+    /**
+     * Verifies the possible enum values of Electronic Brake Status.
+     */
+    public void testListEnum() {
+        List<ElectronicParkBrakeStatus> enumValueList = Arrays.asList(ElectronicParkBrakeStatus.values());
 
-		List<ElectronicParkBrakeStatus> enumTestList = new ArrayList<ElectronicParkBrakeStatus>();
-		enumTestList.add(ElectronicParkBrakeStatus.CLOSED);
-		enumTestList.add(ElectronicParkBrakeStatus.TRANSITION);
-		enumTestList.add(ElectronicParkBrakeStatus.OPEN);
-		enumTestList.add(ElectronicParkBrakeStatus.DRIVE_ACTIVE);
-		enumTestList.add(ElectronicParkBrakeStatus.FAULT);
+        List<ElectronicParkBrakeStatus> enumTestList = new ArrayList<ElectronicParkBrakeStatus>();
+        enumTestList.add(ElectronicParkBrakeStatus.CLOSED);
+        enumTestList.add(ElectronicParkBrakeStatus.TRANSITION);
+        enumTestList.add(ElectronicParkBrakeStatus.OPEN);
+        enumTestList.add(ElectronicParkBrakeStatus.DRIVE_ACTIVE);
+        enumTestList.add(ElectronicParkBrakeStatus.FAULT);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
index 9931af71a..ae4e23e09 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
@@ -9,83 +9,81 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "FRONTAL";
-		EmergencyEventType enumFrontal = EmergencyEventType.valueForString(example);
-		example = "SIDE";
-		EmergencyEventType enumSide = EmergencyEventType.valueForString(example);
-		example = "REAR";
-		EmergencyEventType enumRear = EmergencyEventType.valueForString(example);
-		example = "ROLLOVER";
-		EmergencyEventType enumRollover = EmergencyEventType.valueForString(example);
-		example = "NOT_SUPPORTED";
-		EmergencyEventType enumNotSupported = EmergencyEventType.valueForString(example);
-		example = "FAULT";
-		EmergencyEventType enumFault = EmergencyEventType.valueForString(example);
-		
-		assertNotNull("NO_EVENT returned null", enumEventType);
-		assertNotNull("FRONTAL returned null", enumFrontal);
-		assertNotNull("SIDE returned null", enumSide);
-		assertNotNull("REAR returned null", enumRear);
-		assertNotNull("ROLLOVER returned null", enumRollover);
-		assertNotNull("NOT_SUPPORTED returned null", enumNotSupported);
-		assertNotNull("FAULT returned null", enumFault);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NO_EVENT";
+        EmergencyEventType enumEventType = EmergencyEventType.valueForString(example);
+        example = "FRONTAL";
+        EmergencyEventType enumFrontal = EmergencyEventType.valueForString(example);
+        example = "SIDE";
+        EmergencyEventType enumSide = EmergencyEventType.valueForString(example);
+        example = "REAR";
+        EmergencyEventType enumRear = EmergencyEventType.valueForString(example);
+        example = "ROLLOVER";
+        EmergencyEventType enumRollover = EmergencyEventType.valueForString(example);
+        example = "NOT_SUPPORTED";
+        EmergencyEventType enumNotSupported = EmergencyEventType.valueForString(example);
+        example = "FAULT";
+        EmergencyEventType enumFault = EmergencyEventType.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "nO_EvenT";
-		try {
-		    EmergencyEventType temp = EmergencyEventType.valueForString(example);
+        assertNotNull("NO_EVENT returned null", enumEventType);
+        assertNotNull("FRONTAL returned null", enumFrontal);
+        assertNotNull("SIDE returned null", enumSide);
+        assertNotNull("REAR returned null", enumRear);
+        assertNotNull("ROLLOVER returned null", enumRollover);
+        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 {
+            EmergencyEventType temp = EmergencyEventType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    EmergencyEventType temp = EmergencyEventType.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            EmergencyEventType temp = EmergencyEventType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of EmergencyEvent.
-	 */
-	public void testListEnum() {
- 		List<EmergencyEventType> enumValueList = Arrays.asList(EmergencyEventType.values());
+    /**
+     * Verifies the possible enum values of EmergencyEvent.
+     */
+    public void testListEnum() {
+        List<EmergencyEventType> enumValueList = Arrays.asList(EmergencyEventType.values());
 
-		List<EmergencyEventType> enumTestList = new ArrayList<EmergencyEventType>();
-		enumTestList.add(EmergencyEventType.NO_EVENT);
-		enumTestList.add(EmergencyEventType.FRONTAL);
-		enumTestList.add(EmergencyEventType.SIDE);
-		enumTestList.add(EmergencyEventType.REAR);
-		enumTestList.add(EmergencyEventType.ROLLOVER);
-		enumTestList.add(EmergencyEventType.NOT_SUPPORTED);		
-		enumTestList.add(EmergencyEventType.FAULT);
+        List<EmergencyEventType> enumTestList = new ArrayList<EmergencyEventType>();
+        enumTestList.add(EmergencyEventType.NO_EVENT);
+        enumTestList.add(EmergencyEventType.FRONTAL);
+        enumTestList.add(EmergencyEventType.SIDE);
+        enumTestList.add(EmergencyEventType.REAR);
+        enumTestList.add(EmergencyEventType.ROLLOVER);
+        enumTestList.add(EmergencyEventType.NOT_SUPPORTED);
+        enumTestList.add(EmergencyEventType.FAULT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
index d63e232dd..ea728c07a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
@@ -9,87 +9,85 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "GRAPHIC_JPEG";
-		FileType enumGraphicJpeg = FileType.valueForString(example);
-		example = "GRAPHIC_PNG";
-		FileType enumGraphicPng = FileType.valueForString(example);
-		example = "AUDIO_WAVE";
-		FileType enumAudioWave = FileType.valueForString(example);
-		example = "AUDIO_AAC";
-		FileType enumAudioAac = FileType.valueForString(example);
-		example = "AUDIO_MP3";
-		FileType enumAudioMp3 = FileType.valueForString(example);
-		example = "BINARY";
-		FileType enumBinary = FileType.valueForString(example);
-		example = "JSON";
-		FileType enumJson = FileType.valueForString(example);
-		
-		assertNotNull("GRAPHIC_BMP returned null", enumGraphicBmp);
-		assertNotNull("GRAPHIC_JPEG returned null", enumGraphicJpeg);
-		assertNotNull("GRAPHIC_PNG returned null", enumGraphicPng);
-		assertNotNull("AUDIO_WAVE returned null", enumAudioWave);
-		assertNotNull("AUDIO_AAC returned null", enumAudioAac);
-		assertNotNull("AUDIO_MP3 returned null", enumAudioMp3);
-		assertNotNull("BINARY returned null", enumBinary);
-		assertNotNull("JSON returned null", enumJson);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "GRAPHIC_BMP";
+        FileType enumGraphicBmp = FileType.valueForString(example);
+        example = "GRAPHIC_JPEG";
+        FileType enumGraphicJpeg = FileType.valueForString(example);
+        example = "GRAPHIC_PNG";
+        FileType enumGraphicPng = FileType.valueForString(example);
+        example = "AUDIO_WAVE";
+        FileType enumAudioWave = FileType.valueForString(example);
+        example = "AUDIO_AAC";
+        FileType enumAudioAac = FileType.valueForString(example);
+        example = "AUDIO_MP3";
+        FileType enumAudioMp3 = FileType.valueForString(example);
+        example = "BINARY";
+        FileType enumBinary = FileType.valueForString(example);
+        example = "JSON";
+        FileType enumJson = FileType.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "uSer_ExiT";
-		try {
-		    FileType temp = FileType.valueForString(example);
+        assertNotNull("GRAPHIC_BMP returned null", enumGraphicBmp);
+        assertNotNull("GRAPHIC_JPEG returned null", enumGraphicJpeg);
+        assertNotNull("GRAPHIC_PNG returned null", enumGraphicPng);
+        assertNotNull("AUDIO_WAVE returned null", enumAudioWave);
+        assertNotNull("AUDIO_AAC returned null", enumAudioAac);
+        assertNotNull("AUDIO_MP3 returned null", enumAudioMp3);
+        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 {
+            FileType temp = FileType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    FileType temp = FileType.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            FileType temp = FileType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of FileType.
-	 */
-	public void testListEnum() {
- 		List<FileType> enumValueList = Arrays.asList(FileType.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of FileType.
+     */
+    public void testListEnum() {
+        List<FileType> enumValueList = Arrays.asList(FileType.values());
 
-		List<FileType> enumTestList = new ArrayList<FileType>();
-		enumTestList.add(FileType.GRAPHIC_BMP);
-		enumTestList.add(FileType.GRAPHIC_JPEG);
-		enumTestList.add(FileType.GRAPHIC_PNG);
-		enumTestList.add(FileType.AUDIO_WAVE);
-		enumTestList.add(FileType.AUDIO_AAC);
-		enumTestList.add(FileType.AUDIO_MP3);		
-		enumTestList.add(FileType.BINARY);
-		enumTestList.add(FileType.JSON);		
+        List<FileType> enumTestList = new ArrayList<FileType>();
+        enumTestList.add(FileType.GRAPHIC_BMP);
+        enumTestList.add(FileType.GRAPHIC_JPEG);
+        enumTestList.add(FileType.GRAPHIC_PNG);
+        enumTestList.add(FileType.AUDIO_WAVE);
+        enumTestList.add(FileType.AUDIO_AAC);
+        enumTestList.add(FileType.AUDIO_MP3);
+        enumTestList.add(FileType.BINARY);
+        enumTestList.add(FileType.JSON);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
index aad8c0922..749dbd683 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "NORMAL_OPERATION";
-		FuelCutoffStatus enumNormalOperation = FuelCutoffStatus.valueForString(example);
-		example = "FAULT";
-		FuelCutoffStatus enumFault = FuelCutoffStatus.valueForString(example);
-		
-		assertNotNull("TERMINATE_FUEL returned null", enumTerminateFuel);
-		assertNotNull("NORMAL_OPERATION returned null", enumNormalOperation);
-		assertNotNull("FAULT returned null", enumFault);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "TERMINATE_FUEL";
+        FuelCutoffStatus enumTerminateFuel = FuelCutoffStatus.valueForString(example);
+        example = "NORMAL_OPERATION";
+        FuelCutoffStatus enumNormalOperation = FuelCutoffStatus.valueForString(example);
+        example = "FAULT";
+        FuelCutoffStatus enumFault = FuelCutoffStatus.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "tErmINAte_FueL";
-		try {
-		    FuelCutoffStatus temp = FuelCutoffStatus.valueForString(example);
+        assertNotNull("TERMINATE_FUEL returned null", enumTerminateFuel);
+        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 {
+            FuelCutoffStatus temp = FuelCutoffStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    FuelCutoffStatus temp = FuelCutoffStatus.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            FuelCutoffStatus temp = FuelCutoffStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } 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());
+    /**
+     * Verifies the possible enum values of FuelCutoffStatus.
+     */
+    public void testListEnum() {
+        List<FuelCutoffStatus> enumValueList = Arrays.asList(FuelCutoffStatus.values());
 
-		List<FuelCutoffStatus> enumTestList = new ArrayList<FuelCutoffStatus>();
-		enumTestList.add(FuelCutoffStatus.TERMINATE_FUEL);
-		enumTestList.add(FuelCutoffStatus.NORMAL_OPERATION);
-		enumTestList.add(FuelCutoffStatus.FAULT);
+        List<FuelCutoffStatus> enumTestList = new ArrayList<FuelCutoffStatus>();
+        enumTestList.add(FuelCutoffStatus.TERMINATE_FUEL);
+        enumTestList.add(FuelCutoffStatus.NORMAL_OPERATION);
+        enumTestList.add(FuelCutoffStatus.FAULT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java
index 25c3e08d9..e6f714e26 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelTypeTests.java
@@ -9,79 +9,77 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.FuelType}
  */
 public class FuelTypeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {	
-		String example = "GASOLINE";
-		FuelType enumGasoline = FuelType.valueForString(example);
-		example = "DIESEL";
-		FuelType enumDiesel = FuelType.valueForString(example);
-		example = "CNG";
-		FuelType enumCng = FuelType.valueForString(example);
-		example = "LPG";
-		FuelType enumLpg = FuelType.valueForString(example);
-		example = "HYDROGEN";
-		FuelType enumHydrogen = FuelType.valueForString(example);
-		example = "BATTERY";
-		FuelType enumBattery = FuelType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "GASOLINE";
+        FuelType enumGasoline = FuelType.valueForString(example);
+        example = "DIESEL";
+        FuelType enumDiesel = FuelType.valueForString(example);
+        example = "CNG";
+        FuelType enumCng = FuelType.valueForString(example);
+        example = "LPG";
+        FuelType enumLpg = FuelType.valueForString(example);
+        example = "HYDROGEN";
+        FuelType enumHydrogen = FuelType.valueForString(example);
+        example = "BATTERY";
+        FuelType enumBattery = FuelType.valueForString(example);
 
-		assertNotNull("GASOLINE returned null", enumGasoline);
-		assertNotNull("DIESEL returned null", enumDiesel);
-		assertNotNull("CNG returned null", enumCng);
-		assertNotNull("LPG returned null", enumLpg);
-		assertNotNull("HYDROGEN returned null", enumHydrogen);
-		assertNotNull("BATTERY returned null", enumBattery);
-	}
+        assertNotNull("GASOLINE returned null", enumGasoline);
+        assertNotNull("DIESEL returned null", enumDiesel);
+        assertNotNull("CNG returned null", enumCng);
+        assertNotNull("LPG returned null", enumLpg);
+        assertNotNull("HYDROGEN returned null", enumHydrogen);
+        assertNotNull("BATTERY returned null", enumBattery);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "gASOLINE";
-		try {
-			FuelType temp = FuelType.valueForString(example);
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "gASOLINE";
+        try {
+            FuelType temp = FuelType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			FuelType temp = FuelType.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            FuelType temp = FuelType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of FuelType.
-	 */
-	public void testListEnum() {
- 		List<FuelType> enumValueList = Arrays.asList(FuelType.values());
+    /**
+     * Verifies the possible enum values of FuelType.
+     */
+    public void testListEnum() {
+        List<FuelType> enumValueList = Arrays.asList(FuelType.values());
 
-		List<FuelType> enumTestList = new ArrayList<FuelType>();
-		enumTestList.add(FuelType.GASOLINE);
-		enumTestList.add(FuelType.DIESEL);
-		enumTestList.add(FuelType.CNG);
-		enumTestList.add(FuelType.LPG);
-		enumTestList.add(FuelType.HYDROGEN);
-		enumTestList.add(FuelType.BATTERY);
+        List<FuelType> enumTestList = new ArrayList<FuelType>();
+        enumTestList.add(FuelType.GASOLINE);
+        enumTestList.add(FuelType.DIESEL);
+        enumTestList.add(FuelType.CNG);
+        enumTestList.add(FuelType.LPG);
+        enumTestList.add(FuelType.HYDROGEN);
+        enumTestList.add(FuelType.BATTERY);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
index 37a20f61d..e05b364c9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
@@ -9,87 +9,85 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "TIMEOUTPROMPT";
-		GlobalProperty enumTimeoutPrompt = GlobalProperty.valueForString(example);
-		example = "VRHELPTITLE";
-		GlobalProperty enumVrHelpTitle = GlobalProperty.valueForString(example);
-		example = "VRHELPITEMS";
-		GlobalProperty enumVrHelpItems = GlobalProperty.valueForString(example);
-		example = "MENUNAME";
-		GlobalProperty enumMenuName = GlobalProperty.valueForString(example);
-		example = "MENUICON";
-		GlobalProperty enumMenuIcon = GlobalProperty.valueForString(example);
-		example = "KEYBOARDPROPERTIES";
-		GlobalProperty enumKeyboardProperties = GlobalProperty.valueForString(example);
-		example = "USERLOCATION";
-		GlobalProperty enumUserLocation = GlobalProperty.valueForString(example);
-		
-		assertNotNull("HELPPROMPT returned null", enumHelpPrompt);
-		assertNotNull("TIMEOUTPROMPT returned null", enumTimeoutPrompt);
-		assertNotNull("VRHELPTITLE returned null", enumVrHelpTitle);
-		assertNotNull("VRHELPITEMS returned null", enumVrHelpItems);
-		assertNotNull("MENUNAME returned null", enumMenuName);
-		assertNotNull("MENUICON returned null", enumMenuIcon);
-		assertNotNull("KEYBOARDPROPERTIES returned null", enumKeyboardProperties);
-		assertNotNull("USERLOCATION returned null", enumUserLocation);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "HELPPROMPT";
+        GlobalProperty enumHelpPrompt = GlobalProperty.valueForString(example);
+        example = "TIMEOUTPROMPT";
+        GlobalProperty enumTimeoutPrompt = GlobalProperty.valueForString(example);
+        example = "VRHELPTITLE";
+        GlobalProperty enumVrHelpTitle = GlobalProperty.valueForString(example);
+        example = "VRHELPITEMS";
+        GlobalProperty enumVrHelpItems = GlobalProperty.valueForString(example);
+        example = "MENUNAME";
+        GlobalProperty enumMenuName = GlobalProperty.valueForString(example);
+        example = "MENUICON";
+        GlobalProperty enumMenuIcon = GlobalProperty.valueForString(example);
+        example = "KEYBOARDPROPERTIES";
+        GlobalProperty enumKeyboardProperties = GlobalProperty.valueForString(example);
+        example = "USERLOCATION";
+        GlobalProperty enumUserLocation = GlobalProperty.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "heLp_ProMPt";
-		try {
-		    GlobalProperty temp = GlobalProperty.valueForString(example);
+        assertNotNull("HELPPROMPT returned null", enumHelpPrompt);
+        assertNotNull("TIMEOUTPROMPT returned null", enumTimeoutPrompt);
+        assertNotNull("VRHELPTITLE returned null", enumVrHelpTitle);
+        assertNotNull("VRHELPITEMS returned null", enumVrHelpItems);
+        assertNotNull("MENUNAME returned null", enumMenuName);
+        assertNotNull("MENUICON returned null", enumMenuIcon);
+        assertNotNull("KEYBOARDPROPERTIES returned null", enumKeyboardProperties);
+        assertNotNull("USERLOCATION returned null", enumUserLocation);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "heLp_ProMPt";
+        try {
+            GlobalProperty temp = GlobalProperty.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    GlobalProperty temp = GlobalProperty.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            GlobalProperty temp = GlobalProperty.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of GlobalProperty.
-	 */
-	public void testListEnum() {
- 		List<GlobalProperty> enumValueList = Arrays.asList(GlobalProperty.values());
+    /**
+     * Verifies the possible enum values of GlobalProperty.
+     */
+    public void testListEnum() {
+        List<GlobalProperty> enumValueList = Arrays.asList(GlobalProperty.values());
 
-		List<GlobalProperty> enumTestList = new ArrayList<GlobalProperty>();
-		enumTestList.add(GlobalProperty.HELPPROMPT);
-		enumTestList.add(GlobalProperty.TIMEOUTPROMPT);
-		enumTestList.add(GlobalProperty.VRHELPTITLE);
-		enumTestList.add(GlobalProperty.VRHELPITEMS);
-		enumTestList.add(GlobalProperty.MENUNAME);
-		enumTestList.add(GlobalProperty.MENUICON);		
-		enumTestList.add(GlobalProperty.KEYBOARDPROPERTIES);
-		enumTestList.add(GlobalProperty.USERLOCATION);
+        List<GlobalProperty> enumTestList = new ArrayList<GlobalProperty>();
+        enumTestList.add(GlobalProperty.HELPPROMPT);
+        enumTestList.add(GlobalProperty.TIMEOUTPROMPT);
+        enumTestList.add(GlobalProperty.VRHELPTITLE);
+        enumTestList.add(GlobalProperty.VRHELPITEMS);
+        enumTestList.add(GlobalProperty.MENUNAME);
+        enumTestList.add(GlobalProperty.MENUICON);
+        enumTestList.add(GlobalProperty.KEYBOARDPROPERTIES);
+        enumTestList.add(GlobalProperty.USERLOCATION);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
index 9f280bd8c..a33e4c226 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
@@ -9,71 +9,69 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "LIMITED";
-		HMILevel enumLimited = HMILevel.valueForString(example);
-		example = "BACKGROUND";
-		HMILevel enumBackground = HMILevel.valueForString(example);
-		example = "NONE";
-		HMILevel enumNone = HMILevel.valueForString(example);
-		
-		assertNotNull("FULL returned null", enumFull);
-		assertNotNull("LIMITED returned null", enumLimited);
-		assertNotNull("BACKGROUND returned null", enumBackground);
-		assertNotNull("NONE returned null", enumNone);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "FULL";
+        HMILevel enumFull = HMILevel.valueForString(example);
+        example = "LIMITED";
+        HMILevel enumLimited = HMILevel.valueForString(example);
+        example = "BACKGROUND";
+        HMILevel enumBackground = HMILevel.valueForString(example);
+        example = "NONE";
+        HMILevel enumNone = HMILevel.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "fUlL";
-		try {
-		    HMILevel temp = HMILevel.valueForString(example);
+        assertNotNull("FULL returned null", enumFull);
+        assertNotNull("LIMITED returned null", enumLimited);
+        assertNotNull("BACKGROUND returned null", enumBackground);
+        assertNotNull("NONE returned null", enumNone);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "fUlL";
+        try {
+            HMILevel temp = HMILevel.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    HMILevel temp = HMILevel.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            HMILevel temp = HMILevel.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of HMILevel.
+     */
+    public void testListEnum() {
+        List<HMILevel> enumValueList = Arrays.asList(HMILevel.values());
 
-	/**
-	 * Verifies the possible enum values of HMILevel.
-	 */
-	public void testListEnum() {
- 		List<HMILevel> enumValueList = Arrays.asList(HMILevel.values());
+        List<HMILevel> enumTestList = new ArrayList<HMILevel>();
+        enumTestList.add(HMILevel.HMI_FULL);
+        enumTestList.add(HMILevel.HMI_LIMITED);
+        enumTestList.add(HMILevel.HMI_BACKGROUND);
+        enumTestList.add(HMILevel.HMI_NONE);
 
-		List<HMILevel> enumTestList = new ArrayList<HMILevel>();
-		enumTestList.add(HMILevel.HMI_FULL);
-		enumTestList.add(HMILevel.HMI_LIMITED);
-		enumTestList.add(HMILevel.HMI_BACKGROUND);
-		enumTestList.add(HMILevel.HMI_NONE);
-		
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
index 4ff2b1abd..a9a27d3b4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
@@ -9,63 +9,61 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "BACK";
-		HmiZoneCapabilities enumBack = HmiZoneCapabilities.valueForString(example);
-		
-		assertNotNull("FRONT returned null", enumFront);
-		assertNotNull("BACK returned null", enumBack);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "FRONT";
+        HmiZoneCapabilities enumFront = HmiZoneCapabilities.valueForString(example);
+        example = "BACK";
+        HmiZoneCapabilities enumBack = HmiZoneCapabilities.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "fROnT";
-		try {
-		    HmiZoneCapabilities temp = HmiZoneCapabilities.valueForString(example);
+        assertNotNull("FRONT returned null", enumFront);
+        assertNotNull("BACK returned null", enumBack);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "fROnT";
+        try {
+            HmiZoneCapabilities temp = HmiZoneCapabilities.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    HmiZoneCapabilities temp = HmiZoneCapabilities.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            HmiZoneCapabilities temp = HmiZoneCapabilities.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of HmiZoneCapabilities.
-	 */
-	public void testListEnum() {
- 		List<HmiZoneCapabilities> enumValueList = Arrays.asList(HmiZoneCapabilities.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of HmiZoneCapabilities.
+     */
+    public void testListEnum() {
+        List<HmiZoneCapabilities> enumValueList = Arrays.asList(HmiZoneCapabilities.values());
 
-		List<HmiZoneCapabilities> enumTestList = new ArrayList<HmiZoneCapabilities>();
-		enumTestList.add(HmiZoneCapabilities.FRONT);
-		enumTestList.add(HmiZoneCapabilities.BACK);
+        List<HmiZoneCapabilities> enumTestList = new ArrayList<HmiZoneCapabilities>();
+        enumTestList.add(HmiZoneCapabilities.FRONT);
+        enumTestList.add(HmiZoneCapabilities.BACK);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java
index 5c601fe20..0d53a2ace 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HybridAppPreferenceTests.java
@@ -14,62 +14,60 @@ import java.util.List;
  */
 public class HybridAppPreferenceTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "MOBILE";
-		HybridAppPreference enumMobile = HybridAppPreference.valueForString(example);
-		example = "CLOUD";
-		HybridAppPreference enumCloud = HybridAppPreference.valueForString(example);
-		example = "BOTH";
-		HybridAppPreference enumBoth = HybridAppPreference.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "MOBILE";
+        HybridAppPreference enumMobile = HybridAppPreference.valueForString(example);
+        example = "CLOUD";
+        HybridAppPreference enumCloud = HybridAppPreference.valueForString(example);
+        example = "BOTH";
+        HybridAppPreference enumBoth = HybridAppPreference.valueForString(example);
 
-		assertNotNull("MOBILE returned null", enumMobile);
-		assertNotNull("CLOUD returned null", enumCloud);
-		assertNotNull("BOTH returned null", enumBoth);
-	}
+        assertNotNull("MOBILE returned null", enumMobile);
+        assertNotNull("CLOUD returned null", enumCloud);
+        assertNotNull("BOTH returned null", enumBoth);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "deFaUlt";
-		try {
-			HybridAppPreference temp = HybridAppPreference.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "deFaUlt";
+        try {
+            HybridAppPreference temp = HybridAppPreference.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			HybridAppPreference temp = HybridAppPreference.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            HybridAppPreference temp = HybridAppPreference.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of HybridAppPreference.
-	 */
-	public void testListEnum() {
-		List<HybridAppPreference> enumValueList = Arrays.asList(HybridAppPreference.values());
+    /**
+     * Verifies the possible enum values of HybridAppPreference.
+     */
+    public void testListEnum() {
+        List<HybridAppPreference> enumValueList = Arrays.asList(HybridAppPreference.values());
 
-		List<HybridAppPreference> enumTestList = new ArrayList<>();
-		enumTestList.add(HybridAppPreference.MOBILE);
-		enumTestList.add(HybridAppPreference.CLOUD);
-		enumTestList.add(HybridAppPreference.BOTH);
+        List<HybridAppPreference> enumTestList = new ArrayList<>();
+        enumTestList.add(HybridAppPreference.MOBILE);
+        enumTestList.add(HybridAppPreference.CLOUD);
+        enumTestList.add(HybridAppPreference.BOTH);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
index fdddae144..43de5fd8c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "IGNITION_SWITCH_STABLE";
-		IgnitionStableStatus enumIgnitionSwitchStable = IgnitionStableStatus.valueForString(example);
-		example = "MISSING_FROM_TRANSMITTER";
-		IgnitionStableStatus enumMissingFromTransmitter = IgnitionStableStatus.valueForString(example);
-		
-		assertNotNull("IGNITION_SWITCH_NOT_STABLE returned null", enumIgnitionSwitchNotStable);
-		assertNotNull("IGNITION_SWITCH_STABLE returned null", enumIgnitionSwitchStable);
-		assertNotNull("MISSING_FROM_TRANSMITTER returned null", enumMissingFromTransmitter);
-	}
+    /**
+     * 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);
+        example = "IGNITION_SWITCH_STABLE";
+        IgnitionStableStatus enumIgnitionSwitchStable = IgnitionStableStatus.valueForString(example);
+        example = "MISSING_FROM_TRANSMITTER";
+        IgnitionStableStatus enumMissingFromTransmitter = IgnitionStableStatus.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "iGnitIoN_SwiTch_NoT_StablE";
-		try {
-		    IgnitionStableStatus temp = IgnitionStableStatus.valueForString(example);
+        assertNotNull("IGNITION_SWITCH_NOT_STABLE returned null", enumIgnitionSwitchNotStable);
+        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 {
+            IgnitionStableStatus temp = IgnitionStableStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    IgnitionStableStatus temp = IgnitionStableStatus.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            IgnitionStableStatus temp = IgnitionStableStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of IgnitionStableStatus.
-	 */
-	public void testListEnum() {
- 		List<IgnitionStableStatus> enumValueList = Arrays.asList(IgnitionStableStatus.values());
+    /**
+     * Verifies the possible enum values of IgnitionStableStatus.
+     */
+    public void testListEnum() {
+        List<IgnitionStableStatus> enumValueList = Arrays.asList(IgnitionStableStatus.values());
 
-		List<IgnitionStableStatus> enumTestList = new ArrayList<IgnitionStableStatus>();
-		enumTestList.add(IgnitionStableStatus.IGNITION_SWITCH_NOT_STABLE);
-		enumTestList.add(IgnitionStableStatus.IGNITION_SWITCH_STABLE);
-		enumTestList.add(IgnitionStableStatus.MISSING_FROM_TRANSMITTER);
+        List<IgnitionStableStatus> enumTestList = new ArrayList<IgnitionStableStatus>();
+        enumTestList.add(IgnitionStableStatus.IGNITION_SWITCH_NOT_STABLE);
+        enumTestList.add(IgnitionStableStatus.IGNITION_SWITCH_STABLE);
+        enumTestList.add(IgnitionStableStatus.MISSING_FROM_TRANSMITTER);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
index e76ac75cc..ba9c56c45 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
@@ -9,79 +9,77 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "OFF";
-		IgnitionStatus enumOff = IgnitionStatus.valueForString(example);
-		example = "ACCESSORY";
-		IgnitionStatus enumAccessory = IgnitionStatus.valueForString(example);
-		example = "RUN";
-		IgnitionStatus enumRun = IgnitionStatus.valueForString(example);
-		example = "START";
-		IgnitionStatus enumStart = IgnitionStatus.valueForString(example);
-		example = "INVALID";
-		IgnitionStatus enumInvalid = IgnitionStatus.valueForString(example);
-		
-		assertNotNull("UNKNOWN returned null", enumUnknown);
-		assertNotNull("OFF returned null", enumOff);
-		assertNotNull("ACCESSORY returned null", enumAccessory);
-		assertNotNull("RUN returned null", enumRun);
-		assertNotNull("START returned null", enumStart);
-		assertNotNull("INVALID returned null", enumInvalid);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "UNKNOWN";
+        IgnitionStatus enumUnknown = IgnitionStatus.valueForString(example);
+        example = "OFF";
+        IgnitionStatus enumOff = IgnitionStatus.valueForString(example);
+        example = "ACCESSORY";
+        IgnitionStatus enumAccessory = IgnitionStatus.valueForString(example);
+        example = "RUN";
+        IgnitionStatus enumRun = IgnitionStatus.valueForString(example);
+        example = "START";
+        IgnitionStatus enumStart = IgnitionStatus.valueForString(example);
+        example = "INVALID";
+        IgnitionStatus enumInvalid = IgnitionStatus.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "uNKnowN";
-		try {
-		    IgnitionStatus temp = IgnitionStatus.valueForString(example);
+        assertNotNull("UNKNOWN returned null", enumUnknown);
+        assertNotNull("OFF returned null", enumOff);
+        assertNotNull("ACCESSORY returned null", enumAccessory);
+        assertNotNull("RUN returned null", enumRun);
+        assertNotNull("START returned null", enumStart);
+        assertNotNull("INVALID returned null", enumInvalid);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "uNKnowN";
+        try {
+            IgnitionStatus temp = IgnitionStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    IgnitionStatus temp = IgnitionStatus.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            IgnitionStatus temp = IgnitionStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of IgnitionStatus.
+     */
+    public void testListEnum() {
+        List<IgnitionStatus> enumValueList = Arrays.asList(IgnitionStatus.values());
 
-	/**
-	 * Verifies the possible enum values of IgnitionStatus.
-	 */
-	public void testListEnum() {
- 		List<IgnitionStatus> enumValueList = Arrays.asList(IgnitionStatus.values());
+        List<IgnitionStatus> enumTestList = new ArrayList<IgnitionStatus>();
+        enumTestList.add(IgnitionStatus.UNKNOWN);
+        enumTestList.add(IgnitionStatus.OFF);
+        enumTestList.add(IgnitionStatus.ACCESSORY);
+        enumTestList.add(IgnitionStatus.RUN);
+        enumTestList.add(IgnitionStatus.START);
+        enumTestList.add(IgnitionStatus.INVALID);
 
-		List<IgnitionStatus> enumTestList = new ArrayList<IgnitionStatus>();
-		enumTestList.add(IgnitionStatus.UNKNOWN);
-		enumTestList.add(IgnitionStatus.OFF);
-		enumTestList.add(IgnitionStatus.ACCESSORY);
-		enumTestList.add(IgnitionStatus.RUN);
-		enumTestList.add(IgnitionStatus.START);
-		enumTestList.add(IgnitionStatus.INVALID);		
-		
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
index c1b0b6cd7..7e4f28dde 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
@@ -9,111 +9,109 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "choiceImage";
-		ImageFieldName enumChoiceImage = ImageFieldName.valueForString(example);
-		example = "choiceSecondaryImage";
-		ImageFieldName enumSecondaryImage = ImageFieldName.valueForString(example);
-		example = "vrHelpItem";
-		ImageFieldName enumVrHelpItem = ImageFieldName.valueForString(example);
-		example = "turnIcon";
-		ImageFieldName enumTurnIcon = ImageFieldName.valueForString(example);
-		example = "menuIcon";
-		ImageFieldName enumMenuIcon = ImageFieldName.valueForString(example);
-		example = "cmdIcon";
-		ImageFieldName enumCmdIcon = ImageFieldName.valueForString(example);
-		example = "appIcon";
-		ImageFieldName enumAppIcon = ImageFieldName.valueForString(example);
-		example = "graphic";
-		ImageFieldName enumGraphicIcon = ImageFieldName.valueForString(example);
-		example = "showConstantTBTIcon";
-		ImageFieldName enumShowConstantTbtIcon = ImageFieldName.valueForString(example);
-		example = "showConstantTBTNextTurnIcon";
-		ImageFieldName enumShowConstantTbtNextTurnIcon = ImageFieldName.valueForString(example);
-		example = "locationImage";
-		ImageFieldName enumLocationImage = ImageFieldName.valueForString(example);
-		example = "secondaryGraphic";
-		ImageFieldName enumSecondaryGraphic = ImageFieldName.valueForString(example);
-				
-		assertNotNull("softButtonImage returned null", enumSoftButtonImage);
-		assertNotNull("choiceImage returned null", enumChoiceImage);
-		assertNotNull("choiceSecondaryImage returned null", enumSecondaryImage);
-		assertNotNull("vrHelpItem returned null", enumVrHelpItem);
-		assertNotNull("turnIcon returned null", enumTurnIcon);
-		assertNotNull("menuIcon returned null", enumMenuIcon);
-		assertNotNull("cmdIcon returned null", enumCmdIcon);
-		assertNotNull("appIcon returned null", enumAppIcon);
-		assertNotNull("graphic returned null", enumGraphicIcon);
-		assertNotNull("showConstantTBTIcon returned null", enumShowConstantTbtIcon);
-		assertNotNull("showConstantTBTNextTurnIcon returned null", enumShowConstantTbtNextTurnIcon);
-		assertNotNull("location image returned null", enumLocationImage);
-		assertNotNull("secondary graphic returned null", enumSecondaryGraphic);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "softButtonImage";
+        ImageFieldName enumSoftButtonImage = ImageFieldName.valueForString(example);
+        example = "choiceImage";
+        ImageFieldName enumChoiceImage = ImageFieldName.valueForString(example);
+        example = "choiceSecondaryImage";
+        ImageFieldName enumSecondaryImage = ImageFieldName.valueForString(example);
+        example = "vrHelpItem";
+        ImageFieldName enumVrHelpItem = ImageFieldName.valueForString(example);
+        example = "turnIcon";
+        ImageFieldName enumTurnIcon = ImageFieldName.valueForString(example);
+        example = "menuIcon";
+        ImageFieldName enumMenuIcon = ImageFieldName.valueForString(example);
+        example = "cmdIcon";
+        ImageFieldName enumCmdIcon = ImageFieldName.valueForString(example);
+        example = "appIcon";
+        ImageFieldName enumAppIcon = ImageFieldName.valueForString(example);
+        example = "graphic";
+        ImageFieldName enumGraphicIcon = ImageFieldName.valueForString(example);
+        example = "showConstantTBTIcon";
+        ImageFieldName enumShowConstantTbtIcon = ImageFieldName.valueForString(example);
+        example = "showConstantTBTNextTurnIcon";
+        ImageFieldName enumShowConstantTbtNextTurnIcon = ImageFieldName.valueForString(example);
+        example = "locationImage";
+        ImageFieldName enumLocationImage = ImageFieldName.valueForString(example);
+        example = "secondaryGraphic";
+        ImageFieldName enumSecondaryGraphic = ImageFieldName.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "sofTbUtTOnImagE";
-		try {
-		    ImageFieldName temp = ImageFieldName.valueForString(example);
+        assertNotNull("softButtonImage returned null", enumSoftButtonImage);
+        assertNotNull("choiceImage returned null", enumChoiceImage);
+        assertNotNull("choiceSecondaryImage returned null", enumSecondaryImage);
+        assertNotNull("vrHelpItem returned null", enumVrHelpItem);
+        assertNotNull("turnIcon returned null", enumTurnIcon);
+        assertNotNull("menuIcon returned null", enumMenuIcon);
+        assertNotNull("cmdIcon returned null", enumCmdIcon);
+        assertNotNull("appIcon returned null", enumAppIcon);
+        assertNotNull("graphic returned null", enumGraphicIcon);
+        assertNotNull("showConstantTBTIcon returned null", enumShowConstantTbtIcon);
+        assertNotNull("showConstantTBTNextTurnIcon returned null", enumShowConstantTbtNextTurnIcon);
+        assertNotNull("location image returned null", enumLocationImage);
+        assertNotNull("secondary graphic returned null", enumSecondaryGraphic);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "sofTbUtTOnImagE";
+        try {
+            ImageFieldName temp = ImageFieldName.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    ImageFieldName temp = ImageFieldName.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            ImageFieldName temp = ImageFieldName.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of ImageFieldName.
-	 */
-	public void testListEnum() {
- 		List<ImageFieldName> enumValueList = Arrays.asList(ImageFieldName.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of ImageFieldName.
+     */
+    public void testListEnum() {
+        List<ImageFieldName> enumValueList = Arrays.asList(ImageFieldName.values());
 
-		List<ImageFieldName> enumTestList = new ArrayList<ImageFieldName>();
-		enumTestList.add(ImageFieldName.softButtonImage);
-		enumTestList.add(ImageFieldName.choiceImage);
-		enumTestList.add(ImageFieldName.choiceSecondaryImage);
-		enumTestList.add(ImageFieldName.vrHelpItem);
-		enumTestList.add(ImageFieldName.turnIcon);
-		enumTestList.add(ImageFieldName.menuIcon);		
-		enumTestList.add(ImageFieldName.cmdIcon);
-		enumTestList.add(ImageFieldName.appIcon);	
-		enumTestList.add(ImageFieldName.graphic);
-		enumTestList.add(ImageFieldName.showConstantTBTIcon);	
-		enumTestList.add(ImageFieldName.showConstantTBTNextTurnIcon);	
-		enumTestList.add(ImageFieldName.locationImage);
-		enumTestList.add(ImageFieldName.secondaryGraphic);
-		enumTestList.add(ImageFieldName.alertIcon);
-		enumTestList.add(ImageFieldName.subtleAlertIcon);
-		enumTestList.add(ImageFieldName.subMenuIcon);
+        List<ImageFieldName> enumTestList = new ArrayList<ImageFieldName>();
+        enumTestList.add(ImageFieldName.softButtonImage);
+        enumTestList.add(ImageFieldName.choiceImage);
+        enumTestList.add(ImageFieldName.choiceSecondaryImage);
+        enumTestList.add(ImageFieldName.vrHelpItem);
+        enumTestList.add(ImageFieldName.turnIcon);
+        enumTestList.add(ImageFieldName.menuIcon);
+        enumTestList.add(ImageFieldName.cmdIcon);
+        enumTestList.add(ImageFieldName.appIcon);
+        enumTestList.add(ImageFieldName.graphic);
+        enumTestList.add(ImageFieldName.showConstantTBTIcon);
+        enumTestList.add(ImageFieldName.showConstantTBTNextTurnIcon);
+        enumTestList.add(ImageFieldName.locationImage);
+        enumTestList.add(ImageFieldName.secondaryGraphic);
+        enumTestList.add(ImageFieldName.alertIcon);
+        enumTestList.add(ImageFieldName.subtleAlertIcon);
+        enumTestList.add(ImageFieldName.subMenuIcon);
 
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
index e31375cae..17d96b89a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
@@ -9,63 +9,61 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "DYNAMIC";
-		ImageType enumDynamic = ImageType.valueForString(example);
-		
-		assertNotNull("STATIC returned null", enumStatic);
-		assertNotNull("DYNAMIC returned null", enumDynamic);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "STATIC";
+        ImageType enumStatic = ImageType.valueForString(example);
+        example = "DYNAMIC";
+        ImageType enumDynamic = ImageType.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "sTatIc";
-		try {
-		    ImageType temp = ImageType.valueForString(example);
+        assertNotNull("STATIC returned null", enumStatic);
+        assertNotNull("DYNAMIC returned null", enumDynamic);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "sTatIc";
+        try {
+            ImageType temp = ImageType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    ImageType temp = ImageType.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            ImageType temp = ImageType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of ImageType.
-	 */
-	public void testListEnum() {
- 		List<ImageType> enumValueList = Arrays.asList(ImageType.values());
+    /**
+     * Verifies the possible enum values of ImageType.
+     */
+    public void testListEnum() {
+        List<ImageType> enumValueList = Arrays.asList(ImageType.values());
 
-		List<ImageType> enumTestList = new ArrayList<ImageType>();
-		enumTestList.add(ImageType.STATIC);
-		enumTestList.add(ImageType.DYNAMIC);
+        List<ImageType> enumTestList = new ArrayList<ImageType>();
+        enumTestList.add(ImageType.STATIC);
+        enumTestList.add(ImageType.DYNAMIC);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
index baae35b38..c6ff9a218 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "VR_ONLY";
-		InteractionMode enumVrOnly = InteractionMode.valueForString(example);
-		example = "BOTH";
-		InteractionMode enumBoth = InteractionMode.valueForString(example);
-		
-		assertNotNull("MANUAL_ONLY returned null", enumManualOnly);
-		assertNotNull("VR_ONLY returned null", enumVrOnly);
-		assertNotNull("BOTH returned null", enumBoth);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "MANUAL_ONLY";
+        InteractionMode enumManualOnly = InteractionMode.valueForString(example);
+        example = "VR_ONLY";
+        InteractionMode enumVrOnly = InteractionMode.valueForString(example);
+        example = "BOTH";
+        InteractionMode enumBoth = InteractionMode.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "maNuAL_OnlY";
-		try {
-		    InteractionMode temp = InteractionMode.valueForString(example);
+        assertNotNull("MANUAL_ONLY returned null", enumManualOnly);
+        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 {
+            InteractionMode temp = InteractionMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    InteractionMode temp = InteractionMode.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            InteractionMode temp = InteractionMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of InteractionMode.
-	 */
-	public void testListEnum() {
- 		List<InteractionMode> enumValueList = Arrays.asList(InteractionMode.values());
+    /**
+     * Verifies the possible enum values of InteractionMode.
+     */
+    public void testListEnum() {
+        List<InteractionMode> enumValueList = Arrays.asList(InteractionMode.values());
 
-		List<InteractionMode> enumTestList = new ArrayList<InteractionMode>();
-		enumTestList.add(InteractionMode.MANUAL_ONLY);
-		enumTestList.add(InteractionMode.VR_ONLY);
-		enumTestList.add(InteractionMode.BOTH);
+        List<InteractionMode> enumTestList = new ArrayList<InteractionMode>();
+        enumTestList.add(InteractionMode.MANUAL_ONLY);
+        enumTestList.add(InteractionMode.VR_ONLY);
+        enumTestList.add(InteractionMode.BOTH);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java
index c215d052b..6712bfc0d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java
@@ -9,75 +9,75 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.Jingle}
  */
 public class JingleTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		
-		String example = "POSITIVE_JINGLE";
-		Jingle enumPositiveJingle = Jingle.valueForString(example);
-		example = "NEGATIVE_JINGLE";
-		Jingle enumNegativeJingle = Jingle.valueForString(example);
-		example = "INITIAL_JINGLE";
-		Jingle enumInitialJingle = Jingle.valueForString(example);
-		example = "LISTEN_JINGLE";
-		Jingle enumListenJingle = Jingle.valueForString(example);
-		example = "HELP_JINGLE";
-		Jingle enumHelpJingle = Jingle.valueForString(example);
-		
-		assertNotNull("POSITIVE_JINGLE returned null", enumPositiveJingle);
-		assertNotNull("NEGATIVE_JINGLE returned null", enumNegativeJingle);
-		assertNotNull("INITIAL_JINGLE returned null", enumInitialJingle);
-		assertNotNull("LISTEN_JINGLE returned null", enumListenJingle);
-		assertNotNull("HELP_JINGLE returned null", enumHelpJingle);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "posITive_JiGLE";
-		try {
-			Jingle temp = Jingle.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        String example = "POSITIVE_JINGLE";
+        Jingle enumPositiveJingle = Jingle.valueForString(example);
+        example = "NEGATIVE_JINGLE";
+        Jingle enumNegativeJingle = Jingle.valueForString(example);
+        example = "INITIAL_JINGLE";
+        Jingle enumInitialJingle = Jingle.valueForString(example);
+        example = "LISTEN_JINGLE";
+        Jingle enumListenJingle = Jingle.valueForString(example);
+        example = "HELP_JINGLE";
+        Jingle enumHelpJingle = Jingle.valueForString(example);
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			Jingle temp = Jingle.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+        assertNotNull("POSITIVE_JINGLE returned null", enumPositiveJingle);
+        assertNotNull("NEGATIVE_JINGLE returned null", enumNegativeJingle);
+        assertNotNull("INITIAL_JINGLE returned null", enumInitialJingle);
+        assertNotNull("LISTEN_JINGLE returned null", enumListenJingle);
+        assertNotNull("HELP_JINGLE returned null", enumHelpJingle);
+    }
 
-	/**
-	 * Verifies the possible enum values of Jingle.
-	 */
-	public void testListEnums () {
-		List<Jingle> enumValueList = Arrays.asList(Jingle.values());
-		List<Jingle> enumTestList = new ArrayList<Jingle>();
-		
-		enumTestList.add(Jingle.HELP);
-		enumTestList.add(Jingle.INITIAL);
-		enumTestList.add(Jingle.LISTEN);
-		enumTestList.add(Jingle.NEGATIVE);
-		enumTestList.add(Jingle.POSITIVE);
-		
-		assertTrue("Enum value list does not match neum class list.",
-					enumValueList.containsAll(enumTestList) &&
-					enumTestList.containsAll(enumValueList));
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "posITive_JiGLE";
+        try {
+            Jingle temp = Jingle.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            Jingle temp = Jingle.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of Jingle.
+     */
+    public void testListEnums() {
+        List<Jingle> enumValueList = Arrays.asList(Jingle.values());
+        List<Jingle> enumTestList = new ArrayList<Jingle>();
+
+        enumTestList.add(Jingle.HELP);
+        enumTestList.add(Jingle.INITIAL);
+        enumTestList.add(Jingle.LISTEN);
+        enumTestList.add(Jingle.NEGATIVE);
+        enumTestList.add(Jingle.POSITIVE);
+
+        assertTrue("Enum value list does not match neum class list.",
+                enumValueList.containsAll(enumTestList) &&
+                        enumTestList.containsAll(enumValueList));
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
index 28acd853f..13a28cfda 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
@@ -9,75 +9,73 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "ENTRY_SUBMITTED";
-		KeyboardEvent enumEntrySubmitted = KeyboardEvent.valueForString(example);
-		example = "ENTRY_CANCELLED";
-		KeyboardEvent enumEntryCancelled = KeyboardEvent.valueForString(example);
-		example = "ENTRY_ABORTED";
-		KeyboardEvent enumEntryAborted = KeyboardEvent.valueForString(example);
-		example = "ENTRY_VOICE";
-		KeyboardEvent enumEntryVoice = KeyboardEvent.valueForString(example);
-		
-		assertNotNull("KEYPRESS returned null", enumKeypress);
-		assertNotNull("ENTRY_SUBMITTED returned null", enumEntrySubmitted);
-		assertNotNull("ENTRY_CANCELLED returned null", enumEntryCancelled);
-		assertNotNull("ENTRY_ABORTED returned null", enumEntryAborted);
-		assertNotNull("ENTRY_VOICE returned null", enumEntryVoice);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "KEYPRESS";
+        KeyboardEvent enumKeypress = KeyboardEvent.valueForString(example);
+        example = "ENTRY_SUBMITTED";
+        KeyboardEvent enumEntrySubmitted = KeyboardEvent.valueForString(example);
+        example = "ENTRY_CANCELLED";
+        KeyboardEvent enumEntryCancelled = KeyboardEvent.valueForString(example);
+        example = "ENTRY_ABORTED";
+        KeyboardEvent enumEntryAborted = KeyboardEvent.valueForString(example);
+        example = "ENTRY_VOICE";
+        KeyboardEvent enumEntryVoice = KeyboardEvent.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "keyPreSS";
-		try {
-		    KeyboardEvent temp = KeyboardEvent.valueForString(example);
+        assertNotNull("KEYPRESS returned null", enumKeypress);
+        assertNotNull("ENTRY_SUBMITTED returned null", enumEntrySubmitted);
+        assertNotNull("ENTRY_CANCELLED returned null", enumEntryCancelled);
+        assertNotNull("ENTRY_ABORTED returned null", enumEntryAborted);
+        assertNotNull("ENTRY_VOICE returned null", enumEntryVoice);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "keyPreSS";
+        try {
+            KeyboardEvent temp = KeyboardEvent.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    KeyboardEvent temp = KeyboardEvent.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            KeyboardEvent temp = KeyboardEvent.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of KeyboardEvent.
-	 */
-	public void testListEnum() {
- 		List<KeyboardEvent> enumValueList = Arrays.asList(KeyboardEvent.values());
+    /**
+     * Verifies the possible enum values of KeyboardEvent.
+     */
+    public void testListEnum() {
+        List<KeyboardEvent> enumValueList = Arrays.asList(KeyboardEvent.values());
 
-		List<KeyboardEvent> enumTestList = new ArrayList<KeyboardEvent>();
-		enumTestList.add(KeyboardEvent.KEYPRESS);
-		enumTestList.add(KeyboardEvent.ENTRY_SUBMITTED);
-		enumTestList.add(KeyboardEvent.ENTRY_CANCELLED);
-		enumTestList.add(KeyboardEvent.ENTRY_ABORTED);
-		enumTestList.add(KeyboardEvent.ENTRY_VOICE);
+        List<KeyboardEvent> enumTestList = new ArrayList<KeyboardEvent>();
+        enumTestList.add(KeyboardEvent.KEYPRESS);
+        enumTestList.add(KeyboardEvent.ENTRY_SUBMITTED);
+        enumTestList.add(KeyboardEvent.ENTRY_CANCELLED);
+        enumTestList.add(KeyboardEvent.ENTRY_ABORTED);
+        enumTestList.add(KeyboardEvent.ENTRY_VOICE);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
index 5ce30904f..c75b9d7e9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "QWERTZ";
-		KeyboardLayout enumQwertz = KeyboardLayout.valueForString(example);
-		example = "AZERTY";
-		KeyboardLayout enumAzerty = KeyboardLayout.valueForString(example);
-		
-		assertNotNull("QWERTY returned null", enumQwerty);
-		assertNotNull("QWERTZ returned null", enumQwertz);
-		assertNotNull("AZERTY returned null", enumAzerty);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "QWERTY";
+        KeyboardLayout enumQwerty = KeyboardLayout.valueForString(example);
+        example = "QWERTZ";
+        KeyboardLayout enumQwertz = KeyboardLayout.valueForString(example);
+        example = "AZERTY";
+        KeyboardLayout enumAzerty = KeyboardLayout.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "qWerTY";
-		try {
-		    KeyboardLayout temp = KeyboardLayout.valueForString(example);
+        assertNotNull("QWERTY returned null", enumQwerty);
+        assertNotNull("QWERTZ returned null", enumQwertz);
+        assertNotNull("AZERTY returned null", enumAzerty);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "qWerTY";
+        try {
+            KeyboardLayout temp = KeyboardLayout.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    KeyboardLayout temp = KeyboardLayout.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            KeyboardLayout temp = KeyboardLayout.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of KeyboardLayout.
-	 */
-	public void testListEnum() {
- 		List<KeyboardLayout> enumValueList = Arrays.asList(KeyboardLayout.values());
+    /**
+     * Verifies the possible enum values of KeyboardLayout.
+     */
+    public void testListEnum() {
+        List<KeyboardLayout> enumValueList = Arrays.asList(KeyboardLayout.values());
 
-		List<KeyboardLayout> enumTestList = new ArrayList<KeyboardLayout>();
-		enumTestList.add(KeyboardLayout.QWERTY);
-		enumTestList.add(KeyboardLayout.QWERTZ);
-		enumTestList.add(KeyboardLayout.AZERTY);
+        List<KeyboardLayout> enumTestList = new ArrayList<KeyboardLayout>();
+        enumTestList.add(KeyboardLayout.QWERTY);
+        enumTestList.add(KeyboardLayout.QWERTZ);
+        enumTestList.add(KeyboardLayout.AZERTY);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
index 6384cc9f3..d432606ee 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "QUEUE_KEYPRESSES";
-		KeypressMode enumQueueKeypresses = KeypressMode.valueForString(example);
-		example = "RESEND_CURRENT_ENTRY";
-		KeypressMode enumResendCurrentEntry = KeypressMode.valueForString(example);
-		
-		assertNotNull("SINGLE_KEYPRESS returned null", enumSingleKeypress);
-		assertNotNull("QUEUE_KEYPRESSES returned null", enumQueueKeypresses);
-		assertNotNull("RESEND_CURRENT_ENTRY returned null", enumResendCurrentEntry);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "SINGLE_KEYPRESS";
+        KeypressMode enumSingleKeypress = KeypressMode.valueForString(example);
+        example = "QUEUE_KEYPRESSES";
+        KeypressMode enumQueueKeypresses = KeypressMode.valueForString(example);
+        example = "RESEND_CURRENT_ENTRY";
+        KeypressMode enumResendCurrentEntry = KeypressMode.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "sIngLe_KeyPrESs";
-		try {
-		    KeypressMode temp = KeypressMode.valueForString(example);
+        assertNotNull("SINGLE_KEYPRESS returned null", enumSingleKeypress);
+        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 {
+            KeypressMode temp = KeypressMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    KeypressMode temp = KeypressMode.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            KeypressMode temp = KeypressMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of KeypressMode.
-	 */
-	public void testListEnum() {
- 		List<KeypressMode> enumValueList = Arrays.asList(KeypressMode.values());
+    /**
+     * Verifies the possible enum values of KeypressMode.
+     */
+    public void testListEnum() {
+        List<KeypressMode> enumValueList = Arrays.asList(KeypressMode.values());
 
-		List<KeypressMode> enumTestList = new ArrayList<KeypressMode>();
-		enumTestList.add(KeypressMode.SINGLE_KEYPRESS);
-		enumTestList.add(KeypressMode.QUEUE_KEYPRESSES);
-		enumTestList.add(KeypressMode.RESEND_CURRENT_ENTRY);
+        List<KeypressMode> enumTestList = new ArrayList<KeypressMode>();
+        enumTestList.add(KeypressMode.SINGLE_KEYPRESS);
+        enumTestList.add(KeypressMode.QUEUE_KEYPRESSES);
+        enumTestList.add(KeypressMode.RESEND_CURRENT_ENTRY);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java
index 61de1cfd5..88889b525 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java
@@ -9,212 +9,210 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "EN-SA";
-		Language enumEnSa = Language.valueForString(example);
-		example = "HE-IL";
-		Language enumHeIl = Language.valueForString(example);
-		example = "RO-RO";
-		Language enumRoRo = Language.valueForString(example);
-		example = "UK-UA";
-		Language enumUkUa = Language.valueForString(example);
-		example = "ID-ID";
-		Language enumIdId = Language.valueForString(example);
-		example = "VI-VN";
-		Language enumViVn = Language.valueForString(example);
-		example = "MS-MY";
-		Language enumMsMy = Language.valueForString(example);
-		example = "HI-IN";
-		Language enumHiIn = Language.valueForString(example);
-		example = "NL-BE";
-		Language enumNlBe = Language.valueForString(example);
-		example = "EL-GR";
-		Language enumElGr = Language.valueForString(example);
-		example = "HU-HU";
-		Language enumHuHu = Language.valueForString(example);
-		example = "FI-FI";
-		Language enumFiFi = Language.valueForString(example);
-		example = "SK-SK";
-		Language enumSkSk = Language.valueForString(example);
-		example = "ES-MX";
-		Language enumEsMx = Language.valueForString(example);
-		example = "FR-CA";
-		Language enumFrCa = Language.valueForString(example);
-		example = "DE-DE";
-		Language enumDeDe = Language.valueForString(example);
-		example = "ES-ES";
-		Language enumEsEs = Language.valueForString(example);
-		example = "EN-GB";
-		Language enumEnGb = Language.valueForString(example);
-		example = "RU-RU";
-		Language enumRuRu = Language.valueForString(example);
-		example = "TR-TR";
-		Language enumTrTr = Language.valueForString(example);
-		example = "PL-PL";
-		Language enumPlPl = Language.valueForString(example);
-		example = "FR-FR";
-		Language enumFrFr = Language.valueForString(example);
-		example = "IT-IT";
-		Language enumItIt = Language.valueForString(example);
-		example = "SV-SE";
-		Language enumSvSe = Language.valueForString(example);
-		example = "PT-PT";
-		Language enumPtPt = Language.valueForString(example);
-		example = "NL-NL";
-		Language enumNlNl = Language.valueForString(example);
-		example = "EN-AU";
-		Language enumEnAu = Language.valueForString(example);
-		example = "ZH-CN";
-		Language enumZhCn = Language.valueForString(example);
-		example = "ZH-TW";
-		Language enumZhTw = Language.valueForString(example);
-		example = "JA-JP";
-		Language enumJaJp = Language.valueForString(example);
-		example = "AR-SA";
-		Language enumArSa = Language.valueForString(example);
-		example = "KO-KR";
-		Language enumKoKr = Language.valueForString(example);
-		example = "PT-BR";
-		Language enumPtBr = Language.valueForString(example);
-		example = "CS-CZ";
-		Language enumCsCz = Language.valueForString(example);
-		example = "DA-DK";
-		Language enumDaDk = Language.valueForString(example);
-		example = "NO-NO";
-		Language enumNoNo = Language.valueForString(example);
-		example = "EN-IN";
-		Language enumEnIn = Language.valueForString(example);
-		example = "TH-TH";
-		Language enumThTh = Language.valueForString(example);
-		
-		assertNotNull("EN-US returned null", enumEnUs);
-		assertNotNull("EN-SA returned null", enumEnSa);
-		assertNotNull("HE-IL returned null", enumHeIl);
-		assertNotNull("RO-RO returned null", enumRoRo);
-		assertNotNull("UK-UA returned null", enumUkUa);
-		assertNotNull("ID-ID returned null", enumIdId);
-		assertNotNull("VI-VN returned null", enumViVn);
-		assertNotNull("MS-MY returned null", enumMsMy);
-		assertNotNull("HI-IN returned null", enumHiIn);
-		assertNotNull("NL-BE returned null", enumNlBe);
-		assertNotNull("EL-GR returned null", enumElGr);
-		assertNotNull("HU-HU returned null", enumHuHu);
-		assertNotNull("FI-FI returned null", enumFiFi);
-		assertNotNull("SK-SK returned null", enumSkSk);
-		assertNotNull("ES-MX returned null", enumEsMx);
-		assertNotNull("FR-CA returned null", enumFrCa);
-		assertNotNull("DE-DE returned null", enumDeDe);
-		assertNotNull("ES-ES returned null", enumEsEs);
-		assertNotNull("EN-GB returned null", enumEnGb);
-		assertNotNull("RU-RU returned null", enumRuRu);
-		assertNotNull("TR-TR returned null", enumTrTr);
-		assertNotNull("PL-PL returned null", enumPlPl);
-		assertNotNull("FR-FR returned null", enumFrFr);
-		assertNotNull("IT-IT returned null", enumItIt);
-		assertNotNull("SV-SE returned null", enumSvSe);
-		assertNotNull("PT-PT returned null", enumPtPt);
-		assertNotNull("NL-NL returned null", enumNlNl);
-		assertNotNull("EN-AU returned null", enumEnAu);
-		assertNotNull("ZH-CN returned null", enumZhCn);
-		assertNotNull("ZH-TW returned null", enumZhTw);
-		assertNotNull("JA-JP returned null", enumJaJp);
-		assertNotNull("AR-SA returned null", enumArSa);
-		assertNotNull("KO-KR returned null", enumKoKr);
-		assertNotNull("PT-BR returned null", enumPtBr);
-		assertNotNull("CS-CZ returned null", enumCsCz);
-		assertNotNull("DA-DK returned null", enumDaDk);
-		assertNotNull("NO-NO returned null", enumNoNo);
-		assertNotNull("EN-IN returned null", enumEnIn);
-		assertNotNull("TH-TH returned null", enumThTh);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "EN-US";
+        Language enumEnUs = Language.valueForString(example);
+        example = "EN-SA";
+        Language enumEnSa = Language.valueForString(example);
+        example = "HE-IL";
+        Language enumHeIl = Language.valueForString(example);
+        example = "RO-RO";
+        Language enumRoRo = Language.valueForString(example);
+        example = "UK-UA";
+        Language enumUkUa = Language.valueForString(example);
+        example = "ID-ID";
+        Language enumIdId = Language.valueForString(example);
+        example = "VI-VN";
+        Language enumViVn = Language.valueForString(example);
+        example = "MS-MY";
+        Language enumMsMy = Language.valueForString(example);
+        example = "HI-IN";
+        Language enumHiIn = Language.valueForString(example);
+        example = "NL-BE";
+        Language enumNlBe = Language.valueForString(example);
+        example = "EL-GR";
+        Language enumElGr = Language.valueForString(example);
+        example = "HU-HU";
+        Language enumHuHu = Language.valueForString(example);
+        example = "FI-FI";
+        Language enumFiFi = Language.valueForString(example);
+        example = "SK-SK";
+        Language enumSkSk = Language.valueForString(example);
+        example = "ES-MX";
+        Language enumEsMx = Language.valueForString(example);
+        example = "FR-CA";
+        Language enumFrCa = Language.valueForString(example);
+        example = "DE-DE";
+        Language enumDeDe = Language.valueForString(example);
+        example = "ES-ES";
+        Language enumEsEs = Language.valueForString(example);
+        example = "EN-GB";
+        Language enumEnGb = Language.valueForString(example);
+        example = "RU-RU";
+        Language enumRuRu = Language.valueForString(example);
+        example = "TR-TR";
+        Language enumTrTr = Language.valueForString(example);
+        example = "PL-PL";
+        Language enumPlPl = Language.valueForString(example);
+        example = "FR-FR";
+        Language enumFrFr = Language.valueForString(example);
+        example = "IT-IT";
+        Language enumItIt = Language.valueForString(example);
+        example = "SV-SE";
+        Language enumSvSe = Language.valueForString(example);
+        example = "PT-PT";
+        Language enumPtPt = Language.valueForString(example);
+        example = "NL-NL";
+        Language enumNlNl = Language.valueForString(example);
+        example = "EN-AU";
+        Language enumEnAu = Language.valueForString(example);
+        example = "ZH-CN";
+        Language enumZhCn = Language.valueForString(example);
+        example = "ZH-TW";
+        Language enumZhTw = Language.valueForString(example);
+        example = "JA-JP";
+        Language enumJaJp = Language.valueForString(example);
+        example = "AR-SA";
+        Language enumArSa = Language.valueForString(example);
+        example = "KO-KR";
+        Language enumKoKr = Language.valueForString(example);
+        example = "PT-BR";
+        Language enumPtBr = Language.valueForString(example);
+        example = "CS-CZ";
+        Language enumCsCz = Language.valueForString(example);
+        example = "DA-DK";
+        Language enumDaDk = Language.valueForString(example);
+        example = "NO-NO";
+        Language enumNoNo = Language.valueForString(example);
+        example = "EN-IN";
+        Language enumEnIn = Language.valueForString(example);
+        example = "TH-TH";
+        Language enumThTh = Language.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "eN-Us";
-		try {
-		    Language temp = Language.valueForString(example);
+        assertNotNull("EN-US returned null", enumEnUs);
+        assertNotNull("EN-SA returned null", enumEnSa);
+        assertNotNull("HE-IL returned null", enumHeIl);
+        assertNotNull("RO-RO returned null", enumRoRo);
+        assertNotNull("UK-UA returned null", enumUkUa);
+        assertNotNull("ID-ID returned null", enumIdId);
+        assertNotNull("VI-VN returned null", enumViVn);
+        assertNotNull("MS-MY returned null", enumMsMy);
+        assertNotNull("HI-IN returned null", enumHiIn);
+        assertNotNull("NL-BE returned null", enumNlBe);
+        assertNotNull("EL-GR returned null", enumElGr);
+        assertNotNull("HU-HU returned null", enumHuHu);
+        assertNotNull("FI-FI returned null", enumFiFi);
+        assertNotNull("SK-SK returned null", enumSkSk);
+        assertNotNull("ES-MX returned null", enumEsMx);
+        assertNotNull("FR-CA returned null", enumFrCa);
+        assertNotNull("DE-DE returned null", enumDeDe);
+        assertNotNull("ES-ES returned null", enumEsEs);
+        assertNotNull("EN-GB returned null", enumEnGb);
+        assertNotNull("RU-RU returned null", enumRuRu);
+        assertNotNull("TR-TR returned null", enumTrTr);
+        assertNotNull("PL-PL returned null", enumPlPl);
+        assertNotNull("FR-FR returned null", enumFrFr);
+        assertNotNull("IT-IT returned null", enumItIt);
+        assertNotNull("SV-SE returned null", enumSvSe);
+        assertNotNull("PT-PT returned null", enumPtPt);
+        assertNotNull("NL-NL returned null", enumNlNl);
+        assertNotNull("EN-AU returned null", enumEnAu);
+        assertNotNull("ZH-CN returned null", enumZhCn);
+        assertNotNull("ZH-TW returned null", enumZhTw);
+        assertNotNull("JA-JP returned null", enumJaJp);
+        assertNotNull("AR-SA returned null", enumArSa);
+        assertNotNull("KO-KR returned null", enumKoKr);
+        assertNotNull("PT-BR returned null", enumPtBr);
+        assertNotNull("CS-CZ returned null", enumCsCz);
+        assertNotNull("DA-DK returned null", enumDaDk);
+        assertNotNull("NO-NO returned null", enumNoNo);
+        assertNotNull("EN-IN returned null", enumEnIn);
+        assertNotNull("TH-TH returned null", enumThTh);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "eN-Us";
+        try {
+            Language temp = Language.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    Language temp = Language.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            Language temp = Language.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of Language.
+     */
+    public void testListEnum() {
+        List<Language> enumValueList = Arrays.asList(Language.values());
+
+        List<Language> enumTestList = new ArrayList<Language>();
 
-	/**
-	 * Verifies the possible enum values of Language.
-	 */
-	public void testListEnum() {
- 		List<Language> enumValueList = Arrays.asList(Language.values());
+        enumTestList.add(Language.EN_US);
+        enumTestList.add(Language.EN_SA);
+        enumTestList.add(Language.HE_IL);
+        enumTestList.add(Language.RO_RO);
+        enumTestList.add(Language.UK_UA);
+        enumTestList.add(Language.ID_ID);
+        enumTestList.add(Language.VI_VN);
+        enumTestList.add(Language.MS_MY);
+        enumTestList.add(Language.HI_IN);
+        enumTestList.add(Language.NL_BE);
+        enumTestList.add(Language.EL_GR);
+        enumTestList.add(Language.HU_HU);
+        enumTestList.add(Language.FI_FI);
+        enumTestList.add(Language.SK_SK);
+        enumTestList.add(Language.ES_MX);
+        enumTestList.add(Language.FR_CA);
+        enumTestList.add(Language.DE_DE);
+        enumTestList.add(Language.ES_ES);
+        enumTestList.add(Language.EN_GB);
+        enumTestList.add(Language.RU_RU);
+        enumTestList.add(Language.TR_TR);
+        enumTestList.add(Language.PL_PL);
+        enumTestList.add(Language.FR_FR);
+        enumTestList.add(Language.IT_IT);
+        enumTestList.add(Language.SV_SE);
+        enumTestList.add(Language.PT_PT);
+        enumTestList.add(Language.NL_NL);
+        enumTestList.add(Language.EN_AU);
+        enumTestList.add(Language.ZH_CN);
+        enumTestList.add(Language.ZH_TW);
+        enumTestList.add(Language.JA_JP);
+        enumTestList.add(Language.AR_SA);
+        enumTestList.add(Language.KO_KR);
+        enumTestList.add(Language.PT_BR);
+        enumTestList.add(Language.CS_CZ);
+        enumTestList.add(Language.DA_DK);
+        enumTestList.add(Language.NO_NO);
+        enumTestList.add(Language.EN_IN);
+        enumTestList.add(Language.TH_TH);
 
-		List<Language> enumTestList = new ArrayList<Language>();
-		
-		enumTestList.add(Language.EN_US);
-		enumTestList.add(Language.EN_SA);
-		enumTestList.add(Language.HE_IL);
-		enumTestList.add(Language.RO_RO);
-		enumTestList.add(Language.UK_UA);
-		enumTestList.add(Language.ID_ID);
-		enumTestList.add(Language.VI_VN);
-		enumTestList.add(Language.MS_MY);
-		enumTestList.add(Language.HI_IN);
-		enumTestList.add(Language.NL_BE);
-		enumTestList.add(Language.EL_GR);
-		enumTestList.add(Language.HU_HU);
-		enumTestList.add(Language.FI_FI);
-		enumTestList.add(Language.SK_SK);
-		enumTestList.add(Language.ES_MX);
-		enumTestList.add(Language.FR_CA);
-		enumTestList.add(Language.DE_DE);
-		enumTestList.add(Language.ES_ES);
-		enumTestList.add(Language.EN_GB);
-		enumTestList.add(Language.RU_RU);
-		enumTestList.add(Language.TR_TR);
-		enumTestList.add(Language.PL_PL);
-		enumTestList.add(Language.FR_FR);
-		enumTestList.add(Language.IT_IT);
-		enumTestList.add(Language.SV_SE);
-		enumTestList.add(Language.PT_PT);
-		enumTestList.add(Language.NL_NL);
-		enumTestList.add(Language.EN_AU);
-		enumTestList.add(Language.ZH_CN);
-		enumTestList.add(Language.ZH_TW);
-		enumTestList.add(Language.JA_JP);
-		enumTestList.add(Language.AR_SA);
-		enumTestList.add(Language.KO_KR);
-		enumTestList.add(Language.PT_BR);
-		enumTestList.add(Language.CS_CZ);
-		enumTestList.add(Language.DA_DK);
-		enumTestList.add(Language.NO_NO);
-		enumTestList.add(Language.EN_IN);
-		enumTestList.add(Language.TH_TH);
-		
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
index 8787ae602..2a04539ad 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
@@ -9,76 +9,74 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "ICON_WITH_SEARCH";
-		LayoutMode enumIconWithSearch = LayoutMode.valueForString(example);
-		example = "LIST_ONLY";
-		LayoutMode enumListOnly = LayoutMode.valueForString(example);
-		example = "LIST_WITH_SEARCH";
-		LayoutMode enumListWithSearch = LayoutMode.valueForString(example);
-		example = "KEYBOARD";
-		LayoutMode enumKeyboard = LayoutMode.valueForString(example);
-		
-		assertNotNull("ICON_ONLY returned null", enumIconOnly);
-		assertNotNull("ICON_WITH_SEARCH returned null", enumIconWithSearch);
-		assertNotNull("LIST_ONLY returned null", enumListOnly);
-		assertNotNull("LIST_WITH_SEARCH returned null", enumListWithSearch);
-		assertNotNull("KEYBOARD returned null", enumKeyboard);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "ICON_ONLY";
+        LayoutMode enumIconOnly = LayoutMode.valueForString(example);
+        example = "ICON_WITH_SEARCH";
+        LayoutMode enumIconWithSearch = LayoutMode.valueForString(example);
+        example = "LIST_ONLY";
+        LayoutMode enumListOnly = LayoutMode.valueForString(example);
+        example = "LIST_WITH_SEARCH";
+        LayoutMode enumListWithSearch = LayoutMode.valueForString(example);
+        example = "KEYBOARD";
+        LayoutMode enumKeyboard = LayoutMode.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "icOn_OnlY";
-		try {
-		    LayoutMode temp = LayoutMode.valueForString(example);
+        assertNotNull("ICON_ONLY returned null", enumIconOnly);
+        assertNotNull("ICON_WITH_SEARCH returned null", enumIconWithSearch);
+        assertNotNull("LIST_ONLY returned null", enumListOnly);
+        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 {
+            LayoutMode temp = LayoutMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    LayoutMode temp = LayoutMode.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            LayoutMode temp = LayoutMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
+        }
+    }
+
 
-	/**
-	 * Verifies the possible enum values of LayoutMode.
-	 */
-	public void testListEnum() {
- 		List<LayoutMode> enumValueList = Arrays.asList(LayoutMode.values());
+    /**
+     * Verifies the possible enum values of LayoutMode.
+     */
+    public void testListEnum() {
+        List<LayoutMode> enumValueList = Arrays.asList(LayoutMode.values());
 
-		List<LayoutMode> enumTestList = new ArrayList<LayoutMode>();
-		enumTestList.add(LayoutMode.ICON_ONLY);
-		enumTestList.add(LayoutMode.ICON_WITH_SEARCH);
-		enumTestList.add(LayoutMode.LIST_ONLY);
-		enumTestList.add(LayoutMode.LIST_WITH_SEARCH);
-		enumTestList.add(LayoutMode.KEYBOARD);
+        List<LayoutMode> enumTestList = new ArrayList<LayoutMode>();
+        enumTestList.add(LayoutMode.ICON_ONLY);
+        enumTestList.add(LayoutMode.ICON_WITH_SEARCH);
+        enumTestList.add(LayoutMode.LIST_ONLY);
+        enumTestList.add(LayoutMode.LIST_WITH_SEARCH);
+        enumTestList.add(LayoutMode.KEYBOARD);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java
index 009a63193..c50931bb9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightNameTests.java
@@ -15,247 +15,247 @@ import java.util.List;
  */
 public class LightNameTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "FRONT_LEFT_HIGH_BEAM";
-		LightName enumFrontLeftHighBeam = LightName.valueForString(example);
-		example = "FRONT_RIGHT_HIGH_BEAM";
-		LightName enumFrontRightHighBeam = LightName.valueForString(example);
-		example = "FRONT_LEFT_LOW_BEAM";
-		LightName enumFrontLeftLowBeam = LightName.valueForString(example);
-		example = "FRONT_RIGHT_LOW_BEAM";
-		LightName enumFrontRightLowBeam = LightName.valueForString(example);
-		example = "FRONT_LEFT_PARKING_LIGHT";
-		LightName enumFrontLeftParkingLight = LightName.valueForString(example);
-		example = "FRONT_RIGHT_PARKING_LIGHT";
-		LightName enumFrontRightParkingLight = LightName.valueForString(example);
-		example = "FRONT_LEFT_FOG_LIGHT";
-		LightName enumFrontLeftFogLight = LightName.valueForString(example);
-		example = "FRONT_RIGHT_FOG_LIGHT";
-		LightName enumFrontRightFogLight = LightName.valueForString(example);
-		example = "FRONT_LEFT_DAYTIME_RUNNING_LIGHT";
-		LightName enumFrontLeftDaytimeRunningLight = LightName.valueForString(example);
-		example = "FRONT_RIGHT_DAYTIME_RUNNING_LIGHT";
-		LightName enumFrontRightDaytimeRunningLight = LightName.valueForString(example);
-		example = "FRONT_LEFT_TURN_LIGHT";
-		LightName enumFrontLeftTurnLight = LightName.valueForString(example);
-		example = "FRONT_RIGHT_TURN_LIGHT";
-		LightName enumFrontRightTurnLight = LightName.valueForString(example);
-		example = "REAR_LEFT_FOG_LIGHT";
-		LightName enumRearLeftFogLight = LightName.valueForString(example);
-		example = "REAR_RIGHT_FOG_LIGHT";
-		LightName enumRearRightFogLight = LightName.valueForString(example);
-		example = "REAR_LEFT_TAIL_LIGHT";
-		LightName enumRearLeftTailLight = LightName.valueForString(example);
-		example = "REAR_RIGHT_TAIL_LIGHT";
-		LightName enumRearRightTailLight = LightName.valueForString(example);
-		example = "REAR_LEFT_BRAKE_LIGHT";
-		LightName enumRearLeftBrakeLight = LightName.valueForString(example);
-		example = "REAR_RIGHT_BRAKE_LIGHT";
-		LightName enumRearRightBrakeLight = LightName.valueForString(example);
-		example = "REAR_LEFT_TURN_LIGHT";
-		LightName enumRearLeftTurnLight = LightName.valueForString(example);
-		example = "REAR_RIGHT_TURN_LIGHT";
-		LightName enumRearRightTurnLight = LightName.valueForString(example);
-		example = "REAR_REGISTRATION_PLATE_LIGHT";
-		LightName enumRearRegistrationPlateLight = LightName.valueForString(example);
-		example = "HIGH_BEAMS";
-		LightName enumHighBeams = LightName.valueForString(example);
-		example = "LOW_BEAMS";
-		LightName enumLowBeams = LightName.valueForString(example);
-		example = "FOG_LIGHTS";
-		LightName enumFogLights = LightName.valueForString(example);
-		example = "RUNNING_LIGHTS";
-		LightName enumRunningLights = LightName.valueForString(example);
-		example = "PARKING_LIGHTS";
-		LightName enumParkingLights = LightName.valueForString(example);
-		example = "BRAKE_LIGHTS";
-		LightName enumBrakeLights = LightName.valueForString(example);
-		example = "REAR_REVERSING_LIGHTS";
-		LightName enumRearReversingLights = LightName.valueForString(example);
-		example = "SIDE_MARKER_LIGHTS";
-		LightName enumSideMarkerLights = LightName.valueForString(example);
-		example = "LEFT_TURN_LIGHTS";
-		LightName enumLeftTurnLights = LightName.valueForString(example);
-		example = "RIGHT_TURN_LIGHTS";
-		LightName enumRightTurnLights = LightName.valueForString(example);
-		example = "HAZARD_LIGHTS";
-		LightName enumHazardLights = LightName.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "FRONT_LEFT_HIGH_BEAM";
+        LightName enumFrontLeftHighBeam = LightName.valueForString(example);
+        example = "FRONT_RIGHT_HIGH_BEAM";
+        LightName enumFrontRightHighBeam = LightName.valueForString(example);
+        example = "FRONT_LEFT_LOW_BEAM";
+        LightName enumFrontLeftLowBeam = LightName.valueForString(example);
+        example = "FRONT_RIGHT_LOW_BEAM";
+        LightName enumFrontRightLowBeam = LightName.valueForString(example);
+        example = "FRONT_LEFT_PARKING_LIGHT";
+        LightName enumFrontLeftParkingLight = LightName.valueForString(example);
+        example = "FRONT_RIGHT_PARKING_LIGHT";
+        LightName enumFrontRightParkingLight = LightName.valueForString(example);
+        example = "FRONT_LEFT_FOG_LIGHT";
+        LightName enumFrontLeftFogLight = LightName.valueForString(example);
+        example = "FRONT_RIGHT_FOG_LIGHT";
+        LightName enumFrontRightFogLight = LightName.valueForString(example);
+        example = "FRONT_LEFT_DAYTIME_RUNNING_LIGHT";
+        LightName enumFrontLeftDaytimeRunningLight = LightName.valueForString(example);
+        example = "FRONT_RIGHT_DAYTIME_RUNNING_LIGHT";
+        LightName enumFrontRightDaytimeRunningLight = LightName.valueForString(example);
+        example = "FRONT_LEFT_TURN_LIGHT";
+        LightName enumFrontLeftTurnLight = LightName.valueForString(example);
+        example = "FRONT_RIGHT_TURN_LIGHT";
+        LightName enumFrontRightTurnLight = LightName.valueForString(example);
+        example = "REAR_LEFT_FOG_LIGHT";
+        LightName enumRearLeftFogLight = LightName.valueForString(example);
+        example = "REAR_RIGHT_FOG_LIGHT";
+        LightName enumRearRightFogLight = LightName.valueForString(example);
+        example = "REAR_LEFT_TAIL_LIGHT";
+        LightName enumRearLeftTailLight = LightName.valueForString(example);
+        example = "REAR_RIGHT_TAIL_LIGHT";
+        LightName enumRearRightTailLight = LightName.valueForString(example);
+        example = "REAR_LEFT_BRAKE_LIGHT";
+        LightName enumRearLeftBrakeLight = LightName.valueForString(example);
+        example = "REAR_RIGHT_BRAKE_LIGHT";
+        LightName enumRearRightBrakeLight = LightName.valueForString(example);
+        example = "REAR_LEFT_TURN_LIGHT";
+        LightName enumRearLeftTurnLight = LightName.valueForString(example);
+        example = "REAR_RIGHT_TURN_LIGHT";
+        LightName enumRearRightTurnLight = LightName.valueForString(example);
+        example = "REAR_REGISTRATION_PLATE_LIGHT";
+        LightName enumRearRegistrationPlateLight = LightName.valueForString(example);
+        example = "HIGH_BEAMS";
+        LightName enumHighBeams = LightName.valueForString(example);
+        example = "LOW_BEAMS";
+        LightName enumLowBeams = LightName.valueForString(example);
+        example = "FOG_LIGHTS";
+        LightName enumFogLights = LightName.valueForString(example);
+        example = "RUNNING_LIGHTS";
+        LightName enumRunningLights = LightName.valueForString(example);
+        example = "PARKING_LIGHTS";
+        LightName enumParkingLights = LightName.valueForString(example);
+        example = "BRAKE_LIGHTS";
+        LightName enumBrakeLights = LightName.valueForString(example);
+        example = "REAR_REVERSING_LIGHTS";
+        LightName enumRearReversingLights = LightName.valueForString(example);
+        example = "SIDE_MARKER_LIGHTS";
+        LightName enumSideMarkerLights = LightName.valueForString(example);
+        example = "LEFT_TURN_LIGHTS";
+        LightName enumLeftTurnLights = LightName.valueForString(example);
+        example = "RIGHT_TURN_LIGHTS";
+        LightName enumRightTurnLights = LightName.valueForString(example);
+        example = "HAZARD_LIGHTS";
+        LightName enumHazardLights = LightName.valueForString(example);
 
-		example = "REAR_CARGO_LIGHTS";
-		LightName enumRearCargoLights = LightName.valueForString(example);
-		example = "REAR_TRUCK_BED_LIGHTS";
-		LightName enumRearTruckBedLights = LightName.valueForString(example);
-		example = "REAR_TRAILER_LIGHTS";
-		LightName enumRearTrailerLights = LightName.valueForString(example);
-		example = "LEFT_SPOT_LIGHTS";
-		LightName enumLeftSpotLights = LightName.valueForString(example);
-		example = "RIGHT_SPOT_LIGHTS";
-		LightName enumRightSpotLights = LightName.valueForString(example);
-		example = "LEFT_PUDDLE_LIGHTS";
-		LightName enumLeftPuddleLights = LightName.valueForString(example);
-		example = "RIGHT_PUDDLE_LIGHTS";
-		LightName enumRightPuddleLights = LightName.valueForString(example);
-		example = "AMBIENT_LIGHTS";
-		LightName enumAmbientLights = LightName.valueForString(example);
-		example = "OVERHEAD_LIGHTS";
-		LightName enumOverheadLights = LightName.valueForString(example);
-		example = "READING_LIGHTS";
-		LightName enumReadingLights = LightName.valueForString(example);
-		example = "TRUNK_LIGHTS";
-		LightName enumTrunkLights = LightName.valueForString(example);
-		example = "EXTERIOR_FRONT_LIGHTS";
-		LightName enumExteriorFrontLights = LightName.valueForString(example);
-		example = "EXTERIOR_REAR_LIGHTS";
-		LightName enumExteriorRearLights = LightName.valueForString(example);
-		example = "EXTERIOR_LEFT_LIGHTS";
-		LightName enumExteriorLeftLights = LightName.valueForString(example);
-		example = "EXTERIOR_RIGHT_LIGHTS";
-		LightName enumExteriorRightLights = LightName.valueForString(example);
-		example = "EXTERIOR_ALL_LIGHTS";
-		LightName enumExteriorAllLights = LightName.valueForString(example);
+        example = "REAR_CARGO_LIGHTS";
+        LightName enumRearCargoLights = LightName.valueForString(example);
+        example = "REAR_TRUCK_BED_LIGHTS";
+        LightName enumRearTruckBedLights = LightName.valueForString(example);
+        example = "REAR_TRAILER_LIGHTS";
+        LightName enumRearTrailerLights = LightName.valueForString(example);
+        example = "LEFT_SPOT_LIGHTS";
+        LightName enumLeftSpotLights = LightName.valueForString(example);
+        example = "RIGHT_SPOT_LIGHTS";
+        LightName enumRightSpotLights = LightName.valueForString(example);
+        example = "LEFT_PUDDLE_LIGHTS";
+        LightName enumLeftPuddleLights = LightName.valueForString(example);
+        example = "RIGHT_PUDDLE_LIGHTS";
+        LightName enumRightPuddleLights = LightName.valueForString(example);
+        example = "AMBIENT_LIGHTS";
+        LightName enumAmbientLights = LightName.valueForString(example);
+        example = "OVERHEAD_LIGHTS";
+        LightName enumOverheadLights = LightName.valueForString(example);
+        example = "READING_LIGHTS";
+        LightName enumReadingLights = LightName.valueForString(example);
+        example = "TRUNK_LIGHTS";
+        LightName enumTrunkLights = LightName.valueForString(example);
+        example = "EXTERIOR_FRONT_LIGHTS";
+        LightName enumExteriorFrontLights = LightName.valueForString(example);
+        example = "EXTERIOR_REAR_LIGHTS";
+        LightName enumExteriorRearLights = LightName.valueForString(example);
+        example = "EXTERIOR_LEFT_LIGHTS";
+        LightName enumExteriorLeftLights = LightName.valueForString(example);
+        example = "EXTERIOR_RIGHT_LIGHTS";
+        LightName enumExteriorRightLights = LightName.valueForString(example);
+        example = "EXTERIOR_ALL_LIGHTS";
+        LightName enumExteriorAllLights = LightName.valueForString(example);
 
-		assertNotNull("FRONT_LEFT_HIGH_BEAM returned null", enumFrontLeftHighBeam);
-		assertNotNull("FRONT_RIGHT_HIGH_BEAM returned null", enumFrontRightHighBeam);
-		assertNotNull("FRONT_LEFT_LOW_BEAM returned null", enumFrontLeftLowBeam);
-		assertNotNull("FRONT_RIGHT_LOW_BEAM returned null", enumFrontRightLowBeam);
-		assertNotNull("FRONT_LEFT_PARKING_LIGHT returned null", enumFrontLeftParkingLight);
-		assertNotNull("FRONT_RIGHT_PARKING_LIGHT returned null", enumFrontRightParkingLight);
-		assertNotNull("FRONT_LEFT_FOG_LIGHT returned null", enumFrontLeftFogLight);
-		assertNotNull("FRONT_RIGHT_FOG_LIGHT returned null", enumFrontRightFogLight);
-		assertNotNull("FRONT_LEFT_DAYTIME_RUNNING_LIGHT returned null", enumFrontLeftDaytimeRunningLight);
-		assertNotNull("FRONT_RIGHT_DAYTIME_RUNNING_LIGHT returned null", enumFrontRightDaytimeRunningLight);
+        assertNotNull("FRONT_LEFT_HIGH_BEAM returned null", enumFrontLeftHighBeam);
+        assertNotNull("FRONT_RIGHT_HIGH_BEAM returned null", enumFrontRightHighBeam);
+        assertNotNull("FRONT_LEFT_LOW_BEAM returned null", enumFrontLeftLowBeam);
+        assertNotNull("FRONT_RIGHT_LOW_BEAM returned null", enumFrontRightLowBeam);
+        assertNotNull("FRONT_LEFT_PARKING_LIGHT returned null", enumFrontLeftParkingLight);
+        assertNotNull("FRONT_RIGHT_PARKING_LIGHT returned null", enumFrontRightParkingLight);
+        assertNotNull("FRONT_LEFT_FOG_LIGHT returned null", enumFrontLeftFogLight);
+        assertNotNull("FRONT_RIGHT_FOG_LIGHT returned null", enumFrontRightFogLight);
+        assertNotNull("FRONT_LEFT_DAYTIME_RUNNING_LIGHT returned null", enumFrontLeftDaytimeRunningLight);
+        assertNotNull("FRONT_RIGHT_DAYTIME_RUNNING_LIGHT returned null", enumFrontRightDaytimeRunningLight);
 
-		assertNotNull("FRONT_LEFT_TURN_LIGHT returned null", enumFrontLeftTurnLight);
-		assertNotNull("FRONT_RIGHT_TURN_LIGHT returned null", enumFrontRightTurnLight);
-		assertNotNull("REAR_LEFT_FOG_LIGHT returned null", enumRearLeftFogLight);
-		assertNotNull("REAR_RIGHT_FOG_LIGHT returned null", enumRearRightFogLight);
-		assertNotNull("REAR_LEFT_TAIL_LIGHT returned null", enumRearLeftTailLight);
-		assertNotNull("REAR_RIGHT_TAIL_LIGHT returned null", enumRearRightTailLight);
-		assertNotNull("REAR_LEFT_BRAKE_LIGHT returned null", enumRearLeftBrakeLight);
-		assertNotNull("REAR_RIGHT_BRAKE_LIGHT returned null", enumRearRightBrakeLight);
-		assertNotNull("REAR_LEFT_TURN_LIGHT returned null", enumRearLeftTurnLight);
-		assertNotNull("REAR_RIGHT_TURN_LIGHT returned null", enumRearRightTurnLight);
-		assertNotNull("REAR_REGISTRATION_PLATE_LIGHT returned null", enumRearRegistrationPlateLight);
+        assertNotNull("FRONT_LEFT_TURN_LIGHT returned null", enumFrontLeftTurnLight);
+        assertNotNull("FRONT_RIGHT_TURN_LIGHT returned null", enumFrontRightTurnLight);
+        assertNotNull("REAR_LEFT_FOG_LIGHT returned null", enumRearLeftFogLight);
+        assertNotNull("REAR_RIGHT_FOG_LIGHT returned null", enumRearRightFogLight);
+        assertNotNull("REAR_LEFT_TAIL_LIGHT returned null", enumRearLeftTailLight);
+        assertNotNull("REAR_RIGHT_TAIL_LIGHT returned null", enumRearRightTailLight);
+        assertNotNull("REAR_LEFT_BRAKE_LIGHT returned null", enumRearLeftBrakeLight);
+        assertNotNull("REAR_RIGHT_BRAKE_LIGHT returned null", enumRearRightBrakeLight);
+        assertNotNull("REAR_LEFT_TURN_LIGHT returned null", enumRearLeftTurnLight);
+        assertNotNull("REAR_RIGHT_TURN_LIGHT returned null", enumRearRightTurnLight);
+        assertNotNull("REAR_REGISTRATION_PLATE_LIGHT returned null", enumRearRegistrationPlateLight);
 
-		assertNotNull("HIGH_BEAMS returned null", enumHighBeams);
-		assertNotNull("LOW_BEAMS returned null", enumLowBeams);
-		assertNotNull("FOG_LIGHTS returned null", enumFogLights);
-		assertNotNull("RUNNING_LIGHTS returned null", enumRunningLights);
-		assertNotNull("PARKING_LIGHTS returned null", enumParkingLights);
-		assertNotNull("BRAKE_LIGHTS returned null", enumBrakeLights);
+        assertNotNull("HIGH_BEAMS returned null", enumHighBeams);
+        assertNotNull("LOW_BEAMS returned null", enumLowBeams);
+        assertNotNull("FOG_LIGHTS returned null", enumFogLights);
+        assertNotNull("RUNNING_LIGHTS returned null", enumRunningLights);
+        assertNotNull("PARKING_LIGHTS returned null", enumParkingLights);
+        assertNotNull("BRAKE_LIGHTS returned null", enumBrakeLights);
 
-		assertNotNull("REAR_REVERSING_LIGHTS returned null", enumRearReversingLights);
-		assertNotNull("SIDE_MARKER_LIGHTS returned null", enumSideMarkerLights);
-		assertNotNull("LEFT_TURN_LIGHTS returned null", enumLeftTurnLights);
-		assertNotNull("RIGHT_TURN_LIGHTS returned null", enumRightTurnLights);
-		assertNotNull("HAZARD_LIGHTS returned null", enumHazardLights);
-		assertNotNull("REAR_CARGO_LIGHTS returned null", enumRearCargoLights);
-		assertNotNull("REAR_TRUCK_BED_LIGHTS returned null", enumRearTruckBedLights);
-		assertNotNull("REAR_TRAILER_LIGHTS returned null", enumRearTrailerLights);
-		assertNotNull("LEFT_SPOT_LIGHTS returned null", enumLeftSpotLights);
-		assertNotNull("RIGHT_SPOT_LIGHTS returned null", enumRightSpotLights);
-		assertNotNull("LEFT_PUDDLE_LIGHTS returned null", enumLeftPuddleLights);
-		assertNotNull("RIGHT_PUDDLE_LIGHTS returned null", enumRightPuddleLights);
+        assertNotNull("REAR_REVERSING_LIGHTS returned null", enumRearReversingLights);
+        assertNotNull("SIDE_MARKER_LIGHTS returned null", enumSideMarkerLights);
+        assertNotNull("LEFT_TURN_LIGHTS returned null", enumLeftTurnLights);
+        assertNotNull("RIGHT_TURN_LIGHTS returned null", enumRightTurnLights);
+        assertNotNull("HAZARD_LIGHTS returned null", enumHazardLights);
+        assertNotNull("REAR_CARGO_LIGHTS returned null", enumRearCargoLights);
+        assertNotNull("REAR_TRUCK_BED_LIGHTS returned null", enumRearTruckBedLights);
+        assertNotNull("REAR_TRAILER_LIGHTS returned null", enumRearTrailerLights);
+        assertNotNull("LEFT_SPOT_LIGHTS returned null", enumLeftSpotLights);
+        assertNotNull("RIGHT_SPOT_LIGHTS returned null", enumRightSpotLights);
+        assertNotNull("LEFT_PUDDLE_LIGHTS returned null", enumLeftPuddleLights);
+        assertNotNull("RIGHT_PUDDLE_LIGHTS returned null", enumRightPuddleLights);
 
-		assertNotNull("AMBIENT_LIGHTS returned null", enumAmbientLights);
-		assertNotNull("OVERHEAD_LIGHTS returned null", enumOverheadLights);
-		assertNotNull("READING_LIGHTS returned null", enumReadingLights);
-		assertNotNull("TRUNK_LIGHTS returned null", enumTrunkLights);
+        assertNotNull("AMBIENT_LIGHTS returned null", enumAmbientLights);
+        assertNotNull("OVERHEAD_LIGHTS returned null", enumOverheadLights);
+        assertNotNull("READING_LIGHTS returned null", enumReadingLights);
+        assertNotNull("TRUNK_LIGHTS returned null", enumTrunkLights);
 
-		assertNotNull("EXTERIOR_FRONT_LIGHTS returned null", enumExteriorFrontLights);
-		assertNotNull("EXTERIOR_REAR_LIGHTS returned null", enumExteriorRearLights);
-		assertNotNull("EXTERIOR_LEFT_LIGHTS returned null", enumExteriorLeftLights);
-		assertNotNull("EXTERIOR_RIGHT_LIGHTS returned null", enumExteriorRightLights);
+        assertNotNull("EXTERIOR_FRONT_LIGHTS returned null", enumExteriorFrontLights);
+        assertNotNull("EXTERIOR_REAR_LIGHTS returned null", enumExteriorRearLights);
+        assertNotNull("EXTERIOR_LEFT_LIGHTS returned null", enumExteriorLeftLights);
+        assertNotNull("EXTERIOR_RIGHT_LIGHTS returned null", enumExteriorRightLights);
 
-		assertNotNull("EXTERIOR_ALL_LIGHTS returned null", enumExteriorAllLights);
-	}
+        assertNotNull("EXTERIOR_ALL_LIGHTS returned null", enumExteriorAllLights);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "fRONT_LEFT_HIGH_BEAM";
-		try {
-			LightName temp = LightName.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "fRONT_LEFT_HIGH_BEAM";
+        try {
+            LightName temp = LightName.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			LightName temp = LightName.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            LightName temp = LightName.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of LightName.
-	 */
-	public void testListEnum() {
-		List<LightName> enumValueList = Arrays.asList(LightName.values());
+    /**
+     * Verifies the possible enum values of LightName.
+     */
+    public void testListEnum() {
+        List<LightName> enumValueList = Arrays.asList(LightName.values());
 
-		List<LightName> enumTestList = new ArrayList<LightName>();
-		enumTestList.add(LightName.FRONT_LEFT_HIGH_BEAM);
-		enumTestList.add(LightName.FRONT_RIGHT_HIGH_BEAM);
-		enumTestList.add(LightName.FRONT_LEFT_LOW_BEAM);
-		enumTestList.add(LightName.FRONT_RIGHT_LOW_BEAM);
-		enumTestList.add(LightName.FRONT_LEFT_PARKING_LIGHT);
-		enumTestList.add(LightName.FRONT_RIGHT_PARKING_LIGHT);
-		enumTestList.add(LightName.FRONT_LEFT_FOG_LIGHT);
-		enumTestList.add(LightName.FRONT_RIGHT_FOG_LIGHT);
-		enumTestList.add(LightName.FRONT_LEFT_DAYTIME_RUNNING_LIGHT);
-		enumTestList.add(LightName.FRONT_RIGHT_DAYTIME_RUNNING_LIGHT);
-		enumTestList.add(LightName.FRONT_LEFT_TURN_LIGHT);
-		enumTestList.add(LightName.FRONT_RIGHT_TURN_LIGHT);
-		enumTestList.add(LightName.REAR_LEFT_FOG_LIGHT);
-		enumTestList.add(LightName.REAR_RIGHT_FOG_LIGHT);
-		enumTestList.add(LightName.REAR_LEFT_TAIL_LIGHT);
-		enumTestList.add(LightName.REAR_RIGHT_TAIL_LIGHT);
-		enumTestList.add(LightName.REAR_LEFT_BRAKE_LIGHT);
-		enumTestList.add(LightName.REAR_RIGHT_BRAKE_LIGHT);
-		enumTestList.add(LightName.REAR_LEFT_TURN_LIGHT);
-		enumTestList.add(LightName.REAR_RIGHT_TURN_LIGHT);
-		enumTestList.add(LightName.REAR_REGISTRATION_PLATE_LIGHT);
-		enumTestList.add(LightName.HIGH_BEAMS);
-		enumTestList.add(LightName.LOW_BEAMS);
-		enumTestList.add(LightName.FOG_LIGHTS);
-		enumTestList.add(LightName.RUNNING_LIGHTS);
-		enumTestList.add(LightName.PARKING_LIGHTS);
-		enumTestList.add(LightName.BRAKE_LIGHTS);
-		enumTestList.add(LightName.REAR_REVERSING_LIGHTS);
-		enumTestList.add(LightName.SIDE_MARKER_LIGHTS);
-		enumTestList.add(LightName.LEFT_TURN_LIGHTS);
-		enumTestList.add(LightName.RIGHT_TURN_LIGHTS);
-		enumTestList.add(LightName.HAZARD_LIGHTS);
-		enumTestList.add(LightName.REAR_CARGO_LIGHTS);
-		enumTestList.add(LightName.REAR_TRUCK_BED_LIGHTS);
-		enumTestList.add(LightName.REAR_TRAILER_LIGHTS);
-		enumTestList.add(LightName.LEFT_SPOT_LIGHTS);
-		enumTestList.add(LightName.RIGHT_SPOT_LIGHTS);
-		enumTestList.add(LightName.LEFT_PUDDLE_LIGHTS);
-		enumTestList.add(LightName.RIGHT_PUDDLE_LIGHTS);
-		enumTestList.add(LightName.AMBIENT_LIGHTS);
-		enumTestList.add(LightName.OVERHEAD_LIGHTS);
-		enumTestList.add(LightName.READING_LIGHTS);
-		enumTestList.add(LightName.TRUNK_LIGHTS);
-		enumTestList.add(LightName.EXTERIOR_FRONT_LIGHTS);
-		enumTestList.add(LightName.EXTERIOR_REAR_LIGHTS);
-		enumTestList.add(LightName.EXTERIOR_LEFT_LIGHTS);
-		enumTestList.add(LightName.EXTERIOR_RIGHT_LIGHTS);
-		enumTestList.add(LightName.EXTERIOR_ALL_LIGHTS);
+        List<LightName> enumTestList = new ArrayList<LightName>();
+        enumTestList.add(LightName.FRONT_LEFT_HIGH_BEAM);
+        enumTestList.add(LightName.FRONT_RIGHT_HIGH_BEAM);
+        enumTestList.add(LightName.FRONT_LEFT_LOW_BEAM);
+        enumTestList.add(LightName.FRONT_RIGHT_LOW_BEAM);
+        enumTestList.add(LightName.FRONT_LEFT_PARKING_LIGHT);
+        enumTestList.add(LightName.FRONT_RIGHT_PARKING_LIGHT);
+        enumTestList.add(LightName.FRONT_LEFT_FOG_LIGHT);
+        enumTestList.add(LightName.FRONT_RIGHT_FOG_LIGHT);
+        enumTestList.add(LightName.FRONT_LEFT_DAYTIME_RUNNING_LIGHT);
+        enumTestList.add(LightName.FRONT_RIGHT_DAYTIME_RUNNING_LIGHT);
+        enumTestList.add(LightName.FRONT_LEFT_TURN_LIGHT);
+        enumTestList.add(LightName.FRONT_RIGHT_TURN_LIGHT);
+        enumTestList.add(LightName.REAR_LEFT_FOG_LIGHT);
+        enumTestList.add(LightName.REAR_RIGHT_FOG_LIGHT);
+        enumTestList.add(LightName.REAR_LEFT_TAIL_LIGHT);
+        enumTestList.add(LightName.REAR_RIGHT_TAIL_LIGHT);
+        enumTestList.add(LightName.REAR_LEFT_BRAKE_LIGHT);
+        enumTestList.add(LightName.REAR_RIGHT_BRAKE_LIGHT);
+        enumTestList.add(LightName.REAR_LEFT_TURN_LIGHT);
+        enumTestList.add(LightName.REAR_RIGHT_TURN_LIGHT);
+        enumTestList.add(LightName.REAR_REGISTRATION_PLATE_LIGHT);
+        enumTestList.add(LightName.HIGH_BEAMS);
+        enumTestList.add(LightName.LOW_BEAMS);
+        enumTestList.add(LightName.FOG_LIGHTS);
+        enumTestList.add(LightName.RUNNING_LIGHTS);
+        enumTestList.add(LightName.PARKING_LIGHTS);
+        enumTestList.add(LightName.BRAKE_LIGHTS);
+        enumTestList.add(LightName.REAR_REVERSING_LIGHTS);
+        enumTestList.add(LightName.SIDE_MARKER_LIGHTS);
+        enumTestList.add(LightName.LEFT_TURN_LIGHTS);
+        enumTestList.add(LightName.RIGHT_TURN_LIGHTS);
+        enumTestList.add(LightName.HAZARD_LIGHTS);
+        enumTestList.add(LightName.REAR_CARGO_LIGHTS);
+        enumTestList.add(LightName.REAR_TRUCK_BED_LIGHTS);
+        enumTestList.add(LightName.REAR_TRAILER_LIGHTS);
+        enumTestList.add(LightName.LEFT_SPOT_LIGHTS);
+        enumTestList.add(LightName.RIGHT_SPOT_LIGHTS);
+        enumTestList.add(LightName.LEFT_PUDDLE_LIGHTS);
+        enumTestList.add(LightName.RIGHT_PUDDLE_LIGHTS);
+        enumTestList.add(LightName.AMBIENT_LIGHTS);
+        enumTestList.add(LightName.OVERHEAD_LIGHTS);
+        enumTestList.add(LightName.READING_LIGHTS);
+        enumTestList.add(LightName.TRUNK_LIGHTS);
+        enumTestList.add(LightName.EXTERIOR_FRONT_LIGHTS);
+        enumTestList.add(LightName.EXTERIOR_REAR_LIGHTS);
+        enumTestList.add(LightName.EXTERIOR_LEFT_LIGHTS);
+        enumTestList.add(LightName.EXTERIOR_RIGHT_LIGHTS);
+        enumTestList.add(LightName.EXTERIOR_ALL_LIGHTS);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java
index 607160e26..c95f26d78 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LightStatusTests.java
@@ -15,72 +15,72 @@ import java.util.List;
  */
 public class LightStatusTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "ON";
-		LightStatus enumOn = LightStatus.valueForString(example);
-		example = "OFF";
-		LightStatus enumOff = LightStatus.valueForString(example);
-		example = "RAMP_UP";
-		LightStatus enumRampUp = LightStatus.valueForString(example);
-		example = "RAMP_DOWN";
-		LightStatus enumRampDown = LightStatus.valueForString(example);
-		example = "UNKNOWN";
-		LightStatus enumUnknown = LightStatus.valueForString(example);
-		example = "INVALID";
-		LightStatus enumInvalid = LightStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "ON";
+        LightStatus enumOn = LightStatus.valueForString(example);
+        example = "OFF";
+        LightStatus enumOff = LightStatus.valueForString(example);
+        example = "RAMP_UP";
+        LightStatus enumRampUp = LightStatus.valueForString(example);
+        example = "RAMP_DOWN";
+        LightStatus enumRampDown = LightStatus.valueForString(example);
+        example = "UNKNOWN";
+        LightStatus enumUnknown = LightStatus.valueForString(example);
+        example = "INVALID";
+        LightStatus enumInvalid = LightStatus.valueForString(example);
 
-		assertNotNull("ON returned null", enumOn);
-		assertNotNull("OFF returned null", enumOff);
-		assertNotNull("RAMP_UP returned null", enumRampUp);
-		assertNotNull("RAMP_DOWN returned null", enumRampDown);
-		assertNotNull("UNKNOWN returned null", enumUnknown);
-		assertNotNull("INVALID returned null", enumInvalid);
-	}
+        assertNotNull("ON returned null", enumOn);
+        assertNotNull("OFF returned null", enumOff);
+        assertNotNull("RAMP_UP returned null", enumRampUp);
+        assertNotNull("RAMP_DOWN returned null", enumRampDown);
+        assertNotNull("UNKNOWN returned null", enumUnknown);
+        assertNotNull("INVALID returned null", enumInvalid);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "oN";
-		try {
-			LightStatus temp = LightStatus.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "oN";
+        try {
+            LightStatus temp = LightStatus.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			LightStatus temp = LightStatus.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            LightStatus temp = LightStatus.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of LightStatus.
-	 */
-	public void testListEnum() {
-		List<LightStatus> enumValueList = Arrays.asList(LightStatus.values());
+    /**
+     * Verifies the possible enum values of LightStatus.
+     */
+    public void testListEnum() {
+        List<LightStatus> enumValueList = Arrays.asList(LightStatus.values());
 
-		List<LightStatus> enumTestList = new ArrayList<LightStatus>();
-		enumTestList.add(LightStatus.ON);
-		enumTestList.add(LightStatus.OFF);
-		enumTestList.add(LightStatus.RAMP_UP);
-		enumTestList.add(LightStatus.RAMP_DOWN);
-		enumTestList.add(LightStatus.UNKNOWN);
-		enumTestList.add(LightStatus.INVALID);
+        List<LightStatus> enumTestList = new ArrayList<LightStatus>();
+        enumTestList.add(LightStatus.ON);
+        enumTestList.add(LightStatus.OFF);
+        enumTestList.add(LightStatus.RAMP_UP);
+        enumTestList.add(LightStatus.RAMP_DOWN);
+        enumTestList.add(LightStatus.UNKNOWN);
+        enumTestList.add(LightStatus.INVALID);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
index 2c9ced9b8..00e5f823d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "OPTIONAL";
-		LockScreenStatus enumOptional = LockScreenStatus.valueForString(example);
-		example = "OFF";
-		LockScreenStatus enumOff = LockScreenStatus.valueForString(example);
-		
-		assertNotNull("REQUIRED returned null", enumRequired);
-		assertNotNull("OPTIONAL returned null", enumOptional);
-		assertNotNull("OFF returned null", enumOff);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "REQUIRED";
+        LockScreenStatus enumRequired = LockScreenStatus.valueForString(example);
+        example = "OPTIONAL";
+        LockScreenStatus enumOptional = LockScreenStatus.valueForString(example);
+        example = "OFF";
+        LockScreenStatus enumOff = LockScreenStatus.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "ReqUireD";
-		try {
-		    LockScreenStatus temp = LockScreenStatus.valueForString(example);
+        assertNotNull("REQUIRED returned null", enumRequired);
+        assertNotNull("OPTIONAL returned null", enumOptional);
+        assertNotNull("OFF returned null", enumOff);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "ReqUireD";
+        try {
+            LockScreenStatus temp = LockScreenStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    LockScreenStatus temp = LockScreenStatus.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            LockScreenStatus temp = LockScreenStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of LockScreenStatus.
-	 */
-	public void testListEnum() {
- 		List<LockScreenStatus> enumValueList = Arrays.asList(LockScreenStatus.values());
+    /**
+     * Verifies the possible enum values of LockScreenStatus.
+     */
+    public void testListEnum() {
+        List<LockScreenStatus> enumValueList = Arrays.asList(LockScreenStatus.values());
 
-		List<LockScreenStatus> enumTestList = new ArrayList<LockScreenStatus>();
-		enumTestList.add(LockScreenStatus.REQUIRED);
-		enumTestList.add(LockScreenStatus.OPTIONAL);
-		enumTestList.add(LockScreenStatus.OFF);
+        List<LockScreenStatus> enumTestList = new ArrayList<LockScreenStatus>();
+        enumTestList.add(LockScreenStatus.REQUIRED);
+        enumTestList.add(LockScreenStatus.OPTIONAL);
+        enumTestList.add(LockScreenStatus.OFF);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java
index 9254cd2b2..510d0c5d3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MaintenanceModeStatusTests.java
@@ -46,66 +46,64 @@ import java.util.List;
  */
 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);
-		example = "NEAR";
-		MaintenanceModeStatus enumNear = MaintenanceModeStatus.valueForString(example);
-		example = "ACTIVE";
-		MaintenanceModeStatus enumActive = MaintenanceModeStatus.valueForString(example);
-		example = "FEATURE_NOT_PRESENT";
-		MaintenanceModeStatus enumFeatureNotPResent = MaintenanceModeStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NORMAL";
+        MaintenanceModeStatus enumNormal = MaintenanceModeStatus.valueForString(example);
+        example = "NEAR";
+        MaintenanceModeStatus enumNear = MaintenanceModeStatus.valueForString(example);
+        example = "ACTIVE";
+        MaintenanceModeStatus enumActive = MaintenanceModeStatus.valueForString(example);
+        example = "FEATURE_NOT_PRESENT";
+        MaintenanceModeStatus enumFeatureNotPResent = MaintenanceModeStatus.valueForString(example);
 
-		assertNotNull("NORMAL returned null", enumNormal);
-		assertNotNull("NEAR returned null", enumNear);
-		assertNotNull("ACTIVE returned null", enumActive);
-		assertNotNull("FEATURE_NOT_PRESENT returned null", enumFeatureNotPResent);
-	}
+        assertNotNull("NORMAL returned null", enumNormal);
+        assertNotNull("NEAR returned null", enumNear);
+        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 {
-			MaintenanceModeStatus temp = MaintenanceModeStatus.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "normAL";
+        try {
+            MaintenanceModeStatus temp = MaintenanceModeStatus.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			MaintenanceModeStatus temp = MaintenanceModeStatus.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            MaintenanceModeStatus temp = MaintenanceModeStatus.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of MaintenanceModeStatus.
-	 */
-	public void testListEnum() {
-		List<MaintenanceModeStatus> enumValueList = Arrays.asList(MaintenanceModeStatus.values());
+    /**
+     * Verifies the possible enum values of MaintenanceModeStatus.
+     */
+    public void testListEnum() {
+        List<MaintenanceModeStatus> enumValueList = Arrays.asList(MaintenanceModeStatus.values());
 
-		List<MaintenanceModeStatus> enumTestList = new ArrayList<>();
-		enumTestList.add(MaintenanceModeStatus.NORMAL);
-		enumTestList.add(MaintenanceModeStatus.NEAR);
-		enumTestList.add(MaintenanceModeStatus.ACTIVE);
-		enumTestList.add(MaintenanceModeStatus.FEATURE_NOT_PRESENT);
+        List<MaintenanceModeStatus> enumTestList = new ArrayList<>();
+        enumTestList.add(MaintenanceModeStatus.NORMAL);
+        enumTestList.add(MaintenanceModeStatus.NEAR);
+        enumTestList.add(MaintenanceModeStatus.ACTIVE);
+        enumTestList.add(MaintenanceModeStatus.FEATURE_NOT_PRESENT);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java
index 8ce99f47a..31c479548 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageCushionTests.java
@@ -14,68 +14,68 @@ import java.util.List;
  */
 public class MassageCushionTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "TOP_LUMBAR";
-		MassageCushion enumTopLumbar = MassageCushion.valueForString(example);
-		example = "MIDDLE_LUMBAR";
-		MassageCushion enumMiddleLumbar = MassageCushion.valueForString(example);
-		example = "BOTTOM_LUMBAR";
-		MassageCushion enumBottomLumbar = MassageCushion.valueForString(example);
-		example = "BACK_BOLSTERS";
-		MassageCushion enumBackBolsters = MassageCushion.valueForString(example);
-		example = "SEAT_BOLSTERS";
-		MassageCushion enumSeatBolsters = MassageCushion.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "TOP_LUMBAR";
+        MassageCushion enumTopLumbar = MassageCushion.valueForString(example);
+        example = "MIDDLE_LUMBAR";
+        MassageCushion enumMiddleLumbar = MassageCushion.valueForString(example);
+        example = "BOTTOM_LUMBAR";
+        MassageCushion enumBottomLumbar = MassageCushion.valueForString(example);
+        example = "BACK_BOLSTERS";
+        MassageCushion enumBackBolsters = MassageCushion.valueForString(example);
+        example = "SEAT_BOLSTERS";
+        MassageCushion enumSeatBolsters = MassageCushion.valueForString(example);
 
-		assertNotNull("TOP_LUMBAR returned null", enumTopLumbar);
-		assertNotNull("MIDDLE_LUMBAR returned null", enumMiddleLumbar);
-		assertNotNull("BOTTOM_LUMBAR returned null", enumBottomLumbar);
-		assertNotNull("BACK_BOLSTERS returned null", enumBackBolsters);
-		assertNotNull("SEAT_BOLSTERS returned null", enumSeatBolsters);
-	}
+        assertNotNull("TOP_LUMBAR returned null", enumTopLumbar);
+        assertNotNull("MIDDLE_LUMBAR returned null", enumMiddleLumbar);
+        assertNotNull("BOTTOM_LUMBAR returned null", enumBottomLumbar);
+        assertNotNull("BACK_BOLSTERS returned null", enumBackBolsters);
+        assertNotNull("SEAT_BOLSTERS returned null", enumSeatBolsters);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "tOP_LUMBAR";
-		try {
-			MassageCushion temp = MassageCushion.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "tOP_LUMBAR";
+        try {
+            MassageCushion temp = MassageCushion.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			MassageCushion temp = MassageCushion.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            MassageCushion temp = MassageCushion.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of MassageCushion.
-	 */
-	public void testListEnum() {
-		List<MassageCushion> enumValueList = Arrays.asList(MassageCushion.values());
+    /**
+     * Verifies the possible enum values of MassageCushion.
+     */
+    public void testListEnum() {
+        List<MassageCushion> enumValueList = Arrays.asList(MassageCushion.values());
 
-		List<MassageCushion> enumTestList = new ArrayList<MassageCushion>();
-		enumTestList.add(MassageCushion.TOP_LUMBAR);
-		enumTestList.add(MassageCushion.MIDDLE_LUMBAR);
-		enumTestList.add(MassageCushion.BOTTOM_LUMBAR);
-		enumTestList.add(MassageCushion.BACK_BOLSTERS);
-		enumTestList.add(MassageCushion.SEAT_BOLSTERS);
+        List<MassageCushion> enumTestList = new ArrayList<MassageCushion>();
+        enumTestList.add(MassageCushion.TOP_LUMBAR);
+        enumTestList.add(MassageCushion.MIDDLE_LUMBAR);
+        enumTestList.add(MassageCushion.BOTTOM_LUMBAR);
+        enumTestList.add(MassageCushion.BACK_BOLSTERS);
+        enumTestList.add(MassageCushion.SEAT_BOLSTERS);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java
index 67b47cf7c..4d455dbbf 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageModeTests.java
@@ -14,60 +14,60 @@ import java.util.List;
  */
 public class MassageModeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "OFF";
-		MassageMode enumOff = MassageMode.valueForString(example);
-		example = "LOW";
-		MassageMode enumLow = MassageMode.valueForString(example);
-		example = "HIGH";
-		MassageMode enumHigh = MassageMode.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "OFF";
+        MassageMode enumOff = MassageMode.valueForString(example);
+        example = "LOW";
+        MassageMode enumLow = MassageMode.valueForString(example);
+        example = "HIGH";
+        MassageMode enumHigh = MassageMode.valueForString(example);
 
-		assertNotNull("OFF returned null", enumOff);
-		assertNotNull("LOW returned null", enumLow);
-		assertNotNull("HIGH returned null", enumHigh);
-	}
+        assertNotNull("OFF returned null", enumOff);
+        assertNotNull("LOW returned null", enumLow);
+        assertNotNull("HIGH returned null", enumHigh);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "oFF";
-		try {
-			MassageMode temp = MassageMode.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "oFF";
+        try {
+            MassageMode temp = MassageMode.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			MassageMode temp = MassageMode.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            MassageMode temp = MassageMode.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of MassageMode.
-	 */
-	public void testListEnum() {
-		List<MassageMode> enumValueList = Arrays.asList(MassageMode.values());
+    /**
+     * Verifies the possible enum values of MassageMode.
+     */
+    public void testListEnum() {
+        List<MassageMode> enumValueList = Arrays.asList(MassageMode.values());
 
-		List<MassageMode> enumTestList = new ArrayList<MassageMode>();
-		enumTestList.add(MassageMode.OFF);
-		enumTestList.add(MassageMode.LOW);
-		enumTestList.add(MassageMode.HIGH);
+        List<MassageMode> enumTestList = new ArrayList<MassageMode>();
+        enumTestList.add(MassageMode.OFF);
+        enumTestList.add(MassageMode.LOW);
+        enumTestList.add(MassageMode.HIGH);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java
index 34adada5e..7e41aec27 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MassageZoneTests.java
@@ -14,56 +14,56 @@ import java.util.List;
  */
 public class MassageZoneTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "LUMBAR";
-		MassageZone enumLumbar = MassageZone.valueForString(example);
-		example = "SEAT_CUSHION";
-		MassageZone enumSeatCushion = MassageZone.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "LUMBAR";
+        MassageZone enumLumbar = MassageZone.valueForString(example);
+        example = "SEAT_CUSHION";
+        MassageZone enumSeatCushion = MassageZone.valueForString(example);
 
-		assertNotNull("LUMBAR returned null", enumLumbar);
-		assertNotNull("SEAT_CUSHION returned null", enumSeatCushion);
-	}
+        assertNotNull("LUMBAR returned null", enumLumbar);
+        assertNotNull("SEAT_CUSHION returned null", enumSeatCushion);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "lUMBAR";
-		try {
-			MassageZone temp = MassageZone.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "lUMBAR";
+        try {
+            MassageZone temp = MassageZone.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			MassageZone temp = MassageZone.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            MassageZone temp = MassageZone.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of MassageZone.
-	 */
-	public void testListEnum() {
-		List<MassageZone> enumValueList = Arrays.asList(MassageZone.values());
+    /**
+     * Verifies the possible enum values of MassageZone.
+     */
+    public void testListEnum() {
+        List<MassageZone> enumValueList = Arrays.asList(MassageZone.values());
 
-		List<MassageZone> enumTestList = new ArrayList<MassageZone>();
-		enumTestList.add(MassageZone.LUMBAR);
-		enumTestList.add(MassageZone.SEAT_CUSHION);
+        List<MassageZone> enumTestList = new ArrayList<MassageZone>();
+        enumTestList.add(MassageZone.LUMBAR);
+        enumTestList.add(MassageZone.SEAT_CUSHION);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
index 8c50f8d22..18bb00fb5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
@@ -9,83 +9,81 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "CLOCK2";
-		MediaClockFormat enumClock2 = MediaClockFormat.valueForString(example);
-		example = "CLOCK3";
-		MediaClockFormat enumClock3 = MediaClockFormat.valueForString(example);
-		example = "CLOCKTEXT1";
-		MediaClockFormat enumClockText1 = MediaClockFormat.valueForString(example);
-		example = "CLOCKTEXT2";
-		MediaClockFormat enumClockText2 = MediaClockFormat.valueForString(example);
-		example = "CLOCKTEXT3";
-		MediaClockFormat enumClockText3 = MediaClockFormat.valueForString(example);
-		example = "CLOCKTEXT4";
-		MediaClockFormat enumClockText4 = MediaClockFormat.valueForString(example);
-		
-		assertNotNull("CLOCK1 returned null", enumClock1);
-		assertNotNull("CLOCK2 returned null", enumClock2);
-		assertNotNull("CLOCK3 returned null", enumClock3);
-		assertNotNull("CLOCKTEXT1 returned null", enumClockText1);
-		assertNotNull("CLOCKTEXT2 returned null", enumClockText2);
-		assertNotNull("CLOCKTEXT3 returned null", enumClockText3);
-		assertNotNull("CLOCKTEXT4 returned null", enumClockText4);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "CLOCK1";
+        MediaClockFormat enumClock1 = MediaClockFormat.valueForString(example);
+        example = "CLOCK2";
+        MediaClockFormat enumClock2 = MediaClockFormat.valueForString(example);
+        example = "CLOCK3";
+        MediaClockFormat enumClock3 = MediaClockFormat.valueForString(example);
+        example = "CLOCKTEXT1";
+        MediaClockFormat enumClockText1 = MediaClockFormat.valueForString(example);
+        example = "CLOCKTEXT2";
+        MediaClockFormat enumClockText2 = MediaClockFormat.valueForString(example);
+        example = "CLOCKTEXT3";
+        MediaClockFormat enumClockText3 = MediaClockFormat.valueForString(example);
+        example = "CLOCKTEXT4";
+        MediaClockFormat enumClockText4 = MediaClockFormat.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "cloCK1";
-		try {
-		    MediaClockFormat temp = MediaClockFormat.valueForString(example);
+        assertNotNull("CLOCK1 returned null", enumClock1);
+        assertNotNull("CLOCK2 returned null", enumClock2);
+        assertNotNull("CLOCK3 returned null", enumClock3);
+        assertNotNull("CLOCKTEXT1 returned null", enumClockText1);
+        assertNotNull("CLOCKTEXT2 returned null", enumClockText2);
+        assertNotNull("CLOCKTEXT3 returned null", enumClockText3);
+        assertNotNull("CLOCKTEXT4 returned null", enumClockText4);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "cloCK1";
+        try {
+            MediaClockFormat temp = MediaClockFormat.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    MediaClockFormat temp = MediaClockFormat.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            MediaClockFormat temp = MediaClockFormat.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } 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());
+    /**
+     * Verifies the possible enum values of MediaClockFormat.
+     */
+    public void testListEnum() {
+        List<MediaClockFormat> enumValueList = Arrays.asList(MediaClockFormat.values());
 
-		List<MediaClockFormat> enumTestList = new ArrayList<MediaClockFormat>();
-		enumTestList.add(MediaClockFormat.CLOCK1);
-		enumTestList.add(MediaClockFormat.CLOCK2);
-		enumTestList.add(MediaClockFormat.CLOCK3);
-		enumTestList.add(MediaClockFormat.CLOCKTEXT1);
-		enumTestList.add(MediaClockFormat.CLOCKTEXT2);
-		enumTestList.add(MediaClockFormat.CLOCKTEXT3);		
-		enumTestList.add(MediaClockFormat.CLOCKTEXT4);
+        List<MediaClockFormat> enumTestList = new ArrayList<MediaClockFormat>();
+        enumTestList.add(MediaClockFormat.CLOCK1);
+        enumTestList.add(MediaClockFormat.CLOCK2);
+        enumTestList.add(MediaClockFormat.CLOCK3);
+        enumTestList.add(MediaClockFormat.CLOCKTEXT1);
+        enumTestList.add(MediaClockFormat.CLOCKTEXT2);
+        enumTestList.add(MediaClockFormat.CLOCKTEXT3);
+        enumTestList.add(MediaClockFormat.CLOCKTEXT4);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java
index 835045418..42d791b97 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaTypeTests.java
@@ -14,64 +14,64 @@ import java.util.List;
  */
 public class MediaTypeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "MUSIC";
-		MediaType enumMusic = MediaType.valueForString(example);
-		example = "PODCAST";
-		MediaType enumPodcast = MediaType.valueForString(example);
-		example = "AUDIOBOOK";
-		MediaType enumAudioBook = MediaType.valueForString(example);
-		example = "OTHER";
-		MediaType enumOther = MediaType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "MUSIC";
+        MediaType enumMusic = MediaType.valueForString(example);
+        example = "PODCAST";
+        MediaType enumPodcast = MediaType.valueForString(example);
+        example = "AUDIOBOOK";
+        MediaType enumAudioBook = MediaType.valueForString(example);
+        example = "OTHER";
+        MediaType enumOther = MediaType.valueForString(example);
 
-		assertNotNull("MUSIC returned null", enumMusic);
-		assertNotNull("PODCAST returned null", enumPodcast);
-		assertNotNull("AUDIOBOOK returned null", enumAudioBook);
-		assertNotNull("OTHER returned null", enumOther);
-	}
+        assertNotNull("MUSIC returned null", enumMusic);
+        assertNotNull("PODCAST returned null", enumPodcast);
+        assertNotNull("AUDIOBOOK returned null", enumAudioBook);
+        assertNotNull("OTHER returned null", enumOther);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "PudCAsT";
-		try {
-			MediaType temp = MediaType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "PudCAsT";
+        try {
+            MediaType temp = MediaType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			MediaType temp = MediaType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            MediaType temp = MediaType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of MediaType.
-	 */
-	public void testListEnum() {
-		List<MediaType> enumValueList = Arrays.asList(MediaType.values());
+    /**
+     * Verifies the possible enum values of MediaType.
+     */
+    public void testListEnum() {
+        List<MediaType> enumValueList = Arrays.asList(MediaType.values());
 
-		List<MediaType> enumTestList = new ArrayList<MediaType>();
-		enumTestList.add(MediaType.MUSIC);
-		enumTestList.add(MediaType.PODCAST);
-		enumTestList.add(MediaType.AUDIOBOOK);
-		enumTestList.add(MediaType.OTHER);
+        List<MediaType> enumTestList = new ArrayList<MediaType>();
+        enumTestList.add(MediaType.MUSIC);
+        enumTestList.add(MediaType.PODCAST);
+        enumTestList.add(MediaType.AUDIOBOOK);
+        enumTestList.add(MediaType.OTHER);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MenuLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MenuLayoutTests.java
index f92de1f94..a448be361 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MenuLayoutTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MenuLayoutTests.java
@@ -45,56 +45,56 @@ import java.util.List;
 
 public class MenuLayoutTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "LIST";
-		MenuLayout enumList = MenuLayout.valueForString(example);
-		example = "TILES";
-		MenuLayout enumTiles = MenuLayout.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "LIST";
+        MenuLayout enumList = MenuLayout.valueForString(example);
+        example = "TILES";
+        MenuLayout enumTiles = MenuLayout.valueForString(example);
 
-		assertNotNull("LIST returned null", enumList);
-		assertNotNull("TILES returned null", enumTiles);
-	}
+        assertNotNull("LIST returned null", enumList);
+        assertNotNull("TILES returned null", enumTiles);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "TooLs";
-		try {
-			MenuLayout temp = MenuLayout.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "TooLs";
+        try {
+            MenuLayout temp = MenuLayout.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			MenuLayout temp = MenuLayout.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            MenuLayout temp = MenuLayout.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of MenuLayout.
-	 */
-	public void testListEnum() {
-		List<MenuLayout> enumValueList = Arrays.asList(MenuLayout.values());
+    /**
+     * Verifies the possible enum values of MenuLayout.
+     */
+    public void testListEnum() {
+        List<MenuLayout> enumValueList = Arrays.asList(MenuLayout.values());
 
-		List<MenuLayout> enumTestList = new ArrayList<>();
-		enumTestList.add(MenuLayout.LIST);
-		enumTestList.add(MenuLayout.TILES);
+        List<MenuLayout> enumTestList = new ArrayList<>();
+        enumTestList.add(MenuLayout.LIST);
+        enumTestList.add(MenuLayout.TILES);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java
index c381dfff3..4647550c5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MetadataTypeTests.java
@@ -16,97 +16,97 @@ import java.util.List;
 
 public class MetadataTypeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "mediaTitle";
-		MetadataType enumMediaTitle = MetadataType.valueForString(example);
-		example = "mediaArtist";
-		MetadataType enumMediaArtist = MetadataType.valueForString(example);
-		example = "mediaAlbum";
-		MetadataType enumMediaAlbum = MetadataType.valueForString(example);
-		example = "mediaYear";
-		MetadataType enumMediaYear = MetadataType.valueForString(example);
-		example = "mediaGenre";
-		MetadataType enumMediaGenre = MetadataType.valueForString(example);
-		example = "mediaStation";
-		MetadataType enumMediaStation = MetadataType.valueForString(example);
-		example = "rating";
-		MetadataType enumRating = MetadataType.valueForString(example);
-		example = "currentTemperature";
-		MetadataType enumCurrentTemperature = MetadataType.valueForString(example);
-		example = "maximumTemperature";
-		MetadataType enumMaximumTemperature = MetadataType.valueForString(example);
-		example = "minimumTemperature";
-		MetadataType enumMinimumTemperature = MetadataType.valueForString(example);
-		example = "weatherTerm";
-		MetadataType enumWeatherTerm = MetadataType.valueForString(example);
-		example = "humidity";
-		MetadataType enumHumidity = MetadataType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "mediaTitle";
+        MetadataType enumMediaTitle = MetadataType.valueForString(example);
+        example = "mediaArtist";
+        MetadataType enumMediaArtist = MetadataType.valueForString(example);
+        example = "mediaAlbum";
+        MetadataType enumMediaAlbum = MetadataType.valueForString(example);
+        example = "mediaYear";
+        MetadataType enumMediaYear = MetadataType.valueForString(example);
+        example = "mediaGenre";
+        MetadataType enumMediaGenre = MetadataType.valueForString(example);
+        example = "mediaStation";
+        MetadataType enumMediaStation = MetadataType.valueForString(example);
+        example = "rating";
+        MetadataType enumRating = MetadataType.valueForString(example);
+        example = "currentTemperature";
+        MetadataType enumCurrentTemperature = MetadataType.valueForString(example);
+        example = "maximumTemperature";
+        MetadataType enumMaximumTemperature = MetadataType.valueForString(example);
+        example = "minimumTemperature";
+        MetadataType enumMinimumTemperature = MetadataType.valueForString(example);
+        example = "weatherTerm";
+        MetadataType enumWeatherTerm = MetadataType.valueForString(example);
+        example = "humidity";
+        MetadataType enumHumidity = MetadataType.valueForString(example);
 
 
-		assertNotNull("mediaTitle returned null", enumMediaTitle);
-		assertNotNull("mediaArtist returned null", enumMediaArtist);
-		assertNotNull("mediaAlbum returned null", enumMediaAlbum);
-		assertNotNull("mediaYear returned null", enumMediaYear);
-		assertNotNull("mediaGenre returned null", enumMediaGenre);
-		assertNotNull("mediaStation returned null", enumMediaStation);
-		assertNotNull("rating returned null", enumRating);
-		assertNotNull("currentTemperature returned null", enumCurrentTemperature);
-		assertNotNull("maximumTemperature returned null", enumMaximumTemperature);
-		assertNotNull("minimumTemperature returned null", enumMinimumTemperature);
-		assertNotNull("weatherTerm returned null", enumWeatherTerm);
-		assertNotNull("humidity returned null", enumHumidity);
-	}
+        assertNotNull("mediaTitle returned null", enumMediaTitle);
+        assertNotNull("mediaArtist returned null", enumMediaArtist);
+        assertNotNull("mediaAlbum returned null", enumMediaAlbum);
+        assertNotNull("mediaYear returned null", enumMediaYear);
+        assertNotNull("mediaGenre returned null", enumMediaGenre);
+        assertNotNull("mediaStation returned null", enumMediaStation);
+        assertNotNull("rating returned null", enumRating);
+        assertNotNull("currentTemperature returned null", enumCurrentTemperature);
+        assertNotNull("maximumTemperature returned null", enumMaximumTemperature);
+        assertNotNull("minimumTemperature returned null", enumMinimumTemperature);
+        assertNotNull("weatherTerm returned null", enumWeatherTerm);
+        assertNotNull("humidity returned null", enumHumidity);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "MEDIA_TITLEZ";
-		try {
-			MetadataType temp = MetadataType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "MEDIA_TITLEZ";
+        try {
+            MetadataType temp = MetadataType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			MetadataType temp = MetadataType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            MetadataType temp = MetadataType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of MetadataType.
-	 */
-	public void testListEnum() {
-		List<MetadataType> enumValueList = Arrays.asList(MetadataType.values());
+    /**
+     * Verifies the possible enum values of MetadataType.
+     */
+    public void testListEnum() {
+        List<MetadataType> enumValueList = Arrays.asList(MetadataType.values());
 
-		List<MetadataType> enumTestList = new ArrayList<MetadataType>();
-		enumTestList.add(MetadataType.MEDIA_TITLE);
-		enumTestList.add(MetadataType.MEDIA_ARTIST);
-		enumTestList.add(MetadataType.MEDIA_ALBUM);
-		enumTestList.add(MetadataType.MEDIA_YEAR);
-		enumTestList.add(MetadataType.MEDIA_GENRE);
-		enumTestList.add(MetadataType.MEDIA_STATION);
-		enumTestList.add(MetadataType.RATING);
-		enumTestList.add(MetadataType.CURRENT_TEMPERATURE);
-		enumTestList.add(MetadataType.MAXIMUM_TEMPERATURE);
-		enumTestList.add(MetadataType.MINIMUM_TEMPERATURE);
-		enumTestList.add(MetadataType.WEATHER_TERM);
-		enumTestList.add(MetadataType.HUMIDITY);
+        List<MetadataType> enumTestList = new ArrayList<MetadataType>();
+        enumTestList.add(MetadataType.MEDIA_TITLE);
+        enumTestList.add(MetadataType.MEDIA_ARTIST);
+        enumTestList.add(MetadataType.MEDIA_ALBUM);
+        enumTestList.add(MetadataType.MEDIA_YEAR);
+        enumTestList.add(MetadataType.MEDIA_GENRE);
+        enumTestList.add(MetadataType.MEDIA_STATION);
+        enumTestList.add(MetadataType.RATING);
+        enumTestList.add(MetadataType.CURRENT_TEMPERATURE);
+        enumTestList.add(MetadataType.MAXIMUM_TEMPERATURE);
+        enumTestList.add(MetadataType.MINIMUM_TEMPERATURE);
+        enumTestList.add(MetadataType.WEATHER_TERM);
+        enumTestList.add(MetadataType.HUMIDITY);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java
index 719502cbf..8ee0706b7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ModuleTypeTests.java
@@ -14,72 +14,72 @@ import java.util.List;
  */
 public class ModuleTypeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "CLIMATE";
-		ModuleType enumClimate = ModuleType.valueForString(example);
-		example = "RADIO";
-		ModuleType enumRadio = ModuleType.valueForString(example);
-		example = "SEAT";
-		ModuleType enumSeat = ModuleType.valueForString(example);
-		example = "AUDIO";
-		ModuleType enumAudio = ModuleType.valueForString(example);
-		example = "LIGHT";
-		ModuleType enumLight = ModuleType.valueForString(example);
-		example = "HMI_SETTINGS";
-		ModuleType enumHmiSettings = ModuleType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "CLIMATE";
+        ModuleType enumClimate = ModuleType.valueForString(example);
+        example = "RADIO";
+        ModuleType enumRadio = ModuleType.valueForString(example);
+        example = "SEAT";
+        ModuleType enumSeat = ModuleType.valueForString(example);
+        example = "AUDIO";
+        ModuleType enumAudio = ModuleType.valueForString(example);
+        example = "LIGHT";
+        ModuleType enumLight = ModuleType.valueForString(example);
+        example = "HMI_SETTINGS";
+        ModuleType enumHmiSettings = ModuleType.valueForString(example);
 
-		assertNotNull("CLIMATE returned null", enumClimate);
-		assertNotNull("RADIO returned null", enumRadio);
-		assertNotNull("SEAT returned null", enumSeat);
-		assertNotNull("AUDIO returned null", enumAudio);
-		assertNotNull("LIGHT returned null", enumLight);
-		assertNotNull("HMI_SETTINGS returned null", enumHmiSettings);
-	}
+        assertNotNull("CLIMATE returned null", enumClimate);
+        assertNotNull("RADIO returned null", enumRadio);
+        assertNotNull("SEAT returned null", enumSeat);
+        assertNotNull("AUDIO returned null", enumAudio);
+        assertNotNull("LIGHT returned null", enumLight);
+        assertNotNull("HMI_SETTINGS returned null", enumHmiSettings);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "cLIMATE";
-		try {
-			ModuleType temp = ModuleType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "cLIMATE";
+        try {
+            ModuleType temp = ModuleType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			ModuleType temp = ModuleType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            ModuleType temp = ModuleType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of ModuleType.
-	 */
-	public void testListEnum() {
-		List<ModuleType> enumValueList = Arrays.asList(ModuleType.values());
+    /**
+     * Verifies the possible enum values of ModuleType.
+     */
+    public void testListEnum() {
+        List<ModuleType> enumValueList = Arrays.asList(ModuleType.values());
 
-		List<ModuleType> enumTestList = new ArrayList<ModuleType>();
-		enumTestList.add(ModuleType.CLIMATE);
-		enumTestList.add(ModuleType.RADIO);
-		enumTestList.add(ModuleType.SEAT);
-		enumTestList.add(ModuleType.AUDIO);
-		enumTestList.add(ModuleType.LIGHT);
-		enumTestList.add(ModuleType.HMI_SETTINGS);
+        List<ModuleType> enumTestList = new ArrayList<ModuleType>();
+        enumTestList.add(ModuleType.CLIMATE);
+        enumTestList.add(ModuleType.RADIO);
+        enumTestList.add(ModuleType.SEAT);
+        enumTestList.add(ModuleType.AUDIO);
+        enumTestList.add(ModuleType.LIGHT);
+        enumTestList.add(ModuleType.HMI_SETTINGS);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java
index 5051ef337..2d225dff3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationActionTests.java
@@ -14,79 +14,77 @@ import java.util.List;
  */
 public class NavigationActionTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "TURN";
-		NavigationAction enumTurn = NavigationAction.valueForString(example);
-		example = "EXIT";
-		NavigationAction enumExit = NavigationAction.valueForString(example);
-		example = "STAY";
-		NavigationAction enumStay = NavigationAction.valueForString(example);
-		example = "MERGE";
-		NavigationAction enumMerge = NavigationAction.valueForString(example);
-		example = "FERRY";
-		NavigationAction enumFerry = NavigationAction.valueForString(example);
-		example = "CAR_SHUTTLE_TRAIN";
-		NavigationAction enumCarShuttleTrain = NavigationAction.valueForString(example);
-		example = "WAYPOINT";
-		NavigationAction enumWaypoint = NavigationAction.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "TURN";
+        NavigationAction enumTurn = NavigationAction.valueForString(example);
+        example = "EXIT";
+        NavigationAction enumExit = NavigationAction.valueForString(example);
+        example = "STAY";
+        NavigationAction enumStay = NavigationAction.valueForString(example);
+        example = "MERGE";
+        NavigationAction enumMerge = NavigationAction.valueForString(example);
+        example = "FERRY";
+        NavigationAction enumFerry = NavigationAction.valueForString(example);
+        example = "CAR_SHUTTLE_TRAIN";
+        NavigationAction enumCarShuttleTrain = NavigationAction.valueForString(example);
+        example = "WAYPOINT";
+        NavigationAction enumWaypoint = NavigationAction.valueForString(example);
 
-		assertNotNull("TURN returned null", enumTurn);
-		assertNotNull("EXIT returned null", enumExit);
-		assertNotNull("STAY returned null", enumStay);
-		assertNotNull("MERGE returned null", enumMerge);
-		assertNotNull("FERRY returned null", enumFerry);
-		assertNotNull("CAR_SHUTTLE_TRAIN returned null", enumCarShuttleTrain);
-		assertNotNull("WAYPOINT returned null", enumWaypoint);
+        assertNotNull("TURN returned null", enumTurn);
+        assertNotNull("EXIT returned null", enumExit);
+        assertNotNull("STAY returned null", enumStay);
+        assertNotNull("MERGE returned null", enumMerge);
+        assertNotNull("FERRY returned null", enumFerry);
+        assertNotNull("CAR_SHUTTLE_TRAIN returned null", enumCarShuttleTrain);
+        assertNotNull("WAYPOINT returned null", enumWaypoint);
 
-	}
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "fRONT";
-		try {
-			NavigationAction temp = NavigationAction.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "fRONT";
+        try {
+            NavigationAction temp = NavigationAction.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			NavigationAction temp = NavigationAction.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            NavigationAction temp = NavigationAction.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of NavigationAction.
-	 */
-	public void testListEnum() {
-		List<NavigationAction> enumValueList = Arrays.asList(NavigationAction.values());
+    /**
+     * Verifies the possible enum values of NavigationAction.
+     */
+    public void testListEnum() {
+        List<NavigationAction> enumValueList = Arrays.asList(NavigationAction.values());
 
-		List<NavigationAction> enumTestList = new ArrayList<>();
-		enumTestList.add(NavigationAction.TURN);
-		enumTestList.add(NavigationAction.EXIT);
-		enumTestList.add(NavigationAction.STAY);
-		enumTestList.add(NavigationAction.MERGE);
-		enumTestList.add(NavigationAction.FERRY);
-		enumTestList.add(NavigationAction.CAR_SHUTTLE_TRAIN);
-		enumTestList.add(NavigationAction.WAYPOINT);
+        List<NavigationAction> enumTestList = new ArrayList<>();
+        enumTestList.add(NavigationAction.TURN);
+        enumTestList.add(NavigationAction.EXIT);
+        enumTestList.add(NavigationAction.STAY);
+        enumTestList.add(NavigationAction.MERGE);
+        enumTestList.add(NavigationAction.FERRY);
+        enumTestList.add(NavigationAction.CAR_SHUTTLE_TRAIN);
+        enumTestList.add(NavigationAction.WAYPOINT);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java
index 691480f78..4cab81dda 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/NavigationJunctionTests.java
@@ -14,82 +14,80 @@ import java.util.List;
  */
 public class NavigationJunctionTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "REGULAR";
-		NavigationJunction enumRegular = NavigationJunction.valueForString(example);
-		example = "BIFURCATION";
-		NavigationJunction enumBifurcation = NavigationJunction.valueForString(example);
-		example = "MULTI_CARRIAGEWAY";
-		NavigationJunction enumMultiCarriageway = NavigationJunction.valueForString(example);
-		example = "ROUNDABOUT";
-		NavigationJunction enumRoundabout = NavigationJunction.valueForString(example);
-		example = "TRAVERSABLE_ROUNDABOUT";
-		NavigationJunction enumTraversableRoundabout = NavigationJunction.valueForString(example);
-		example = "JUGHANDLE";
-		NavigationJunction enumJughandle = NavigationJunction.valueForString(example);
-		example = "ALL_WAY_YIELD";
-		NavigationJunction enumAllWayYield = NavigationJunction.valueForString(example);
-		example = "TURN_AROUND";
-		NavigationJunction enumTurnAround = NavigationJunction.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "REGULAR";
+        NavigationJunction enumRegular = NavigationJunction.valueForString(example);
+        example = "BIFURCATION";
+        NavigationJunction enumBifurcation = NavigationJunction.valueForString(example);
+        example = "MULTI_CARRIAGEWAY";
+        NavigationJunction enumMultiCarriageway = NavigationJunction.valueForString(example);
+        example = "ROUNDABOUT";
+        NavigationJunction enumRoundabout = NavigationJunction.valueForString(example);
+        example = "TRAVERSABLE_ROUNDABOUT";
+        NavigationJunction enumTraversableRoundabout = NavigationJunction.valueForString(example);
+        example = "JUGHANDLE";
+        NavigationJunction enumJughandle = NavigationJunction.valueForString(example);
+        example = "ALL_WAY_YIELD";
+        NavigationJunction enumAllWayYield = NavigationJunction.valueForString(example);
+        example = "TURN_AROUND";
+        NavigationJunction enumTurnAround = NavigationJunction.valueForString(example);
 
-		assertNotNull("REGULAR returned null", enumRegular);
-		assertNotNull("BIFURCATION returned null", enumBifurcation);
-		assertNotNull("MULTI_CARRIAGEWAY returned null", enumMultiCarriageway);
-		assertNotNull("ROUNDABOUT returned null", enumRoundabout);
-		assertNotNull("TRAVERSABLE_ROUNDABOUT returned null", enumTraversableRoundabout);
-		assertNotNull("JUGHANDLE returned null", enumJughandle);
-		assertNotNull("ALL_WAY_YIELD returned null", enumAllWayYield);
-		assertNotNull("TURN_AROUND returned null", enumTurnAround);
-	}
+        assertNotNull("REGULAR returned null", enumRegular);
+        assertNotNull("BIFURCATION returned null", enumBifurcation);
+        assertNotNull("MULTI_CARRIAGEWAY returned null", enumMultiCarriageway);
+        assertNotNull("ROUNDABOUT returned null", enumRoundabout);
+        assertNotNull("TRAVERSABLE_ROUNDABOUT returned null", enumTraversableRoundabout);
+        assertNotNull("JUGHANDLE returned null", enumJughandle);
+        assertNotNull("ALL_WAY_YIELD returned null", enumAllWayYield);
+        assertNotNull("TURN_AROUND returned null", enumTurnAround);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "fRONT";
-		try {
-			NavigationJunction temp = NavigationJunction.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "fRONT";
+        try {
+            NavigationJunction temp = NavigationJunction.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			NavigationJunction temp = NavigationJunction.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            NavigationJunction temp = NavigationJunction.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of NavigationJunction.
-	 */
-	public void testListEnum() {
-		List<NavigationJunction> enumValueList = Arrays.asList(NavigationJunction.values());
+    /**
+     * Verifies the possible enum values of NavigationJunction.
+     */
+    public void testListEnum() {
+        List<NavigationJunction> enumValueList = Arrays.asList(NavigationJunction.values());
 
-		List<NavigationJunction> enumTestList = new ArrayList<>();
-		enumTestList.add(NavigationJunction.REGULAR);
-		enumTestList.add(NavigationJunction.BIFURCATION);
-		enumTestList.add(NavigationJunction.MULTI_CARRIAGEWAY);
-		enumTestList.add(NavigationJunction.ROUNDABOUT);
-		enumTestList.add(NavigationJunction.TRAVERSABLE_ROUNDABOUT);
-		enumTestList.add(NavigationJunction.JUGHANDLE);
-		enumTestList.add(NavigationJunction.ALL_WAY_YIELD);
-		enumTestList.add(NavigationJunction.TURN_AROUND);
+        List<NavigationJunction> enumTestList = new ArrayList<>();
+        enumTestList.add(NavigationJunction.REGULAR);
+        enumTestList.add(NavigationJunction.BIFURCATION);
+        enumTestList.add(NavigationJunction.MULTI_CARRIAGEWAY);
+        enumTestList.add(NavigationJunction.ROUNDABOUT);
+        enumTestList.add(NavigationJunction.TRAVERSABLE_ROUNDABOUT);
+        enumTestList.add(NavigationJunction.JUGHANDLE);
+        enumTestList.add(NavigationJunction.ALL_WAY_YIELD);
+        enumTestList.add(NavigationJunction.TURN_AROUND);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java
index 2a11db43f..74d3dc704 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PermissionStatusTests.java
@@ -46,66 +46,64 @@ import java.util.List;
  */
 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);
-		example = "DISALLOWED";
-		PermissionStatus enumDisallowed = PermissionStatus.valueForString(example);
-		example = "USER_DISALLOWED";
-		PermissionStatus enumUserDisallowed = PermissionStatus.valueForString(example);
-		example = "USER_CONSENT_PENDING";
-		PermissionStatus enumUserConsentPending = PermissionStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "ALLOWED";
+        PermissionStatus enumAllowed = PermissionStatus.valueForString(example);
+        example = "DISALLOWED";
+        PermissionStatus enumDisallowed = PermissionStatus.valueForString(example);
+        example = "USER_DISALLOWED";
+        PermissionStatus enumUserDisallowed = PermissionStatus.valueForString(example);
+        example = "USER_CONSENT_PENDING";
+        PermissionStatus enumUserConsentPending = PermissionStatus.valueForString(example);
 
-		assertNotNull("ALLOWED returned null", enumAllowed);
-		assertNotNull("DISALLOWED returned null", enumDisallowed);
-		assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed);
-		assertNotNull("USER_CONSENT_PENDING returned null", enumUserConsentPending);
-	}
+        assertNotNull("ALLOWED returned null", enumAllowed);
+        assertNotNull("DISALLOWED returned null", enumDisallowed);
+        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 = "DISALLOwed";
-		try {
-			PermissionStatus temp = PermissionStatus.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "DISALLOwed";
+        try {
+            PermissionStatus temp = PermissionStatus.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			PermissionStatus temp = PermissionStatus.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            PermissionStatus temp = PermissionStatus.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of PermissionStatus.
-	 */
-	public void testListEnum() {
-		List<PermissionStatus> enumValueList = Arrays.asList(PermissionStatus.values());
+    /**
+     * Verifies the possible enum values of PermissionStatus.
+     */
+    public void testListEnum() {
+        List<PermissionStatus> enumValueList = Arrays.asList(PermissionStatus.values());
 
-		List<PermissionStatus> enumTestList = new ArrayList<>();
-		enumTestList.add(PermissionStatus.ALLOWED);
-		enumTestList.add(PermissionStatus.DISALLOWED);
-		enumTestList.add(PermissionStatus.USER_DISALLOWED);
-		enumTestList.add(PermissionStatus.USER_CONSENT_PENDING);
+        List<PermissionStatus> enumTestList = new ArrayList<>();
+        enumTestList.add(PermissionStatus.ALLOWED);
+        enumTestList.add(PermissionStatus.DISALLOWED);
+        enumTestList.add(PermissionStatus.USER_DISALLOWED);
+        enumTestList.add(PermissionStatus.USER_CONSENT_PENDING);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
index e1b56e1f5..2e7301fc3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
@@ -9,71 +9,69 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "POWER_MODE_EVALUATION_IN_PROGRESS";
-		PowerModeQualificationStatus enumPowerModeEvaluationInProgress = PowerModeQualificationStatus.valueForString(example);
-		example = "NOT_DEFINED";
-		PowerModeQualificationStatus enumNotDefined = PowerModeQualificationStatus.valueForString(example);
-		example = "POWER_MODE_OK";
-		PowerModeQualificationStatus enumPowerModeOk = PowerModeQualificationStatus.valueForString(example);
-		
-		assertNotNull("POWER_MODE_UNDEFINED returned null", enumPowerModeUndefined);
-		assertNotNull("POWER_MODE_EVALUATION_IN_PROGRESS returned null", enumPowerModeEvaluationInProgress);
-		assertNotNull("NOT_DEFINED returned null", enumNotDefined);
-		assertNotNull("POWER_MODE_OK returned null", enumPowerModeOk);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "POWER_MODE_UNDEFINED";
+        PowerModeQualificationStatus enumPowerModeUndefined = PowerModeQualificationStatus.valueForString(example);
+        example = "POWER_MODE_EVALUATION_IN_PROGRESS";
+        PowerModeQualificationStatus enumPowerModeEvaluationInProgress = PowerModeQualificationStatus.valueForString(example);
+        example = "NOT_DEFINED";
+        PowerModeQualificationStatus enumNotDefined = PowerModeQualificationStatus.valueForString(example);
+        example = "POWER_MODE_OK";
+        PowerModeQualificationStatus enumPowerModeOk = PowerModeQualificationStatus.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "poweR_moDE_UndEfiNEd";
-		try {
-		    PowerModeQualificationStatus temp = PowerModeQualificationStatus.valueForString(example);
+        assertNotNull("POWER_MODE_UNDEFINED returned null", enumPowerModeUndefined);
+        assertNotNull("POWER_MODE_EVALUATION_IN_PROGRESS returned null", enumPowerModeEvaluationInProgress);
+        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 {
+            PowerModeQualificationStatus temp = PowerModeQualificationStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    PowerModeQualificationStatus temp = PowerModeQualificationStatus.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            PowerModeQualificationStatus temp = PowerModeQualificationStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of PowerModeQualificationStatus.
-	 */
-	public void testListEnum() {
- 		List<PowerModeQualificationStatus> enumValueList = Arrays.asList(PowerModeQualificationStatus.values());
+    /**
+     * Verifies the possible enum values of PowerModeQualificationStatus.
+     */
+    public void testListEnum() {
+        List<PowerModeQualificationStatus> enumValueList = Arrays.asList(PowerModeQualificationStatus.values());
 
-		List<PowerModeQualificationStatus> enumTestList = new ArrayList<PowerModeQualificationStatus>();
-		enumTestList.add(PowerModeQualificationStatus.POWER_MODE_UNDEFINED);
-		enumTestList.add(PowerModeQualificationStatus.POWER_MODE_EVALUATION_IN_PROGRESS);
-		enumTestList.add(PowerModeQualificationStatus.NOT_DEFINED);
-		enumTestList.add(PowerModeQualificationStatus.POWER_MODE_OK);	
+        List<PowerModeQualificationStatus> enumTestList = new ArrayList<PowerModeQualificationStatus>();
+        enumTestList.add(PowerModeQualificationStatus.POWER_MODE_UNDEFINED);
+        enumTestList.add(PowerModeQualificationStatus.POWER_MODE_EVALUATION_IN_PROGRESS);
+        enumTestList.add(PowerModeQualificationStatus.NOT_DEFINED);
+        enumTestList.add(PowerModeQualificationStatus.POWER_MODE_OK);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
index 1063b2f81..a9f029634 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
@@ -9,91 +9,89 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "KEY_RECENTLY_OUT";
-		PowerModeStatus enumKeyRecentlyOut = PowerModeStatus.valueForString(example);
-		example = "KEY_APPROVED_0";
-		PowerModeStatus enumKeyApproved0 = PowerModeStatus.valueForString(example);
-		example = "POST_ACCESORY_0";
-		PowerModeStatus enumPostAccessory0 = PowerModeStatus.valueForString(example);
-		example = "ACCESORY_1";
-		PowerModeStatus enumAccessory1 = PowerModeStatus.valueForString(example);
-		example = "POST_IGNITION_1";
-		PowerModeStatus enumPostIgnition1 = PowerModeStatus.valueForString(example);
-		example = "IGNITION_ON_2";
-		PowerModeStatus enumIgnitionOn2 = PowerModeStatus.valueForString(example);
-		example = "RUNNING_2";
-		PowerModeStatus enumRunning2 = PowerModeStatus.valueForString(example);
-		example = "CRANK_3";
-		PowerModeStatus enumCrank3 = PowerModeStatus.valueForString(example);
-		
-		assertNotNull("KEY_OUT returned null", enumKeyOut);
-		assertNotNull("KEY_RECENTLY_OUT returned null", enumKeyRecentlyOut);
-		assertNotNull("KEY_APPROVED_0 returned null", enumKeyApproved0);
-		assertNotNull("POST_ACCESORY_0 returned null", enumPostAccessory0);
-		assertNotNull("ACCESORY_1 returned null", enumAccessory1);
-		assertNotNull("POST_IGNITION_1 returned null", enumPostIgnition1);
-		assertNotNull("IGNITION_ON_2 returned null", enumIgnitionOn2);
-		assertNotNull("RUNNING_2 returned null", enumRunning2);
-		assertNotNull("CRANK_3 returned null", enumCrank3);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "KEY_OUT";
+        PowerModeStatus enumKeyOut = PowerModeStatus.valueForString(example);
+        example = "KEY_RECENTLY_OUT";
+        PowerModeStatus enumKeyRecentlyOut = PowerModeStatus.valueForString(example);
+        example = "KEY_APPROVED_0";
+        PowerModeStatus enumKeyApproved0 = PowerModeStatus.valueForString(example);
+        example = "POST_ACCESORY_0";
+        PowerModeStatus enumPostAccessory0 = PowerModeStatus.valueForString(example);
+        example = "ACCESORY_1";
+        PowerModeStatus enumAccessory1 = PowerModeStatus.valueForString(example);
+        example = "POST_IGNITION_1";
+        PowerModeStatus enumPostIgnition1 = PowerModeStatus.valueForString(example);
+        example = "IGNITION_ON_2";
+        PowerModeStatus enumIgnitionOn2 = PowerModeStatus.valueForString(example);
+        example = "RUNNING_2";
+        PowerModeStatus enumRunning2 = PowerModeStatus.valueForString(example);
+        example = "CRANK_3";
+        PowerModeStatus enumCrank3 = PowerModeStatus.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "key_Out";
-		try {
-		    PowerModeStatus temp = PowerModeStatus.valueForString(example);
+        assertNotNull("KEY_OUT returned null", enumKeyOut);
+        assertNotNull("KEY_RECENTLY_OUT returned null", enumKeyRecentlyOut);
+        assertNotNull("KEY_APPROVED_0 returned null", enumKeyApproved0);
+        assertNotNull("POST_ACCESORY_0 returned null", enumPostAccessory0);
+        assertNotNull("ACCESORY_1 returned null", enumAccessory1);
+        assertNotNull("POST_IGNITION_1 returned null", enumPostIgnition1);
+        assertNotNull("IGNITION_ON_2 returned null", enumIgnitionOn2);
+        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 {
+            PowerModeStatus temp = PowerModeStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    PowerModeStatus temp = PowerModeStatus.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            PowerModeStatus temp = PowerModeStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of PowerModeStatus.
-	 */
-	public void testListEnum() {
- 		List<PowerModeStatus> enumValueList = Arrays.asList(PowerModeStatus.values());
+    /**
+     * Verifies the possible enum values of PowerModeStatus.
+     */
+    public void testListEnum() {
+        List<PowerModeStatus> enumValueList = Arrays.asList(PowerModeStatus.values());
 
-		List<PowerModeStatus> enumTestList = new ArrayList<PowerModeStatus>();
-		enumTestList.add(PowerModeStatus.KEY_OUT);
-		enumTestList.add(PowerModeStatus.KEY_RECENTLY_OUT);
-		enumTestList.add(PowerModeStatus.KEY_APPROVED_0);
-		enumTestList.add(PowerModeStatus.POST_ACCESORY_0);
-		enumTestList.add(PowerModeStatus.ACCESORY_1);
-		enumTestList.add(PowerModeStatus.POST_IGNITION_1);		
-		enumTestList.add(PowerModeStatus.IGNITION_ON_2);
-		enumTestList.add(PowerModeStatus.RUNNING_2);	
-		enumTestList.add(PowerModeStatus.CRANK_3);
+        List<PowerModeStatus> enumTestList = new ArrayList<PowerModeStatus>();
+        enumTestList.add(PowerModeStatus.KEY_OUT);
+        enumTestList.add(PowerModeStatus.KEY_RECENTLY_OUT);
+        enumTestList.add(PowerModeStatus.KEY_APPROVED_0);
+        enumTestList.add(PowerModeStatus.POST_ACCESORY_0);
+        enumTestList.add(PowerModeStatus.ACCESORY_1);
+        enumTestList.add(PowerModeStatus.POST_IGNITION_1);
+        enumTestList.add(PowerModeStatus.IGNITION_ON_2);
+        enumTestList.add(PowerModeStatus.RUNNING_2);
+        enumTestList.add(PowerModeStatus.CRANK_3);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java
index 4c5526eec..d1b4c6b52 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PredefinedLayoutTests.java
@@ -14,135 +14,133 @@ import java.util.List;
  */
 public class PredefinedLayoutTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "DEFAULT";
-		PredefinedLayout defaultenum = PredefinedLayout.valueForString(example);
-		example = "MEDIA";
-		PredefinedLayout media = PredefinedLayout.valueForString(example);
-		example = "NON-MEDIA";
-		PredefinedLayout nonmedia = PredefinedLayout.valueForString(example);
-		example = "ONSCREEN_PRESETS";
-		PredefinedLayout onscreen_presets = PredefinedLayout.valueForString(example);
-		example = "NAV_FULLSCREEN_MAP";
-		PredefinedLayout nav_fullscreen_map = PredefinedLayout.valueForString(example);
-		example = "NAV_LIST";
-		PredefinedLayout nav_list = PredefinedLayout.valueForString(example);
-		example = "NAV_KEYBOARD";
-		PredefinedLayout nav_keyboard = PredefinedLayout.valueForString(example);
-		example = "GRAPHIC_WITH_TEXT";
-		PredefinedLayout graphic_with_text = PredefinedLayout.valueForString(example);
-		example = "TEXT_WITH_GRAPHIC";
-		PredefinedLayout text_with_graphic = PredefinedLayout.valueForString(example);
-		example = "TILES_ONLY";
-		PredefinedLayout tiles_only = PredefinedLayout.valueForString(example);
-		example = "TEXTBUTTONS_ONLY";
-		PredefinedLayout textbuttons_only = PredefinedLayout.valueForString(example);
-		example = "GRAPHIC_WITH_TILES";
-		PredefinedLayout graphic_with_tiles = PredefinedLayout.valueForString(example);
-		example = "TILES_WITH_GRAPHIC";
-		PredefinedLayout tiles_with_graphic = PredefinedLayout.valueForString(example);
-		example = "GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS";
-		PredefinedLayout graphic_with_text_and_softbuttons = PredefinedLayout.valueForString(example);
-		example = "TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC";
-		PredefinedLayout text_and_softbuttons_with_graphics = PredefinedLayout.valueForString(example);
-		example = "GRAPHIC_WITH_TEXTBUTTONS";
-		PredefinedLayout graphic_with_textbuttons = PredefinedLayout.valueForString(example);
-		example = "TEXTBUTTONS_WITH_GRAPHIC";
-		PredefinedLayout textbuttons_with_graphic = PredefinedLayout.valueForString(example);
-		example = "LARGE_GRAPHIC_WITH_SOFTBUTTONS";
-		PredefinedLayout large_graphic_with_softbuttons = PredefinedLayout.valueForString(example);
-		example = "DOUBLE_GRAPHIC_WITH_SOFTBUTTONS";
-		PredefinedLayout double_graphic_with_softbuttons = PredefinedLayout.valueForString(example);
-		example = "LARGE_GRAPHIC_ONLY";
-		PredefinedLayout large_graphic_only = PredefinedLayout.valueForString(example);
-		example = "WEB_VIEW";
-		PredefinedLayout web_view = PredefinedLayout.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "DEFAULT";
+        PredefinedLayout defaultenum = PredefinedLayout.valueForString(example);
+        example = "MEDIA";
+        PredefinedLayout media = PredefinedLayout.valueForString(example);
+        example = "NON-MEDIA";
+        PredefinedLayout nonmedia = PredefinedLayout.valueForString(example);
+        example = "ONSCREEN_PRESETS";
+        PredefinedLayout onscreen_presets = PredefinedLayout.valueForString(example);
+        example = "NAV_FULLSCREEN_MAP";
+        PredefinedLayout nav_fullscreen_map = PredefinedLayout.valueForString(example);
+        example = "NAV_LIST";
+        PredefinedLayout nav_list = PredefinedLayout.valueForString(example);
+        example = "NAV_KEYBOARD";
+        PredefinedLayout nav_keyboard = PredefinedLayout.valueForString(example);
+        example = "GRAPHIC_WITH_TEXT";
+        PredefinedLayout graphic_with_text = PredefinedLayout.valueForString(example);
+        example = "TEXT_WITH_GRAPHIC";
+        PredefinedLayout text_with_graphic = PredefinedLayout.valueForString(example);
+        example = "TILES_ONLY";
+        PredefinedLayout tiles_only = PredefinedLayout.valueForString(example);
+        example = "TEXTBUTTONS_ONLY";
+        PredefinedLayout textbuttons_only = PredefinedLayout.valueForString(example);
+        example = "GRAPHIC_WITH_TILES";
+        PredefinedLayout graphic_with_tiles = PredefinedLayout.valueForString(example);
+        example = "TILES_WITH_GRAPHIC";
+        PredefinedLayout tiles_with_graphic = PredefinedLayout.valueForString(example);
+        example = "GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS";
+        PredefinedLayout graphic_with_text_and_softbuttons = PredefinedLayout.valueForString(example);
+        example = "TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC";
+        PredefinedLayout text_and_softbuttons_with_graphics = PredefinedLayout.valueForString(example);
+        example = "GRAPHIC_WITH_TEXTBUTTONS";
+        PredefinedLayout graphic_with_textbuttons = PredefinedLayout.valueForString(example);
+        example = "TEXTBUTTONS_WITH_GRAPHIC";
+        PredefinedLayout textbuttons_with_graphic = PredefinedLayout.valueForString(example);
+        example = "LARGE_GRAPHIC_WITH_SOFTBUTTONS";
+        PredefinedLayout large_graphic_with_softbuttons = PredefinedLayout.valueForString(example);
+        example = "DOUBLE_GRAPHIC_WITH_SOFTBUTTONS";
+        PredefinedLayout double_graphic_with_softbuttons = PredefinedLayout.valueForString(example);
+        example = "LARGE_GRAPHIC_ONLY";
+        PredefinedLayout large_graphic_only = PredefinedLayout.valueForString(example);
+        example = "WEB_VIEW";
+        PredefinedLayout web_view = PredefinedLayout.valueForString(example);
 
-		assertNotNull("DEFAULT returned null", defaultenum);
-		assertNotNull("MEDIA returned null", media);
-		assertNotNull("NON-MEDIA returned null", nonmedia);
-		assertNotNull("ONSCREEN_PRESETS returned null", onscreen_presets);
-		assertNotNull("NAV_FULLSCREEN_MAP returned null", nav_fullscreen_map);
-		assertNotNull("NAV_LIST returned null", nav_list);
-		assertNotNull("NAV_KEYBOARD returned null", nav_keyboard);
-		assertNotNull("GRAPHIC_WITH_TEXT returned null", graphic_with_text);
-		assertNotNull("TEXT_WITH_GRAPHIC returned null", text_with_graphic);
-		assertNotNull("TILES_ONLY returned null", tiles_only);
-		assertNotNull("TEXTBUTTONS_ONLY returned null", textbuttons_only);
-		assertNotNull("GRAPHIC_WITH_TILES returned null", graphic_with_tiles);
-		assertNotNull("TILES_WITH_GRAPHIC returned null", tiles_with_graphic);
-		assertNotNull("GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS returned null", graphic_with_text_and_softbuttons);
-		assertNotNull("TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC returned null", text_and_softbuttons_with_graphics);
-		assertNotNull("GRAPHIC_WITH_TEXTBUTTONS returned null", graphic_with_textbuttons);
-		assertNotNull("TEXTBUTTONS_WITH_GRAPHIC returned null", textbuttons_with_graphic);
-		assertNotNull("LARGE_GRAPHIC_WITH_SOFTBUTTONS returned null", large_graphic_with_softbuttons);
-		assertNotNull("DOUBLE_GRAPHIC_WITH_SOFTBUTTONS returned null", double_graphic_with_softbuttons);
-		assertNotNull("LARGE_GRAPHIC_ONLY returned null", large_graphic_only);
-		assertNotNull("WEB_VIEW returned null", web_view);
-	}
+        assertNotNull("DEFAULT returned null", defaultenum);
+        assertNotNull("MEDIA returned null", media);
+        assertNotNull("NON-MEDIA returned null", nonmedia);
+        assertNotNull("ONSCREEN_PRESETS returned null", onscreen_presets);
+        assertNotNull("NAV_FULLSCREEN_MAP returned null", nav_fullscreen_map);
+        assertNotNull("NAV_LIST returned null", nav_list);
+        assertNotNull("NAV_KEYBOARD returned null", nav_keyboard);
+        assertNotNull("GRAPHIC_WITH_TEXT returned null", graphic_with_text);
+        assertNotNull("TEXT_WITH_GRAPHIC returned null", text_with_graphic);
+        assertNotNull("TILES_ONLY returned null", tiles_only);
+        assertNotNull("TEXTBUTTONS_ONLY returned null", textbuttons_only);
+        assertNotNull("GRAPHIC_WITH_TILES returned null", graphic_with_tiles);
+        assertNotNull("TILES_WITH_GRAPHIC returned null", tiles_with_graphic);
+        assertNotNull("GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS returned null", graphic_with_text_and_softbuttons);
+        assertNotNull("TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC returned null", text_and_softbuttons_with_graphics);
+        assertNotNull("GRAPHIC_WITH_TEXTBUTTONS returned null", graphic_with_textbuttons);
+        assertNotNull("TEXTBUTTONS_WITH_GRAPHIC returned null", textbuttons_with_graphic);
+        assertNotNull("LARGE_GRAPHIC_WITH_SOFTBUTTONS returned null", large_graphic_with_softbuttons);
+        assertNotNull("DOUBLE_GRAPHIC_WITH_SOFTBUTTONS returned null", double_graphic_with_softbuttons);
+        assertNotNull("LARGE_GRAPHIC_ONLY returned null", large_graphic_only);
+        assertNotNull("WEB_VIEW returned null", web_view);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "LARGE_GRApHIC_ONLY";
-		try {
-			PredefinedLayout temp = PredefinedLayout.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "LARGE_GRApHIC_ONLY";
+        try {
+            PredefinedLayout temp = PredefinedLayout.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			PredefinedLayout temp = PredefinedLayout.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            PredefinedLayout temp = PredefinedLayout.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of PredefinedLayout.
-	 */
-	public void testListEnum() {
-		List<PredefinedLayout> enumValueList = Arrays.asList(PredefinedLayout.values());
+    /**
+     * Verifies the possible enum values of PredefinedLayout.
+     */
+    public void testListEnum() {
+        List<PredefinedLayout> enumValueList = Arrays.asList(PredefinedLayout.values());
 
-		List<PredefinedLayout> enumTestList = new ArrayList<>();
+        List<PredefinedLayout> enumTestList = new ArrayList<>();
 
-		enumTestList.add(PredefinedLayout.DEFAULT);
-		enumTestList.add(PredefinedLayout.MEDIA);
-		enumTestList.add(PredefinedLayout.NON_MEDIA);
-		enumTestList.add(PredefinedLayout.ONSCREEN_PRESETS);
-		enumTestList.add(PredefinedLayout.NAV_FULLSCREEN_MAP);
-		enumTestList.add(PredefinedLayout.NAV_LIST);
-		enumTestList.add(PredefinedLayout.NAV_KEYBOARD);
-		enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXT);
-		enumTestList.add(PredefinedLayout.TEXT_WITH_GRAPHIC);
-		enumTestList.add(PredefinedLayout.TILES_ONLY);
-		enumTestList.add(PredefinedLayout.TEXTBUTTONS_ONLY);
-		enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TILES);
-		enumTestList.add(PredefinedLayout.TILES_WITH_GRAPHIC);
-		enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS);
-		enumTestList.add(PredefinedLayout.TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC);
-		enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXTBUTTONS);
-		enumTestList.add(PredefinedLayout.TEXTBUTTONS_WITH_GRAPHIC);
-		enumTestList.add(PredefinedLayout.LARGE_GRAPHIC_WITH_SOFTBUTTONS);
-		enumTestList.add(PredefinedLayout.DOUBLE_GRAPHIC_WITH_SOFTBUTTONS);
-		enumTestList.add(PredefinedLayout.LARGE_GRAPHIC_ONLY);
-		enumTestList.add(PredefinedLayout.WEB_VIEW);
+        enumTestList.add(PredefinedLayout.DEFAULT);
+        enumTestList.add(PredefinedLayout.MEDIA);
+        enumTestList.add(PredefinedLayout.NON_MEDIA);
+        enumTestList.add(PredefinedLayout.ONSCREEN_PRESETS);
+        enumTestList.add(PredefinedLayout.NAV_FULLSCREEN_MAP);
+        enumTestList.add(PredefinedLayout.NAV_LIST);
+        enumTestList.add(PredefinedLayout.NAV_KEYBOARD);
+        enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXT);
+        enumTestList.add(PredefinedLayout.TEXT_WITH_GRAPHIC);
+        enumTestList.add(PredefinedLayout.TILES_ONLY);
+        enumTestList.add(PredefinedLayout.TEXTBUTTONS_ONLY);
+        enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TILES);
+        enumTestList.add(PredefinedLayout.TILES_WITH_GRAPHIC);
+        enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXT_AND_SOFTBUTTONS);
+        enumTestList.add(PredefinedLayout.TEXT_AND_SOFTBUTTONS_WITH_GRAPHIC);
+        enumTestList.add(PredefinedLayout.GRAPHIC_WITH_TEXTBUTTONS);
+        enumTestList.add(PredefinedLayout.TEXTBUTTONS_WITH_GRAPHIC);
+        enumTestList.add(PredefinedLayout.LARGE_GRAPHIC_WITH_SOFTBUTTONS);
+        enumTestList.add(PredefinedLayout.DOUBLE_GRAPHIC_WITH_SOFTBUTTONS);
+        enumTestList.add(PredefinedLayout.LARGE_GRAPHIC_ONLY);
+        enumTestList.add(PredefinedLayout.WEB_VIEW);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
index e8b700007..209030f3a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
@@ -9,75 +9,73 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "INITIAL_JINGLE";
-		PrerecordedSpeech enumInitialJingle = PrerecordedSpeech.valueForString(example);
-		example = "LISTEN_JINGLE";
-		PrerecordedSpeech enumListenJingle = PrerecordedSpeech.valueForString(example);
-		example = "POSITIVE_JINGLE";
-		PrerecordedSpeech enumPositiveJingle = PrerecordedSpeech.valueForString(example);
-		example = "NEGATIVE_JINGLE";
-		PrerecordedSpeech enumNegativeJingle = PrerecordedSpeech.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "HELP_JINGLE";
+        PrerecordedSpeech enumHelpJingle = PrerecordedSpeech.valueForString(example);
+        example = "INITIAL_JINGLE";
+        PrerecordedSpeech enumInitialJingle = PrerecordedSpeech.valueForString(example);
+        example = "LISTEN_JINGLE";
+        PrerecordedSpeech enumListenJingle = PrerecordedSpeech.valueForString(example);
+        example = "POSITIVE_JINGLE";
+        PrerecordedSpeech enumPositiveJingle = PrerecordedSpeech.valueForString(example);
+        example = "NEGATIVE_JINGLE";
+        PrerecordedSpeech enumNegativeJingle = PrerecordedSpeech.valueForString(example);
 
-		assertNotNull("HELP_JINGLE returned null", enumHelpJingle);
-		assertNotNull("INITIAL_JINGLE returned null", enumInitialJingle);
-		assertNotNull("LISTEN_JINGLE returned null", enumListenJingle);
-		assertNotNull("POSITIVE_JINGLE returned null", enumPositiveJingle);
-		assertNotNull("NEGATIVE_JINGLE returned null", enumNegativeJingle);
-	}
+        assertNotNull("HELP_JINGLE returned null", enumHelpJingle);
+        assertNotNull("INITIAL_JINGLE returned null", enumInitialJingle);
+        assertNotNull("LISTEN_JINGLE returned null", enumListenJingle);
+        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 {
-		    PrerecordedSpeech temp = PrerecordedSpeech.valueForString(example);
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "heLP_JingLE";
+        try {
+            PrerecordedSpeech temp = PrerecordedSpeech.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    PrerecordedSpeech temp = PrerecordedSpeech.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            PrerecordedSpeech temp = PrerecordedSpeech.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of PrerecordedSpeech.
-	 */
-	public void testListEnum() {
- 		List<PrerecordedSpeech> enumValueList = Arrays.asList(PrerecordedSpeech.values());
+    /**
+     * Verifies the possible enum values of PrerecordedSpeech.
+     */
+    public void testListEnum() {
+        List<PrerecordedSpeech> enumValueList = Arrays.asList(PrerecordedSpeech.values());
 
-		List<PrerecordedSpeech> enumTestList = new ArrayList<PrerecordedSpeech>();
-		enumTestList.add(PrerecordedSpeech.HELP_JINGLE);
-		enumTestList.add(PrerecordedSpeech.INITIAL_JINGLE);
-		enumTestList.add(PrerecordedSpeech.LISTEN_JINGLE);
-		enumTestList.add(PrerecordedSpeech.POSITIVE_JINGLE);
-		enumTestList.add(PrerecordedSpeech.NEGATIVE_JINGLE);
+        List<PrerecordedSpeech> enumTestList = new ArrayList<PrerecordedSpeech>();
+        enumTestList.add(PrerecordedSpeech.HELP_JINGLE);
+        enumTestList.add(PrerecordedSpeech.INITIAL_JINGLE);
+        enumTestList.add(PrerecordedSpeech.LISTEN_JINGLE);
+        enumTestList.add(PrerecordedSpeech.POSITIVE_JINGLE);
+        enumTestList.add(PrerecordedSpeech.NEGATIVE_JINGLE);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
index a0a6fc6dd..167bedec7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
@@ -15,97 +15,97 @@ import java.util.List;
  */
 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);
-		example = "USB";
-		PrimaryAudioSource enumUsb = PrimaryAudioSource.valueForString(example);
-		example = "USB2";
-		PrimaryAudioSource enumUsb2 = PrimaryAudioSource.valueForString(example);
-		example = "BLUETOOTH_STEREO_BTST";
-		PrimaryAudioSource enumBluetoothStereoBtst = PrimaryAudioSource.valueForString(example);
-		example = "LINE_IN";
-		PrimaryAudioSource enumLineIn = PrimaryAudioSource.valueForString(example);
-		example = "IPOD";
-		PrimaryAudioSource enumIpod = PrimaryAudioSource.valueForString(example);
-		example = "MOBILE_APP";
-		PrimaryAudioSource enumMobileApp = PrimaryAudioSource.valueForString(example);
-		example = "CD";
-		PrimaryAudioSource enumCd = PrimaryAudioSource.valueForString(example);
-		example = "AM";
-		PrimaryAudioSource enumAm = PrimaryAudioSource.valueForString(example);
-		example = "FM";
-		PrimaryAudioSource enumFm = PrimaryAudioSource.valueForString(example);
-		example = "XM";
-		PrimaryAudioSource enumXm = PrimaryAudioSource.valueForString(example);
-		example = "DAB";
-		PrimaryAudioSource enumDab = PrimaryAudioSource.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NO_SOURCE_SELECTED";
+        PrimaryAudioSource enumNoSourceSelected = PrimaryAudioSource.valueForString(example);
+        example = "USB";
+        PrimaryAudioSource enumUsb = PrimaryAudioSource.valueForString(example);
+        example = "USB2";
+        PrimaryAudioSource enumUsb2 = PrimaryAudioSource.valueForString(example);
+        example = "BLUETOOTH_STEREO_BTST";
+        PrimaryAudioSource enumBluetoothStereoBtst = PrimaryAudioSource.valueForString(example);
+        example = "LINE_IN";
+        PrimaryAudioSource enumLineIn = PrimaryAudioSource.valueForString(example);
+        example = "IPOD";
+        PrimaryAudioSource enumIpod = PrimaryAudioSource.valueForString(example);
+        example = "MOBILE_APP";
+        PrimaryAudioSource enumMobileApp = PrimaryAudioSource.valueForString(example);
+        example = "CD";
+        PrimaryAudioSource enumCd = PrimaryAudioSource.valueForString(example);
+        example = "AM";
+        PrimaryAudioSource enumAm = PrimaryAudioSource.valueForString(example);
+        example = "FM";
+        PrimaryAudioSource enumFm = PrimaryAudioSource.valueForString(example);
+        example = "XM";
+        PrimaryAudioSource enumXm = PrimaryAudioSource.valueForString(example);
+        example = "DAB";
+        PrimaryAudioSource enumDab = PrimaryAudioSource.valueForString(example);
 
-		assertNotNull("NO_SOURCE_SELECTED returned null", enumNoSourceSelected);
-		assertNotNull("USB returned null", enumUsb);
-		assertNotNull("USB2 returned null", enumUsb2);
-		assertNotNull("BLUETOOTH_STEREO_BTST returned null", enumBluetoothStereoBtst);
-		assertNotNull("LINE_IN returned null", enumLineIn);
-		assertNotNull("IPOD returned null", enumIpod);
-		assertNotNull("MOBILE_APP returned null", enumMobileApp);
-		assertNotNull("CD returned null", enumCd);
-		assertNotNull("AM returned null", enumAm);
-		assertNotNull("FM returned null", enumFm);
-		assertNotNull("XM returned null", enumXm);
-		assertNotNull("DAB returned null", enumDab);
-	}
+        assertNotNull("NO_SOURCE_SELECTED returned null", enumNoSourceSelected);
+        assertNotNull("USB returned null", enumUsb);
+        assertNotNull("USB2 returned null", enumUsb2);
+        assertNotNull("BLUETOOTH_STEREO_BTST returned null", enumBluetoothStereoBtst);
+        assertNotNull("LINE_IN returned null", enumLineIn);
+        assertNotNull("IPOD returned null", enumIpod);
+        assertNotNull("MOBILE_APP returned null", enumMobileApp);
+        assertNotNull("CD returned null", enumCd);
+        assertNotNull("AM returned null", enumAm);
+        assertNotNull("FM returned null", enumFm);
+        assertNotNull("XM returned null", enumXm);
+        assertNotNull("DAB returned null", enumDab);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "no_SouRCe_SelEcteD";
-		try {
-			PrimaryAudioSource temp = PrimaryAudioSource.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "no_SouRCe_SelEcteD";
+        try {
+            PrimaryAudioSource temp = PrimaryAudioSource.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			PrimaryAudioSource temp = PrimaryAudioSource.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            PrimaryAudioSource temp = PrimaryAudioSource.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
 
-	/**
-	 * Verifies the possible enum values of PrimaryAudioSource.
-	 */
-	public void testListEnum() {
-		List<PrimaryAudioSource> enumValueList = Arrays.asList(PrimaryAudioSource.values());
+    /**
+     * Verifies the possible enum values of PrimaryAudioSource.
+     */
+    public void testListEnum() {
+        List<PrimaryAudioSource> enumValueList = Arrays.asList(PrimaryAudioSource.values());
 
-		List<PrimaryAudioSource> enumTestList = new ArrayList<PrimaryAudioSource>();
-		enumTestList.add(PrimaryAudioSource.NO_SOURCE_SELECTED);
-		enumTestList.add(PrimaryAudioSource.USB);
-		enumTestList.add(PrimaryAudioSource.USB2);
-		enumTestList.add(PrimaryAudioSource.BLUETOOTH_STEREO_BTST);
-		enumTestList.add(PrimaryAudioSource.LINE_IN);
-		enumTestList.add(PrimaryAudioSource.IPOD);
-		enumTestList.add(PrimaryAudioSource.MOBILE_APP);
-		enumTestList.add(PrimaryAudioSource.CD);
-		enumTestList.add(PrimaryAudioSource.AM);
-		enumTestList.add(PrimaryAudioSource.FM);
-		enumTestList.add(PrimaryAudioSource.XM);
-		enumTestList.add(PrimaryAudioSource.DAB);
+        List<PrimaryAudioSource> enumTestList = new ArrayList<PrimaryAudioSource>();
+        enumTestList.add(PrimaryAudioSource.NO_SOURCE_SELECTED);
+        enumTestList.add(PrimaryAudioSource.USB);
+        enumTestList.add(PrimaryAudioSource.USB2);
+        enumTestList.add(PrimaryAudioSource.BLUETOOTH_STEREO_BTST);
+        enumTestList.add(PrimaryAudioSource.LINE_IN);
+        enumTestList.add(PrimaryAudioSource.IPOD);
+        enumTestList.add(PrimaryAudioSource.MOBILE_APP);
+        enumTestList.add(PrimaryAudioSource.CD);
+        enumTestList.add(PrimaryAudioSource.AM);
+        enumTestList.add(PrimaryAudioSource.FM);
+        enumTestList.add(PrimaryAudioSource.XM);
+        enumTestList.add(PrimaryAudioSource.DAB);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java
index 215a67704..102922052 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java
@@ -10,127 +10,125 @@ import java.util.List;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "REVERSE";
-		PRNDL enumReverse = PRNDL.valueForString(example);
-		example = "NEUTRAL";
-		PRNDL enumNeutral = PRNDL.valueForString(example);
-		example = "DRIVE";
-		PRNDL enumDrive = PRNDL.valueForString(example);
-		example = "SPORT";
-		PRNDL enumSport = PRNDL.valueForString(example);
-		example = "LOWGEAR";
-		PRNDL enumLowGear = PRNDL.valueForString(example);
-		example = "FIRST";
-		PRNDL enumFirst = PRNDL.valueForString(example);
-		example = "SECOND";
-		PRNDL enumSecond = PRNDL.valueForString(example);
-		example = "THIRD";
-		PRNDL enumThird = PRNDL.valueForString(example);
-		example = "FOURTH";
-		PRNDL enumFourth = PRNDL.valueForString(example);
-		example = "FIFTH";
-		PRNDL enumFifth = PRNDL.valueForString(example);
-		example = "SIXTH";
-		PRNDL enumSixth = PRNDL.valueForString(example);
-		example = "SEVENTH";
-		PRNDL enumSeventh = PRNDL.valueForString(example);
-		example = "EIGHTH";
-		PRNDL enumEighth = PRNDL.valueForString(example);
-		example = "NINTH";
-		PRNDL enumNinth = PRNDL.valueForString(example);
-		example = "TENTH";
-		PRNDL enumTenth = PRNDL.valueForString(example);
-		example = "UNKNOWN";
-		PRNDL enumUnknown = PRNDL.valueForString(example);
-		example = "FAULT";
-		PRNDL enumFault = PRNDL.valueForString(example);
-		
-		assertNotNull("PARK returned null", enumPark);
-		assertNotNull("REVERSE returned null", enumReverse);
-		assertNotNull("NEUTRAL returned null", enumNeutral);
-		assertNotNull("DRIVE returned null", enumDrive);
-		assertNotNull("SPORT returned null", enumSport);
-		assertNotNull("LOWGEAR returned null", enumLowGear);
-		assertNotNull("FIRST returned null", enumFirst);
-		assertNotNull("SECOND returned null", enumSecond);
-		assertNotNull("THIRD returned null", enumThird);
-		assertNotNull("FOURTH returned null", enumFourth);
-		assertNotNull("FIFTH returned null", enumFifth);
-		assertNotNull("SIXTH returned null", enumSixth);
-		assertNotNull("SEVENTH returned null", enumSeventh);
-		assertNotNull("EIGHTH returned null", enumEighth);
-		assertNotNull("NINTH returned null", enumNinth);
-		assertNotNull("TENTH returned null", enumTenth);
-		assertNotNull("UNKNOWN returned null", enumUnknown);
-		assertNotNull("FAULT returned null", enumFault);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "PARK";
+        PRNDL enumPark = PRNDL.valueForString(example);
+        example = "REVERSE";
+        PRNDL enumReverse = PRNDL.valueForString(example);
+        example = "NEUTRAL";
+        PRNDL enumNeutral = PRNDL.valueForString(example);
+        example = "DRIVE";
+        PRNDL enumDrive = PRNDL.valueForString(example);
+        example = "SPORT";
+        PRNDL enumSport = PRNDL.valueForString(example);
+        example = "LOWGEAR";
+        PRNDL enumLowGear = PRNDL.valueForString(example);
+        example = "FIRST";
+        PRNDL enumFirst = PRNDL.valueForString(example);
+        example = "SECOND";
+        PRNDL enumSecond = PRNDL.valueForString(example);
+        example = "THIRD";
+        PRNDL enumThird = PRNDL.valueForString(example);
+        example = "FOURTH";
+        PRNDL enumFourth = PRNDL.valueForString(example);
+        example = "FIFTH";
+        PRNDL enumFifth = PRNDL.valueForString(example);
+        example = "SIXTH";
+        PRNDL enumSixth = PRNDL.valueForString(example);
+        example = "SEVENTH";
+        PRNDL enumSeventh = PRNDL.valueForString(example);
+        example = "EIGHTH";
+        PRNDL enumEighth = PRNDL.valueForString(example);
+        example = "NINTH";
+        PRNDL enumNinth = PRNDL.valueForString(example);
+        example = "TENTH";
+        PRNDL enumTenth = PRNDL.valueForString(example);
+        example = "UNKNOWN";
+        PRNDL enumUnknown = PRNDL.valueForString(example);
+        example = "FAULT";
+        PRNDL enumFault = PRNDL.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "pARk";
-		try {
-		    PRNDL temp = PRNDL.valueForString(example);
+        assertNotNull("PARK returned null", enumPark);
+        assertNotNull("REVERSE returned null", enumReverse);
+        assertNotNull("NEUTRAL returned null", enumNeutral);
+        assertNotNull("DRIVE returned null", enumDrive);
+        assertNotNull("SPORT returned null", enumSport);
+        assertNotNull("LOWGEAR returned null", enumLowGear);
+        assertNotNull("FIRST returned null", enumFirst);
+        assertNotNull("SECOND returned null", enumSecond);
+        assertNotNull("THIRD returned null", enumThird);
+        assertNotNull("FOURTH returned null", enumFourth);
+        assertNotNull("FIFTH returned null", enumFifth);
+        assertNotNull("SIXTH returned null", enumSixth);
+        assertNotNull("SEVENTH returned null", enumSeventh);
+        assertNotNull("EIGHTH returned null", enumEighth);
+        assertNotNull("NINTH returned null", enumNinth);
+        assertNotNull("TENTH returned null", enumTenth);
+        assertNotNull("UNKNOWN returned null", enumUnknown);
+        assertNotNull("FAULT returned null", enumFault);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "pARk";
+        try {
+            PRNDL temp = PRNDL.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    PRNDL temp = PRNDL.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            PRNDL temp = PRNDL.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of PRNDL.
-	 */
-	public void testListEnum() {
- 		List<PRNDL> enumValueList = Arrays.asList(PRNDL.values());
+    /**
+     * Verifies the possible enum values of PRNDL.
+     */
+    public void testListEnum() {
+        List<PRNDL> enumValueList = Arrays.asList(PRNDL.values());
 
-		List<PRNDL> enumTestList = new ArrayList<PRNDL>();
-		enumTestList.add(PRNDL.PARK);
-		enumTestList.add(PRNDL.REVERSE);
-		enumTestList.add(PRNDL.NEUTRAL);
-		enumTestList.add(PRNDL.DRIVE);
-		enumTestList.add(PRNDL.SPORT);
-		enumTestList.add(PRNDL.LOWGEAR);		
-		enumTestList.add(PRNDL.FIRST);
-		enumTestList.add(PRNDL.SECOND);	
-		enumTestList.add(PRNDL.THIRD);
-		enumTestList.add(PRNDL.FOURTH);	
-		enumTestList.add(PRNDL.FIFTH);	
-		enumTestList.add(PRNDL.SIXTH);
-		enumTestList.add(PRNDL.SEVENTH);	
-		enumTestList.add(PRNDL.EIGHTH);
-		enumTestList.add(PRNDL.NINTH);
-		enumTestList.add(PRNDL.TENTH);
-		enumTestList.add(PRNDL.UNKNOWN);
-		enumTestList.add(PRNDL.FAULT);	
+        List<PRNDL> enumTestList = new ArrayList<PRNDL>();
+        enumTestList.add(PRNDL.PARK);
+        enumTestList.add(PRNDL.REVERSE);
+        enumTestList.add(PRNDL.NEUTRAL);
+        enumTestList.add(PRNDL.DRIVE);
+        enumTestList.add(PRNDL.SPORT);
+        enumTestList.add(PRNDL.LOWGEAR);
+        enumTestList.add(PRNDL.FIRST);
+        enumTestList.add(PRNDL.SECOND);
+        enumTestList.add(PRNDL.THIRD);
+        enumTestList.add(PRNDL.FOURTH);
+        enumTestList.add(PRNDL.FIFTH);
+        enumTestList.add(PRNDL.SIXTH);
+        enumTestList.add(PRNDL.SEVENTH);
+        enumTestList.add(PRNDL.EIGHTH);
+        enumTestList.add(PRNDL.NINTH);
+        enumTestList.add(PRNDL.TENTH);
+        enumTestList.add(PRNDL.UNKNOWN);
+        enumTestList.add(PRNDL.FAULT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java
index 52c15156e..b8001a14f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioBandTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.RadioBand}
  */
 public class RadioBandTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {	
-		String example = "AM";
-		RadioBand enumAm = RadioBand.valueForString(example);
-		example = "FM";
-		RadioBand enumFm = RadioBand.valueForString(example);
-		example = "XM";
-		RadioBand enumXm = RadioBand.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "AM";
+        RadioBand enumAm = RadioBand.valueForString(example);
+        example = "FM";
+        RadioBand enumFm = RadioBand.valueForString(example);
+        example = "XM";
+        RadioBand enumXm = RadioBand.valueForString(example);
 
-		assertNotNull("AM returned null", enumAm);
-		assertNotNull("FM returned null", enumFm);
-		assertNotNull("XM returned null", enumXm);
-	}
+        assertNotNull("AM returned null", enumAm);
+        assertNotNull("FM returned null", enumFm);
+        assertNotNull("XM returned null", enumXm);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "aM";
-		try {
-			RadioBand temp = RadioBand.valueForString(example);
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "aM";
+        try {
+            RadioBand temp = RadioBand.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			RadioBand temp = RadioBand.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            RadioBand temp = RadioBand.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of RadioBand.
-	 */
-	public void testListEnum() {
- 		List<RadioBand> enumValueList = Arrays.asList(RadioBand.values());
+    /**
+     * Verifies the possible enum values of RadioBand.
+     */
+    public void testListEnum() {
+        List<RadioBand> enumValueList = Arrays.asList(RadioBand.values());
 
-		List<RadioBand> enumTestList = new ArrayList<RadioBand>();
-		enumTestList.add(RadioBand.AM);
-		enumTestList.add(RadioBand.FM);
-		enumTestList.add(RadioBand.XM);
+        List<RadioBand> enumTestList = new ArrayList<RadioBand>();
+        enumTestList.add(RadioBand.AM);
+        enumTestList.add(RadioBand.FM);
+        enumTestList.add(RadioBand.XM);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java
index 5c7286937..fb64b29ad 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RadioStateTests.java
@@ -9,71 +9,69 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.RadioState}
  */
 public class RadioStateTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {	
-		String example = "ACQUIRING";
-		RadioState enumAcquiring = RadioState.valueForString(example);
-		example = "ACQUIRED";
-		RadioState enumAcquired = RadioState.valueForString(example);
-		example = "MULTICAST";
-		RadioState enumMultiCast = RadioState.valueForString(example);
-		example = "NOT_FOUND";
-		RadioState enumNotFound = RadioState.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "ACQUIRING";
+        RadioState enumAcquiring = RadioState.valueForString(example);
+        example = "ACQUIRED";
+        RadioState enumAcquired = RadioState.valueForString(example);
+        example = "MULTICAST";
+        RadioState enumMultiCast = RadioState.valueForString(example);
+        example = "NOT_FOUND";
+        RadioState enumNotFound = RadioState.valueForString(example);
 
-		assertNotNull("ACQUIRING returned null", enumAcquiring);
-		assertNotNull("ACQUIRED returned null", enumAcquired);
-		assertNotNull("MULTICAST returned null", enumMultiCast);
-		assertNotNull("NOT_FOUND returned null", enumNotFound);
-	}
+        assertNotNull("ACQUIRING returned null", enumAcquiring);
+        assertNotNull("ACQUIRED returned null", enumAcquired);
+        assertNotNull("MULTICAST returned null", enumMultiCast);
+        assertNotNull("NOT_FOUND returned null", enumNotFound);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "aCQUIRING";
-		try {
-			RadioState temp = RadioState.valueForString(example);
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "aCQUIRING";
+        try {
+            RadioState temp = RadioState.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			RadioState temp = RadioState.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            RadioState temp = RadioState.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of RadioState.
-	 */
-	public void testListEnum() {
- 		List<RadioState> enumValueList = Arrays.asList(RadioState.values());
+    /**
+     * Verifies the possible enum values of RadioState.
+     */
+    public void testListEnum() {
+        List<RadioState> enumValueList = Arrays.asList(RadioState.values());
 
-		List<RadioState> enumTestList = new ArrayList<RadioState>();
-		enumTestList.add(RadioState.ACQUIRING);
-		enumTestList.add(RadioState.ACQUIRED);
-		enumTestList.add(RadioState.MULTICAST);
-		enumTestList.add(RadioState.NOT_FOUND);
+        List<RadioState> enumTestList = new ArrayList<RadioState>();
+        enumTestList.add(RadioState.ACQUIRING);
+        enumTestList.add(RadioState.ACQUIRED);
+        enumTestList.add(RadioState.MULTICAST);
+        enumTestList.add(RadioState.NOT_FOUND);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
index 54c40d69f..371c120c4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
@@ -10,144 +10,142 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "FILE_RESUME";
-		RequestType enumFileResume = RequestType.valueForString(example);
-		example = "AUTH_REQUEST";
-		RequestType enumAuthRequest = RequestType.valueForString(example);
-		example = "AUTH_CHALLENGE";
-		RequestType enumAuthChallenge = RequestType.valueForString(example);
-		example = "AUTH_ACK";
-		RequestType enumAuthAck = RequestType.valueForString(example);
-		example = "PROPRIETARY";
-		RequestType enumProprietary = RequestType.valueForString(example);
-		
-		example = "QUERY_APPS";
-		RequestType enumQueryApps = RequestType.valueForString(example);
-		example = "LAUNCH_APP";
-		RequestType enumLaunchApp = RequestType.valueForString(example);
-		example = "LOCK_SCREEN_ICON_URL";
-		RequestType enumLockScreen = RequestType.valueForString(example);
-		example = "TRAFFIC_MESSAGE_CHANNEL";
-		RequestType enumTrafficMessage = RequestType.valueForString(example);
-		example = "DRIVER_PROFILE";
-		RequestType enumDriverProfile = RequestType.valueForString(example);
-		example = "VOICE_SEARCH";
-		RequestType enumVoiceSearch = RequestType.valueForString(example);
-		example = "NAVIGATION";
-		RequestType enumNavigation = RequestType.valueForString(example);
-		example = "PHONE";
-		RequestType enumPhone = RequestType.valueForString(example);
-		example = "CLIMATE";
-		RequestType enumClimate = RequestType.valueForString(example);
-		example = "SETTINGS";
-		RequestType enumSettings = RequestType.valueForString(example);
-		example = "VEHICLE_DIAGNOSTICS";
-		RequestType enumDiagnostics = RequestType.valueForString(example);
-		example = "EMERGENCY";
-		RequestType enumEmergency = RequestType.valueForString(example);
-		example = "MEDIA";
-		RequestType enumMedia = RequestType.valueForString(example);
-		example = "FOTA";
-		RequestType enumFota = RequestType.valueForString(example);
-		example = "ICON_URL";
-		RequestType enumIconURL = RequestType.valueForString(example);
-		
-		assertNotNull("HTTP returned null", enumHttp);
-		assertNotNull("FILE_RESUME returned null", enumFileResume);
-		assertNotNull("AUTH_REQUEST returned null", enumAuthRequest);
-		assertNotNull("AUTH_CHALLENGE returned null", enumAuthChallenge);
-		assertNotNull("AUTH_ACK returned null", enumAuthAck);
-		assertNotNull("PROPRIETARY returned null", enumProprietary);
-		assertNotNull("ICON_URL returned null", enumIconURL);
-		
-		assertNotNull(TestValues.NOT_NULL, enumQueryApps);
-		assertNotNull(TestValues.NOT_NULL, enumLaunchApp);
-		assertNotNull(TestValues.NOT_NULL, enumLockScreen);
-		assertNotNull(TestValues.NOT_NULL, enumTrafficMessage);
-		assertNotNull(TestValues.NOT_NULL, enumDriverProfile);
-		assertNotNull(TestValues.NOT_NULL, enumVoiceSearch);
-		assertNotNull(TestValues.NOT_NULL, enumNavigation);
-		assertNotNull(TestValues.NOT_NULL, enumPhone);
-		assertNotNull(TestValues.NOT_NULL, enumClimate);
-		assertNotNull(TestValues.NOT_NULL, enumSettings);
-		assertNotNull(TestValues.NOT_NULL, enumDiagnostics);
-		assertNotNull(TestValues.NOT_NULL, enumEmergency);
-		assertNotNull(TestValues.NOT_NULL, enumMedia);
-		assertNotNull(TestValues.NOT_NULL, enumFota);
-		assertNotNull(TestValues.NOT_NULL, enumIconURL);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "HTTP";
+        RequestType enumHttp = RequestType.valueForString(example);
+        example = "FILE_RESUME";
+        RequestType enumFileResume = RequestType.valueForString(example);
+        example = "AUTH_REQUEST";
+        RequestType enumAuthRequest = RequestType.valueForString(example);
+        example = "AUTH_CHALLENGE";
+        RequestType enumAuthChallenge = RequestType.valueForString(example);
+        example = "AUTH_ACK";
+        RequestType enumAuthAck = RequestType.valueForString(example);
+        example = "PROPRIETARY";
+        RequestType enumProprietary = RequestType.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "hTTp";
-		try {
-		    RequestType temp = RequestType.valueForString(example);
+        example = "QUERY_APPS";
+        RequestType enumQueryApps = RequestType.valueForString(example);
+        example = "LAUNCH_APP";
+        RequestType enumLaunchApp = RequestType.valueForString(example);
+        example = "LOCK_SCREEN_ICON_URL";
+        RequestType enumLockScreen = RequestType.valueForString(example);
+        example = "TRAFFIC_MESSAGE_CHANNEL";
+        RequestType enumTrafficMessage = RequestType.valueForString(example);
+        example = "DRIVER_PROFILE";
+        RequestType enumDriverProfile = RequestType.valueForString(example);
+        example = "VOICE_SEARCH";
+        RequestType enumVoiceSearch = RequestType.valueForString(example);
+        example = "NAVIGATION";
+        RequestType enumNavigation = RequestType.valueForString(example);
+        example = "PHONE";
+        RequestType enumPhone = RequestType.valueForString(example);
+        example = "CLIMATE";
+        RequestType enumClimate = RequestType.valueForString(example);
+        example = "SETTINGS";
+        RequestType enumSettings = RequestType.valueForString(example);
+        example = "VEHICLE_DIAGNOSTICS";
+        RequestType enumDiagnostics = RequestType.valueForString(example);
+        example = "EMERGENCY";
+        RequestType enumEmergency = RequestType.valueForString(example);
+        example = "MEDIA";
+        RequestType enumMedia = RequestType.valueForString(example);
+        example = "FOTA";
+        RequestType enumFota = RequestType.valueForString(example);
+        example = "ICON_URL";
+        RequestType enumIconURL = RequestType.valueForString(example);
+
+        assertNotNull("HTTP returned null", enumHttp);
+        assertNotNull("FILE_RESUME returned null", enumFileResume);
+        assertNotNull("AUTH_REQUEST returned null", enumAuthRequest);
+        assertNotNull("AUTH_CHALLENGE returned null", enumAuthChallenge);
+        assertNotNull("AUTH_ACK returned null", enumAuthAck);
+        assertNotNull("PROPRIETARY returned null", enumProprietary);
+        assertNotNull("ICON_URL returned null", enumIconURL);
+
+        assertNotNull(TestValues.NOT_NULL, enumQueryApps);
+        assertNotNull(TestValues.NOT_NULL, enumLaunchApp);
+        assertNotNull(TestValues.NOT_NULL, enumLockScreen);
+        assertNotNull(TestValues.NOT_NULL, enumTrafficMessage);
+        assertNotNull(TestValues.NOT_NULL, enumDriverProfile);
+        assertNotNull(TestValues.NOT_NULL, enumVoiceSearch);
+        assertNotNull(TestValues.NOT_NULL, enumNavigation);
+        assertNotNull(TestValues.NOT_NULL, enumPhone);
+        assertNotNull(TestValues.NOT_NULL, enumClimate);
+        assertNotNull(TestValues.NOT_NULL, enumSettings);
+        assertNotNull(TestValues.NOT_NULL, enumDiagnostics);
+        assertNotNull(TestValues.NOT_NULL, enumEmergency);
+        assertNotNull(TestValues.NOT_NULL, enumMedia);
+        assertNotNull(TestValues.NOT_NULL, enumFota);
+        assertNotNull(TestValues.NOT_NULL, enumIconURL);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "hTTp";
+        try {
+            RequestType temp = RequestType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    RequestType temp = RequestType.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            RequestType temp = RequestType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of RequestType.
+     */
+    public void testListEnum() {
+        List<RequestType> enumValueList = Arrays.asList(RequestType.values());
 
-	/**
-	 * Verifies the possible enum values of RequestType.
-	 */
-	public void testListEnum() {
- 		List<RequestType> enumValueList = Arrays.asList(RequestType.values());
+        List<RequestType> enumTestList = new ArrayList<RequestType>();
+        enumTestList.add(RequestType.HTTP);
+        enumTestList.add(RequestType.FILE_RESUME);
+        enumTestList.add(RequestType.AUTH_REQUEST);
+        enumTestList.add(RequestType.AUTH_CHALLENGE);
+        enumTestList.add(RequestType.AUTH_ACK);
+        enumTestList.add(RequestType.PROPRIETARY);
 
-		List<RequestType> enumTestList = new ArrayList<RequestType>();
-		enumTestList.add(RequestType.HTTP);
-		enumTestList.add(RequestType.FILE_RESUME);
-		enumTestList.add(RequestType.AUTH_REQUEST);
-		enumTestList.add(RequestType.AUTH_CHALLENGE);
-		enumTestList.add(RequestType.AUTH_ACK);
-		enumTestList.add(RequestType.PROPRIETARY);	
-		
-		enumTestList.add(RequestType.QUERY_APPS);	
-		enumTestList.add(RequestType.LAUNCH_APP);	
-		enumTestList.add(RequestType.LOCK_SCREEN_ICON_URL);	
-		enumTestList.add(RequestType.TRAFFIC_MESSAGE_CHANNEL);	
-		enumTestList.add(RequestType.DRIVER_PROFILE);	
-		enumTestList.add(RequestType.VOICE_SEARCH);	
-		enumTestList.add(RequestType.NAVIGATION);	
-		enumTestList.add(RequestType.PHONE);	
-		enumTestList.add(RequestType.CLIMATE);	
-		enumTestList.add(RequestType.SETTINGS);	
-		enumTestList.add(RequestType.VEHICLE_DIAGNOSTICS);	
-		enumTestList.add(RequestType.EMERGENCY);	
-		enumTestList.add(RequestType.MEDIA);
-		enumTestList.add(RequestType.FOTA);
-		enumTestList.add(RequestType.OEM_SPECIFIC);
-		enumTestList.add(RequestType.ICON_URL);
+        enumTestList.add(RequestType.QUERY_APPS);
+        enumTestList.add(RequestType.LAUNCH_APP);
+        enumTestList.add(RequestType.LOCK_SCREEN_ICON_URL);
+        enumTestList.add(RequestType.TRAFFIC_MESSAGE_CHANNEL);
+        enumTestList.add(RequestType.DRIVER_PROFILE);
+        enumTestList.add(RequestType.VOICE_SEARCH);
+        enumTestList.add(RequestType.NAVIGATION);
+        enumTestList.add(RequestType.PHONE);
+        enumTestList.add(RequestType.CLIMATE);
+        enumTestList.add(RequestType.SETTINGS);
+        enumTestList.add(RequestType.VEHICLE_DIAGNOSTICS);
+        enumTestList.add(RequestType.EMERGENCY);
+        enumTestList.add(RequestType.MEDIA);
+        enumTestList.add(RequestType.FOTA);
+        enumTestList.add(RequestType.OEM_SPECIFIC);
+        enumTestList.add(RequestType.ICON_URL);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java
index 8bfec0490..a00c70cbe 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java
@@ -9,203 +9,201 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "INVALID_DATA";
-		Result enumInvalidData = Result.valueForString(example);
-		example = "UNSUPPORTED_REQUEST";
-		Result enumUnsupportedRequest = Result.valueForString(example);
-		example = "OUT_OF_MEMORY";
-		Result enumOutOfMemory = Result.valueForString(example);
-		example = "TOO_MANY_PENDING_REQUESTS";
-		Result enumTooManyPendingRequests = Result.valueForString(example);
-		example = "CHAR_LIMIT_EXCEEDED";
-		Result enumCharLimitExceeded = Result.valueForString(example);
-		example = "INVALID_ID";
-		Result enumInvalidId = Result.valueForString(example);
-		example = "DUPLICATE_NAME";
-		Result enumDuplicateName = Result.valueForString(example);
-		example = "TOO_MANY_APPLICATIONS";
-		Result enumTooManyApplications = Result.valueForString(example);
-		example = "APPLICATION_REGISTERED_ALREADY";
-		Result enumApplicationRegisteredAlready = Result.valueForString(example);
-		example = "UNSUPPORTED_VERSION";
-		Result enumUnsupportedVersion = Result.valueForString(example);
-		example = "WRONG_LANGUAGE";
-		Result enumWrongLanguage = Result.valueForString(example);
-		example = "APPLICATION_NOT_REGISTERED";
-		Result enumApplicationNotRegistered = Result.valueForString(example);
-		example = "IN_USE";
-		Result enumInUse = Result.valueForString(example);
-		example = "VEHICLE_DATA_NOT_ALLOWED";
-		Result enumVehicleDataNotAllowed = Result.valueForString(example);
-		example = "VEHICLE_DATA_NOT_AVAILABLE";
-		Result enumVehicleDataNotAvailable = Result.valueForString(example);
-		example = "REJECTED";
-		Result enumRejected = Result.valueForString(example);
-		example = "ABORTED";
-		Result enumAborted = Result.valueForString(example);
-		example = "IGNORED";
-		Result enumIgnored = Result.valueForString(example);
-		example = "UNSUPPORTED_RESOURCE";
-		Result enumUnsupportedResource = Result.valueForString(example);
-		example = "FILE_NOT_FOUND";
-		Result enumFileNotFound = Result.valueForString(example);
-		example = "GENERIC_ERROR";
-		Result enumGenericError = Result.valueForString(example);
-		example = "DISALLOWED";
-		Result enumDisallowed = Result.valueForString(example);
-		example = "USER_DISALLOWED";
-		Result enumUserDisallowed = Result.valueForString(example);
-		example = "TIMED_OUT";
-		Result enumTimedOut = Result.valueForString(example);
-		example = "CANCEL_ROUTE";
-		Result enumCancelRoute = Result.valueForString(example);
-		example = "TRUNCATED_DATA";
-		Result enumTruncatedData = Result.valueForString(example);
-		example = "RETRY";
-		Result enumRetry = Result.valueForString(example);
-		example = "WARNINGS";
-		Result enumWarnings = Result.valueForString(example);
-		example = "SAVED";
-		Result enumSaved = Result.valueForString(example);
-		example = "INVALID_CERT";
-		Result enumInvalidCert = Result.valueForString(example);
-		example = "EXPIRED_CERT";
-		Result enumExpiredCert = Result.valueForString(example);
-		example = "RESUME_FAILED";
-		Result enumResumeFailed = Result.valueForString(example);
-		example = "DATA_NOT_AVAILABLE";
-		Result enumDataNotAvailable = Result.valueForString(example);
-		example = "READ_ONLY";
-		Result enumReadOnly = Result.valueForString(example);
-		example = "CORRUPTED_DATA";
-		Result enumCorruptData = Result.valueForString(example);
-		example = "ENCRYPTION_NEEDED";
-		Result enumEncryptionRequired = Result.valueForString(example);
-		
-		assertNotNull("SUCCESS returned null", enumSuccess);
-		assertNotNull("INVALID_DATA returned null", enumInvalidData);
-		assertNotNull("UNSUPPORTED_REQUEST returned null", enumUnsupportedRequest);
-		assertNotNull("OUT_OF_MEMORY returned null", enumOutOfMemory);
-		assertNotNull("TOO_MANY_PENDING_REQUESTS returned null", enumTooManyPendingRequests);
-		assertNotNull("CHAR_LIMIT_EXCEEDED returned null", enumCharLimitExceeded);
-		assertNotNull("INVALID_ID returned null", enumInvalidId);
-		assertNotNull("DUPLICATE_NAME returned null", enumDuplicateName);
-		assertNotNull("TOO_MANY_APPLICATIONS returned null", enumTooManyApplications);
-		assertNotNull("APPLICATION_REGISTERED_ALREADY returned null", enumApplicationRegisteredAlready);
-		assertNotNull("UNSUPPORTED_VERSION returned null", enumUnsupportedVersion);
-		assertNotNull("WRONG_LANGUAGE returned null", enumWrongLanguage);
-		assertNotNull("APPLICATION_NOT_REGISTERED returned null", enumApplicationNotRegistered);
-		assertNotNull("IN_USE returned null", enumInUse);
-		assertNotNull("VEHICLE_DATA_NOT_ALLOWED returned null", enumVehicleDataNotAllowed);
-		assertNotNull("VEHICLE_DATA_NOT_AVAILABLE returned null", enumVehicleDataNotAvailable);
-		assertNotNull("REJECTED returned null", enumRejected);
-		assertNotNull("ABORTED returned null", enumAborted);
-		assertNotNull("IGNORED returned null", enumIgnored);
-		assertNotNull("UNSUPPORTED_RESOURCE returned null", enumUnsupportedResource);
-		assertNotNull("FILE_NOT_FOUND returned null", enumFileNotFound);
-		assertNotNull("GENERIC_ERROR returned null", enumGenericError);
-		assertNotNull("DISALLOWED returned null", enumDisallowed);
-		assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed);
-		assertNotNull("TIMED_OUT returned null", enumTimedOut);
-		assertNotNull("CANCEL_ROUTE returned null", enumCancelRoute);
-		assertNotNull("TRUNCATED_DATA returned null", enumTruncatedData);
-		assertNotNull("RETRY returned null", enumRetry);
-		assertNotNull("WARNINGS returned null", enumWarnings);
-		assertNotNull("SAVED returned null", enumSaved);
-		assertNotNull("INVALID_CERT returned null", enumInvalidCert);
-		assertNotNull("EXPIRED_CERT returned null", enumExpiredCert);
-		assertNotNull("RESUME_FAILED returned null", enumResumeFailed);
-		assertNotNull("DATA_NOT_AVAILABLE returned null", enumDataNotAvailable);
-		assertNotNull("READ_ONLY returned null", enumReadOnly);
-		assertNotNull("CORRUPTED_DATA", enumCorruptData);
-		assertNotNull("ENCRYPTION_NEEDED", enumEncryptionRequired);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "SUCCESS";
+        Result enumSuccess = Result.valueForString(example);
+        example = "INVALID_DATA";
+        Result enumInvalidData = Result.valueForString(example);
+        example = "UNSUPPORTED_REQUEST";
+        Result enumUnsupportedRequest = Result.valueForString(example);
+        example = "OUT_OF_MEMORY";
+        Result enumOutOfMemory = Result.valueForString(example);
+        example = "TOO_MANY_PENDING_REQUESTS";
+        Result enumTooManyPendingRequests = Result.valueForString(example);
+        example = "CHAR_LIMIT_EXCEEDED";
+        Result enumCharLimitExceeded = Result.valueForString(example);
+        example = "INVALID_ID";
+        Result enumInvalidId = Result.valueForString(example);
+        example = "DUPLICATE_NAME";
+        Result enumDuplicateName = Result.valueForString(example);
+        example = "TOO_MANY_APPLICATIONS";
+        Result enumTooManyApplications = Result.valueForString(example);
+        example = "APPLICATION_REGISTERED_ALREADY";
+        Result enumApplicationRegisteredAlready = Result.valueForString(example);
+        example = "UNSUPPORTED_VERSION";
+        Result enumUnsupportedVersion = Result.valueForString(example);
+        example = "WRONG_LANGUAGE";
+        Result enumWrongLanguage = Result.valueForString(example);
+        example = "APPLICATION_NOT_REGISTERED";
+        Result enumApplicationNotRegistered = Result.valueForString(example);
+        example = "IN_USE";
+        Result enumInUse = Result.valueForString(example);
+        example = "VEHICLE_DATA_NOT_ALLOWED";
+        Result enumVehicleDataNotAllowed = Result.valueForString(example);
+        example = "VEHICLE_DATA_NOT_AVAILABLE";
+        Result enumVehicleDataNotAvailable = Result.valueForString(example);
+        example = "REJECTED";
+        Result enumRejected = Result.valueForString(example);
+        example = "ABORTED";
+        Result enumAborted = Result.valueForString(example);
+        example = "IGNORED";
+        Result enumIgnored = Result.valueForString(example);
+        example = "UNSUPPORTED_RESOURCE";
+        Result enumUnsupportedResource = Result.valueForString(example);
+        example = "FILE_NOT_FOUND";
+        Result enumFileNotFound = Result.valueForString(example);
+        example = "GENERIC_ERROR";
+        Result enumGenericError = Result.valueForString(example);
+        example = "DISALLOWED";
+        Result enumDisallowed = Result.valueForString(example);
+        example = "USER_DISALLOWED";
+        Result enumUserDisallowed = Result.valueForString(example);
+        example = "TIMED_OUT";
+        Result enumTimedOut = Result.valueForString(example);
+        example = "CANCEL_ROUTE";
+        Result enumCancelRoute = Result.valueForString(example);
+        example = "TRUNCATED_DATA";
+        Result enumTruncatedData = Result.valueForString(example);
+        example = "RETRY";
+        Result enumRetry = Result.valueForString(example);
+        example = "WARNINGS";
+        Result enumWarnings = Result.valueForString(example);
+        example = "SAVED";
+        Result enumSaved = Result.valueForString(example);
+        example = "INVALID_CERT";
+        Result enumInvalidCert = Result.valueForString(example);
+        example = "EXPIRED_CERT";
+        Result enumExpiredCert = Result.valueForString(example);
+        example = "RESUME_FAILED";
+        Result enumResumeFailed = Result.valueForString(example);
+        example = "DATA_NOT_AVAILABLE";
+        Result enumDataNotAvailable = Result.valueForString(example);
+        example = "READ_ONLY";
+        Result enumReadOnly = Result.valueForString(example);
+        example = "CORRUPTED_DATA";
+        Result enumCorruptData = Result.valueForString(example);
+        example = "ENCRYPTION_NEEDED";
+        Result enumEncryptionRequired = Result.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "suCcesS";
-		try {
-		    Result temp = Result.valueForString(example);
+        assertNotNull("SUCCESS returned null", enumSuccess);
+        assertNotNull("INVALID_DATA returned null", enumInvalidData);
+        assertNotNull("UNSUPPORTED_REQUEST returned null", enumUnsupportedRequest);
+        assertNotNull("OUT_OF_MEMORY returned null", enumOutOfMemory);
+        assertNotNull("TOO_MANY_PENDING_REQUESTS returned null", enumTooManyPendingRequests);
+        assertNotNull("CHAR_LIMIT_EXCEEDED returned null", enumCharLimitExceeded);
+        assertNotNull("INVALID_ID returned null", enumInvalidId);
+        assertNotNull("DUPLICATE_NAME returned null", enumDuplicateName);
+        assertNotNull("TOO_MANY_APPLICATIONS returned null", enumTooManyApplications);
+        assertNotNull("APPLICATION_REGISTERED_ALREADY returned null", enumApplicationRegisteredAlready);
+        assertNotNull("UNSUPPORTED_VERSION returned null", enumUnsupportedVersion);
+        assertNotNull("WRONG_LANGUAGE returned null", enumWrongLanguage);
+        assertNotNull("APPLICATION_NOT_REGISTERED returned null", enumApplicationNotRegistered);
+        assertNotNull("IN_USE returned null", enumInUse);
+        assertNotNull("VEHICLE_DATA_NOT_ALLOWED returned null", enumVehicleDataNotAllowed);
+        assertNotNull("VEHICLE_DATA_NOT_AVAILABLE returned null", enumVehicleDataNotAvailable);
+        assertNotNull("REJECTED returned null", enumRejected);
+        assertNotNull("ABORTED returned null", enumAborted);
+        assertNotNull("IGNORED returned null", enumIgnored);
+        assertNotNull("UNSUPPORTED_RESOURCE returned null", enumUnsupportedResource);
+        assertNotNull("FILE_NOT_FOUND returned null", enumFileNotFound);
+        assertNotNull("GENERIC_ERROR returned null", enumGenericError);
+        assertNotNull("DISALLOWED returned null", enumDisallowed);
+        assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed);
+        assertNotNull("TIMED_OUT returned null", enumTimedOut);
+        assertNotNull("CANCEL_ROUTE returned null", enumCancelRoute);
+        assertNotNull("TRUNCATED_DATA returned null", enumTruncatedData);
+        assertNotNull("RETRY returned null", enumRetry);
+        assertNotNull("WARNINGS returned null", enumWarnings);
+        assertNotNull("SAVED returned null", enumSaved);
+        assertNotNull("INVALID_CERT returned null", enumInvalidCert);
+        assertNotNull("EXPIRED_CERT returned null", enumExpiredCert);
+        assertNotNull("RESUME_FAILED returned null", enumResumeFailed);
+        assertNotNull("DATA_NOT_AVAILABLE returned null", enumDataNotAvailable);
+        assertNotNull("READ_ONLY returned null", enumReadOnly);
+        assertNotNull("CORRUPTED_DATA", enumCorruptData);
+        assertNotNull("ENCRYPTION_NEEDED", enumEncryptionRequired);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "suCcesS";
+        try {
+            Result temp = Result.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    Result temp = Result.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            Result temp = Result.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of Result.
-	 */
-	public void testListEnum() {
- 		List<Result> enumValueList = Arrays.asList(Result.values());
+    /**
+     * Verifies the possible enum values of Result.
+     */
+    public void testListEnum() {
+        List<Result> enumValueList = Arrays.asList(Result.values());
 
-		List<Result> enumTestList = new ArrayList<Result>();
-		enumTestList.add(Result.SUCCESS);
-		enumTestList.add(Result.INVALID_DATA);
-		enumTestList.add(Result.UNSUPPORTED_REQUEST);
-		enumTestList.add(Result.OUT_OF_MEMORY);
-		enumTestList.add(Result.TOO_MANY_PENDING_REQUESTS);
-		enumTestList.add(Result.CHAR_LIMIT_EXCEEDED);
-		enumTestList.add(Result.INVALID_ID);		
-		enumTestList.add(Result.DUPLICATE_NAME);
-		enumTestList.add(Result.TOO_MANY_APPLICATIONS);	
-		enumTestList.add(Result.APPLICATION_REGISTERED_ALREADY);
-		enumTestList.add(Result.UNSUPPORTED_VERSION);	
-		enumTestList.add(Result.WRONG_LANGUAGE);	
-		enumTestList.add(Result.APPLICATION_NOT_REGISTERED);
-		enumTestList.add(Result.IN_USE);	
-		enumTestList.add(Result.VEHICLE_DATA_NOT_ALLOWED);
-		enumTestList.add(Result.VEHICLE_DATA_NOT_AVAILABLE);	
-		enumTestList.add(Result.REJECTED);	
-		enumTestList.add(Result.ABORTED);
-		enumTestList.add(Result.IGNORED);
-		enumTestList.add(Result.UNSUPPORTED_RESOURCE);
-		enumTestList.add(Result.FILE_NOT_FOUND);
-		enumTestList.add(Result.GENERIC_ERROR);
-		enumTestList.add(Result.DISALLOWED);		
-		enumTestList.add(Result.USER_DISALLOWED);
-		enumTestList.add(Result.TIMED_OUT);	
-		enumTestList.add(Result.CANCEL_ROUTE);
-		enumTestList.add(Result.TRUNCATED_DATA);	
-		enumTestList.add(Result.RETRY);	
-		enumTestList.add(Result.WARNINGS);
-		enumTestList.add(Result.SAVED);	
-		enumTestList.add(Result.INVALID_CERT);
-		enumTestList.add(Result.EXPIRED_CERT);	
-		enumTestList.add(Result.RESUME_FAILED);
-		enumTestList.add(Result.DATA_NOT_AVAILABLE);
-		enumTestList.add(Result.READ_ONLY);
-		enumTestList.add(Result.CORRUPTED_DATA);
-		enumTestList.add(Result.ENCRYPTION_NEEDED);
+        List<Result> enumTestList = new ArrayList<Result>();
+        enumTestList.add(Result.SUCCESS);
+        enumTestList.add(Result.INVALID_DATA);
+        enumTestList.add(Result.UNSUPPORTED_REQUEST);
+        enumTestList.add(Result.OUT_OF_MEMORY);
+        enumTestList.add(Result.TOO_MANY_PENDING_REQUESTS);
+        enumTestList.add(Result.CHAR_LIMIT_EXCEEDED);
+        enumTestList.add(Result.INVALID_ID);
+        enumTestList.add(Result.DUPLICATE_NAME);
+        enumTestList.add(Result.TOO_MANY_APPLICATIONS);
+        enumTestList.add(Result.APPLICATION_REGISTERED_ALREADY);
+        enumTestList.add(Result.UNSUPPORTED_VERSION);
+        enumTestList.add(Result.WRONG_LANGUAGE);
+        enumTestList.add(Result.APPLICATION_NOT_REGISTERED);
+        enumTestList.add(Result.IN_USE);
+        enumTestList.add(Result.VEHICLE_DATA_NOT_ALLOWED);
+        enumTestList.add(Result.VEHICLE_DATA_NOT_AVAILABLE);
+        enumTestList.add(Result.REJECTED);
+        enumTestList.add(Result.ABORTED);
+        enumTestList.add(Result.IGNORED);
+        enumTestList.add(Result.UNSUPPORTED_RESOURCE);
+        enumTestList.add(Result.FILE_NOT_FOUND);
+        enumTestList.add(Result.GENERIC_ERROR);
+        enumTestList.add(Result.DISALLOWED);
+        enumTestList.add(Result.USER_DISALLOWED);
+        enumTestList.add(Result.TIMED_OUT);
+        enumTestList.add(Result.CANCEL_ROUTE);
+        enumTestList.add(Result.TRUNCATED_DATA);
+        enumTestList.add(Result.RETRY);
+        enumTestList.add(Result.WARNINGS);
+        enumTestList.add(Result.SAVED);
+        enumTestList.add(Result.INVALID_CERT);
+        enumTestList.add(Result.EXPIRED_CERT);
+        enumTestList.add(Result.RESUME_FAILED);
+        enumTestList.add(Result.DATA_NOT_AVAILABLE);
+        enumTestList.add(Result.READ_ONLY);
+        enumTestList.add(Result.CORRUPTED_DATA);
+        enumTestList.add(Result.ENCRYPTION_NEEDED);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
index 7a73b47f8..099a8668b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
@@ -9,71 +9,69 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "16KHZ";
-		SamplingRate enum16Khz = SamplingRate.valueForString(example);
-		example = "22KHZ";
-		SamplingRate enum22Khz = SamplingRate.valueForString(example);
-		example = "44KHZ";
-		SamplingRate enum44Khz = SamplingRate.valueForString(example);
-		
-		assertNotNull("8KHZ returned null", enum8Khz);
-		assertNotNull("16KHZ returned null", enum16Khz);
-		assertNotNull("22KHZ returned null", enum22Khz);
-		assertNotNull("44KHZ returned null", enum44Khz);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "8KHZ";
+        SamplingRate enum8Khz = SamplingRate.valueForString(example);
+        example = "16KHZ";
+        SamplingRate enum16Khz = SamplingRate.valueForString(example);
+        example = "22KHZ";
+        SamplingRate enum22Khz = SamplingRate.valueForString(example);
+        example = "44KHZ";
+        SamplingRate enum44Khz = SamplingRate.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "8kHz";
-		try {
-		    SamplingRate temp = SamplingRate.valueForString(example);
+        assertNotNull("8KHZ returned null", enum8Khz);
+        assertNotNull("16KHZ returned null", enum16Khz);
+        assertNotNull("22KHZ returned null", enum22Khz);
+        assertNotNull("44KHZ returned null", enum44Khz);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "8kHz";
+        try {
+            SamplingRate temp = SamplingRate.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    SamplingRate temp = SamplingRate.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            SamplingRate temp = SamplingRate.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of SamplingRate.
+     */
+    public void testListEnum() {
+        List<SamplingRate> enumValueList = Arrays.asList(SamplingRate.values());
 
-	/**
-	 * Verifies the possible enum values of SamplingRate.
-	 */
-	public void testListEnum() {
- 		List<SamplingRate> enumValueList = Arrays.asList(SamplingRate.values());
+        List<SamplingRate> enumTestList = new ArrayList<SamplingRate>();
+        enumTestList.add(SamplingRate._8KHZ);
+        enumTestList.add(SamplingRate._16KHZ);
+        enumTestList.add(SamplingRate._22KHZ);
+        enumTestList.add(SamplingRate._44KHZ);
 
-		List<SamplingRate> enumTestList = new ArrayList<SamplingRate>();
-		enumTestList.add(SamplingRate._8KHZ);
-		enumTestList.add(SamplingRate._16KHZ);
-		enumTestList.add(SamplingRate._22KHZ);
-		enumTestList.add(SamplingRate._44KHZ);
-		
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
index c55b9fc21..39a5f07c8 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
@@ -11,171 +11,169 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "IGNITION_OFF";
-		SdlDisconnectedReason enumIgnitionOff = SdlDisconnectedReason.valueForString(example);
-		example = "BLUETOOTH_OFF";
-		SdlDisconnectedReason enumBluetoothOff = SdlDisconnectedReason.valueForString(example);
-		example = "USB_DISCONNECTED";
-		SdlDisconnectedReason enumUsbDisconnected = SdlDisconnectedReason.valueForString(example);
-		example = "REQUEST_WHILE_IN_NONE_HMI_LEVEL";
-		SdlDisconnectedReason enumRequestWhileInNoneHmiLevel = SdlDisconnectedReason.valueForString(example);
-		example = "TOO_MANY_REQUESTS";
-		SdlDisconnectedReason enumTooManyRequests = SdlDisconnectedReason.valueForString(example);
-		example = "DRIVER_DISTRACTION_VIOLATION";
-		SdlDisconnectedReason enumDriverDistractionViolation = SdlDisconnectedReason.valueForString(example);
-		example = "LANGUAGE_CHANGE";
-		SdlDisconnectedReason enumLanuguageChange = SdlDisconnectedReason.valueForString(example);
-		example = "MASTER_RESET";
-		SdlDisconnectedReason enumMasterReset = SdlDisconnectedReason.valueForString(example);
-		example = "FACTORY_DEFAULTS";
-		SdlDisconnectedReason enumFactoryDefaults = SdlDisconnectedReason.valueForString(example);
-		example = "TRANSPORT_ERROR";
-		SdlDisconnectedReason enumTransportError = SdlDisconnectedReason.valueForString(example);
-		example = "APPLICATION_REQUESTED_DISCONNECT";
-		SdlDisconnectedReason enumApplicationRequestedDisconnect = SdlDisconnectedReason.valueForString(example);
-		example = "DEFAULT";
-		SdlDisconnectedReason enumDefault = SdlDisconnectedReason.valueForString(example);
-		example = "TRANSPORT_DISCONNECT";
-		SdlDisconnectedReason enumTransportDisconnect = SdlDisconnectedReason.valueForString(example);
-		example = "HB_TIMEOUT";
-		SdlDisconnectedReason enumHbTimeout = SdlDisconnectedReason.valueForString(example);
-		example = "BLUETOOTH_DISABLED";
-		SdlDisconnectedReason enumBluetoothDisabled = SdlDisconnectedReason.valueForString(example);
-		example = "BLUETOOTH_ADAPTER_ERROR";
-		SdlDisconnectedReason enumBluetoothAdapterError = SdlDisconnectedReason.valueForString(example);
-		example = "SDL_REGISTRATION_ERROR";
-		SdlDisconnectedReason enumSdlRegistrationError = SdlDisconnectedReason.valueForString(example);
-		example = "APP_INTERFACE_UNREG";
-		SdlDisconnectedReason enumAppInterfaceUnreg = SdlDisconnectedReason.valueForString(example);
-		example = "GENERIC_ERROR";
-		SdlDisconnectedReason enumGenericError = SdlDisconnectedReason.valueForString(example);
-		example = "LEGACY_BLUETOOTH_MODE_ENABLED";
-		SdlDisconnectedReason enumLegacyMode = SdlDisconnectedReason.valueForString(example);
-		example = "RPC_SESSION_ENDED";
-		SdlDisconnectedReason enumRpcSessionEnded = SdlDisconnectedReason.valueForString(example);
-		example = "RESOURCE_CONSTRAINT";
-		SdlDisconnectedReason resourceConstraint = SdlDisconnectedReason.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "USER_EXIT";
+        SdlDisconnectedReason enumUserExit = SdlDisconnectedReason.valueForString(example);
+        example = "IGNITION_OFF";
+        SdlDisconnectedReason enumIgnitionOff = SdlDisconnectedReason.valueForString(example);
+        example = "BLUETOOTH_OFF";
+        SdlDisconnectedReason enumBluetoothOff = SdlDisconnectedReason.valueForString(example);
+        example = "USB_DISCONNECTED";
+        SdlDisconnectedReason enumUsbDisconnected = SdlDisconnectedReason.valueForString(example);
+        example = "REQUEST_WHILE_IN_NONE_HMI_LEVEL";
+        SdlDisconnectedReason enumRequestWhileInNoneHmiLevel = SdlDisconnectedReason.valueForString(example);
+        example = "TOO_MANY_REQUESTS";
+        SdlDisconnectedReason enumTooManyRequests = SdlDisconnectedReason.valueForString(example);
+        example = "DRIVER_DISTRACTION_VIOLATION";
+        SdlDisconnectedReason enumDriverDistractionViolation = SdlDisconnectedReason.valueForString(example);
+        example = "LANGUAGE_CHANGE";
+        SdlDisconnectedReason enumLanuguageChange = SdlDisconnectedReason.valueForString(example);
+        example = "MASTER_RESET";
+        SdlDisconnectedReason enumMasterReset = SdlDisconnectedReason.valueForString(example);
+        example = "FACTORY_DEFAULTS";
+        SdlDisconnectedReason enumFactoryDefaults = SdlDisconnectedReason.valueForString(example);
+        example = "TRANSPORT_ERROR";
+        SdlDisconnectedReason enumTransportError = SdlDisconnectedReason.valueForString(example);
+        example = "APPLICATION_REQUESTED_DISCONNECT";
+        SdlDisconnectedReason enumApplicationRequestedDisconnect = SdlDisconnectedReason.valueForString(example);
+        example = "DEFAULT";
+        SdlDisconnectedReason enumDefault = SdlDisconnectedReason.valueForString(example);
+        example = "TRANSPORT_DISCONNECT";
+        SdlDisconnectedReason enumTransportDisconnect = SdlDisconnectedReason.valueForString(example);
+        example = "HB_TIMEOUT";
+        SdlDisconnectedReason enumHbTimeout = SdlDisconnectedReason.valueForString(example);
+        example = "BLUETOOTH_DISABLED";
+        SdlDisconnectedReason enumBluetoothDisabled = SdlDisconnectedReason.valueForString(example);
+        example = "BLUETOOTH_ADAPTER_ERROR";
+        SdlDisconnectedReason enumBluetoothAdapterError = SdlDisconnectedReason.valueForString(example);
+        example = "SDL_REGISTRATION_ERROR";
+        SdlDisconnectedReason enumSdlRegistrationError = SdlDisconnectedReason.valueForString(example);
+        example = "APP_INTERFACE_UNREG";
+        SdlDisconnectedReason enumAppInterfaceUnreg = SdlDisconnectedReason.valueForString(example);
+        example = "GENERIC_ERROR";
+        SdlDisconnectedReason enumGenericError = SdlDisconnectedReason.valueForString(example);
+        example = "LEGACY_BLUETOOTH_MODE_ENABLED";
+        SdlDisconnectedReason enumLegacyMode = SdlDisconnectedReason.valueForString(example);
+        example = "RPC_SESSION_ENDED";
+        SdlDisconnectedReason enumRpcSessionEnded = SdlDisconnectedReason.valueForString(example);
+        example = "RESOURCE_CONSTRAINT";
+        SdlDisconnectedReason resourceConstraint = SdlDisconnectedReason.valueForString(example);
 
-		assertNotNull("USER_EXIT returned null", enumUserExit);
-		assertNotNull("IGNITION_OFF returned null", enumIgnitionOff);
-		assertNotNull("BLUETOOTH_OFF returned null", enumBluetoothOff);
-		assertNotNull("USB_DISCONNECTED returned null", enumUsbDisconnected);
-		assertNotNull("REQUEST_WHILE_IN_NONE_HMI_LEVEL returned null", enumRequestWhileInNoneHmiLevel);
-		assertNotNull("TOO_MANY_REQUESTS returned null", enumTooManyRequests);
-		assertNotNull("DRIVER_DISTRACTION_VIOLATION returned null", enumDriverDistractionViolation);
-		assertNotNull("LANGUAGE_CHANGE returned null", enumLanuguageChange);
-		assertNotNull("MASTER_RESET returned null", enumMasterReset);
-		assertNotNull("FACTORY_DEFAULTS returned null", enumFactoryDefaults);
-		assertNotNull("TRANSPORT_ERROR returned null", enumTransportError);
-		assertNotNull("APPLICATION_REQUESTED_DISCONNECT returned null", enumApplicationRequestedDisconnect);
-		assertNotNull("DEFAULT returned null", enumDefault);
-		assertNotNull("TRANSPORT_DISCONNECT returned null", enumTransportDisconnect);
-		assertNotNull("HB_TIMEOUT returned null", enumHbTimeout);
-		assertNotNull("BLUETOOTH_DISABLED returned null", enumBluetoothDisabled);
-		assertNotNull("BLUETOOTH_ADAPTER_ERROR returned null", enumBluetoothAdapterError);
-		assertNotNull("SDL_REGISTRATION_ERROR returned null", enumSdlRegistrationError);
-		assertNotNull("APP_INTERFACE_UNREG returned null", enumAppInterfaceUnreg);
-		assertNotNull("GENERIC_ERROR returned null", enumGenericError);
-		assertNotNull("LEGACY_BLUETOOTH_MODE_ENABLED returned null", enumLegacyMode);
-		assertNotNull("RPC_SESSION_ENDED returned null", enumRpcSessionEnded);
-		assertNotNull("RESOURCE_CONSTRAINT returned null", resourceConstraint);
-	}
+        assertNotNull("USER_EXIT returned null", enumUserExit);
+        assertNotNull("IGNITION_OFF returned null", enumIgnitionOff);
+        assertNotNull("BLUETOOTH_OFF returned null", enumBluetoothOff);
+        assertNotNull("USB_DISCONNECTED returned null", enumUsbDisconnected);
+        assertNotNull("REQUEST_WHILE_IN_NONE_HMI_LEVEL returned null", enumRequestWhileInNoneHmiLevel);
+        assertNotNull("TOO_MANY_REQUESTS returned null", enumTooManyRequests);
+        assertNotNull("DRIVER_DISTRACTION_VIOLATION returned null", enumDriverDistractionViolation);
+        assertNotNull("LANGUAGE_CHANGE returned null", enumLanuguageChange);
+        assertNotNull("MASTER_RESET returned null", enumMasterReset);
+        assertNotNull("FACTORY_DEFAULTS returned null", enumFactoryDefaults);
+        assertNotNull("TRANSPORT_ERROR returned null", enumTransportError);
+        assertNotNull("APPLICATION_REQUESTED_DISCONNECT returned null", enumApplicationRequestedDisconnect);
+        assertNotNull("DEFAULT returned null", enumDefault);
+        assertNotNull("TRANSPORT_DISCONNECT returned null", enumTransportDisconnect);
+        assertNotNull("HB_TIMEOUT returned null", enumHbTimeout);
+        assertNotNull("BLUETOOTH_DISABLED returned null", enumBluetoothDisabled);
+        assertNotNull("BLUETOOTH_ADAPTER_ERROR returned null", enumBluetoothAdapterError);
+        assertNotNull("SDL_REGISTRATION_ERROR returned null", enumSdlRegistrationError);
+        assertNotNull("APP_INTERFACE_UNREG returned null", enumAppInterfaceUnreg);
+        assertNotNull("GENERIC_ERROR returned null", enumGenericError);
+        assertNotNull("LEGACY_BLUETOOTH_MODE_ENABLED returned null", enumLegacyMode);
+        assertNotNull("RPC_SESSION_ENDED returned null", enumRpcSessionEnded);
+        assertNotNull("RESOURCE_CONSTRAINT returned null", resourceConstraint);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "uSer_ExiT";
-		try {
-		    SdlDisconnectedReason temp = SdlDisconnectedReason.valueForString(example);
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "uSer_ExiT";
+        try {
+            SdlDisconnectedReason temp = SdlDisconnectedReason.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    SdlDisconnectedReason temp = SdlDisconnectedReason.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            SdlDisconnectedReason temp = SdlDisconnectedReason.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } 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());
+    /**
+     * Verifies the possible enum values of SdlDisconnectedReason.
+     */
+    public void testListEnum() {
+        List<SdlDisconnectedReason> enumValueList = Arrays.asList(SdlDisconnectedReason.values());
 
-		List<SdlDisconnectedReason> enumTestList = new ArrayList<SdlDisconnectedReason>();
-		enumTestList.add(SdlDisconnectedReason.USER_EXIT);
-		enumTestList.add(SdlDisconnectedReason.IGNITION_OFF);
-		enumTestList.add(SdlDisconnectedReason.BLUETOOTH_OFF);
-		enumTestList.add(SdlDisconnectedReason.USB_DISCONNECTED);
-		enumTestList.add(SdlDisconnectedReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL);
-		enumTestList.add(SdlDisconnectedReason.TOO_MANY_REQUESTS);		
-		enumTestList.add(SdlDisconnectedReason.DRIVER_DISTRACTION_VIOLATION);
-		enumTestList.add(SdlDisconnectedReason.LANGUAGE_CHANGE);	
-		enumTestList.add(SdlDisconnectedReason.MASTER_RESET);
-		enumTestList.add(SdlDisconnectedReason.FACTORY_DEFAULTS);	
-		enumTestList.add(SdlDisconnectedReason.TRANSPORT_ERROR);	
-		enumTestList.add(SdlDisconnectedReason.APPLICATION_REQUESTED_DISCONNECT);
-		enumTestList.add(SdlDisconnectedReason.DEFAULT);	
-		enumTestList.add(SdlDisconnectedReason.TRANSPORT_DISCONNECT);
-		enumTestList.add(SdlDisconnectedReason.HB_TIMEOUT);	
-		enumTestList.add(SdlDisconnectedReason.BLUETOOTH_DISABLED);	
-		enumTestList.add(SdlDisconnectedReason.BLUETOOTH_ADAPTER_ERROR);
-		enumTestList.add(SdlDisconnectedReason.SDL_REGISTRATION_ERROR);
-		enumTestList.add(SdlDisconnectedReason.APP_INTERFACE_UNREG);
-		enumTestList.add(SdlDisconnectedReason.GENERIC_ERROR);
-		enumTestList.add(SdlDisconnectedReason.LEGACY_BLUETOOTH_MODE_ENABLED);
-		enumTestList.add(SdlDisconnectedReason.RPC_SESSION_ENDED);
-		enumTestList.add(SdlDisconnectedReason.PRIMARY_TRANSPORT_CYCLE_REQUEST);
-		enumTestList.add(SdlDisconnectedReason.MINIMUM_PROTOCOL_VERSION_HIGHER_THAN_SUPPORTED);
-		enumTestList.add(SdlDisconnectedReason.MINIMUM_RPC_VERSION_HIGHER_THAN_SUPPORTED);
-		enumTestList.add(SdlDisconnectedReason.RESOURCE_CONSTRAINT);
+        List<SdlDisconnectedReason> enumTestList = new ArrayList<SdlDisconnectedReason>();
+        enumTestList.add(SdlDisconnectedReason.USER_EXIT);
+        enumTestList.add(SdlDisconnectedReason.IGNITION_OFF);
+        enumTestList.add(SdlDisconnectedReason.BLUETOOTH_OFF);
+        enumTestList.add(SdlDisconnectedReason.USB_DISCONNECTED);
+        enumTestList.add(SdlDisconnectedReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL);
+        enumTestList.add(SdlDisconnectedReason.TOO_MANY_REQUESTS);
+        enumTestList.add(SdlDisconnectedReason.DRIVER_DISTRACTION_VIOLATION);
+        enumTestList.add(SdlDisconnectedReason.LANGUAGE_CHANGE);
+        enumTestList.add(SdlDisconnectedReason.MASTER_RESET);
+        enumTestList.add(SdlDisconnectedReason.FACTORY_DEFAULTS);
+        enumTestList.add(SdlDisconnectedReason.TRANSPORT_ERROR);
+        enumTestList.add(SdlDisconnectedReason.APPLICATION_REQUESTED_DISCONNECT);
+        enumTestList.add(SdlDisconnectedReason.DEFAULT);
+        enumTestList.add(SdlDisconnectedReason.TRANSPORT_DISCONNECT);
+        enumTestList.add(SdlDisconnectedReason.HB_TIMEOUT);
+        enumTestList.add(SdlDisconnectedReason.BLUETOOTH_DISABLED);
+        enumTestList.add(SdlDisconnectedReason.BLUETOOTH_ADAPTER_ERROR);
+        enumTestList.add(SdlDisconnectedReason.SDL_REGISTRATION_ERROR);
+        enumTestList.add(SdlDisconnectedReason.APP_INTERFACE_UNREG);
+        enumTestList.add(SdlDisconnectedReason.GENERIC_ERROR);
+        enumTestList.add(SdlDisconnectedReason.LEGACY_BLUETOOTH_MODE_ENABLED);
+        enumTestList.add(SdlDisconnectedReason.RPC_SESSION_ENDED);
+        enumTestList.add(SdlDisconnectedReason.PRIMARY_TRANSPORT_CYCLE_REQUEST);
+        enumTestList.add(SdlDisconnectedReason.MINIMUM_PROTOCOL_VERSION_HIGHER_THAN_SUPPORTED);
+        enumTestList.add(SdlDisconnectedReason.MINIMUM_RPC_VERSION_HIGHER_THAN_SUPPORTED);
+        enumTestList.add(SdlDisconnectedReason.RESOURCE_CONSTRAINT);
+
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
+
+    /**
+     * Verifies the valid returns of the conversion method,
+     * {@link com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason#convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason)}
+     */
+    public void testConvertMethod() {
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.DEFAULT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.BLUETOOTH_OFF, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.BLUETOOTH_OFF));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.DRIVER_DISTRACTION_VIOLATION, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.DRIVER_DISTRACTION_VIOLATION));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.FACTORY_DEFAULTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.FACTORY_DEFAULTS));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.IGNITION_OFF, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.IGNITION_OFF));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.LANGUAGE_CHANGE, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.MASTER_RESET, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.MASTER_RESET));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.TOO_MANY_REQUESTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.USB_DISCONNECTED, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USB_DISCONNECTED));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.USER_EXIT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USER_EXIT));
+        assertEquals(TestValues.MATCH, SdlDisconnectedReason.RESOURCE_CONSTRAINT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.RESOURCE_CONSTRAINT));
+        assertNull(TestValues.MATCH, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(null));
+    }
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
-	
-	/**
-	 * Verifies the valid returns of the conversion method,
-	 * {@link com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason#convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason)}
-	 */
-	public void testConvertMethod () {		
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.DEFAULT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.APP_UNAUTHORIZED));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.BLUETOOTH_OFF, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.BLUETOOTH_OFF));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.DRIVER_DISTRACTION_VIOLATION, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.DRIVER_DISTRACTION_VIOLATION));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.FACTORY_DEFAULTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.FACTORY_DEFAULTS));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.IGNITION_OFF, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.IGNITION_OFF));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.LANGUAGE_CHANGE, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.LANGUAGE_CHANGE));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.MASTER_RESET, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.MASTER_RESET));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.REQUEST_WHILE_IN_NONE_HMI_LEVEL));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.TOO_MANY_REQUESTS, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.TOO_MANY_REQUESTS));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.USB_DISCONNECTED, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USB_DISCONNECTED));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.USER_EXIT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.USER_EXIT));
-		assertEquals(TestValues.MATCH, SdlDisconnectedReason.RESOURCE_CONSTRAINT, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(AppInterfaceUnregisteredReason.RESOURCE_CONSTRAINT));
-		assertNull(TestValues.MATCH, SdlDisconnectedReason.convertAppInterfaceUnregisteredReason(null));
-	}
-	
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java
index e2cc0294a..5b296a85f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SeatMemoryActionTypeTests.java
@@ -14,60 +14,60 @@ import java.util.List;
  */
 public class SeatMemoryActionTypeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "SAVE";
-		SeatMemoryActionType enumSave = SeatMemoryActionType.valueForString(example);
-		example = "RESTORE";
-		SeatMemoryActionType enumRestore = SeatMemoryActionType.valueForString(example);
-		example = "NONE";
-		SeatMemoryActionType enumNone = SeatMemoryActionType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "SAVE";
+        SeatMemoryActionType enumSave = SeatMemoryActionType.valueForString(example);
+        example = "RESTORE";
+        SeatMemoryActionType enumRestore = SeatMemoryActionType.valueForString(example);
+        example = "NONE";
+        SeatMemoryActionType enumNone = SeatMemoryActionType.valueForString(example);
 
-		assertNotNull("SAVE returned null", enumSave);
-		assertNotNull("RESTORE returned null", enumRestore);
-		assertNotNull("NONE returned null", enumNone);
-	}
+        assertNotNull("SAVE returned null", enumSave);
+        assertNotNull("RESTORE returned null", enumRestore);
+        assertNotNull("NONE returned null", enumNone);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "sAVE";
-		try {
-			SeatMemoryActionType temp = SeatMemoryActionType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "sAVE";
+        try {
+            SeatMemoryActionType temp = SeatMemoryActionType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			SeatMemoryActionType temp = SeatMemoryActionType.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            SeatMemoryActionType temp = SeatMemoryActionType.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of SeatMemoryActionType.
-	 */
-	public void testListEnum() {
-		List<SeatMemoryActionType> enumValueList = Arrays.asList(SeatMemoryActionType.values());
+    /**
+     * Verifies the possible enum values of SeatMemoryActionType.
+     */
+    public void testListEnum() {
+        List<SeatMemoryActionType> enumValueList = Arrays.asList(SeatMemoryActionType.values());
 
-		List<SeatMemoryActionType> enumTestList = new ArrayList<SeatMemoryActionType>();
-		enumTestList.add(SeatMemoryActionType.SAVE);
-		enumTestList.add(SeatMemoryActionType.RESTORE);
-		enumTestList.add(SeatMemoryActionType.NONE);
+        List<SeatMemoryActionType> enumTestList = new ArrayList<SeatMemoryActionType>();
+        enumTestList.add(SeatMemoryActionType.SAVE);
+        enumTestList.add(SeatMemoryActionType.RESTORE);
+        enumTestList.add(SeatMemoryActionType.NONE);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java
index f2484ff9e..670e24909 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ServiceUpdateReasonTests.java
@@ -14,71 +14,69 @@ import java.util.List;
  */
 public class ServiceUpdateReasonTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "PUBLISHED";
-		ServiceUpdateReason enumPublished = ServiceUpdateReason.valueForString(example);
-		example = "REMOVED";
-		ServiceUpdateReason enumRemoved = ServiceUpdateReason.valueForString(example);
-		example = "ACTIVATED";
-		ServiceUpdateReason enumActivated = ServiceUpdateReason.valueForString(example);
-		example = "DEACTIVATED";
-		ServiceUpdateReason enumDeactivated = ServiceUpdateReason.valueForString(example);
-		example = "MANIFEST_UPDATE";
-		ServiceUpdateReason enumManifestUpdate = ServiceUpdateReason.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "PUBLISHED";
+        ServiceUpdateReason enumPublished = ServiceUpdateReason.valueForString(example);
+        example = "REMOVED";
+        ServiceUpdateReason enumRemoved = ServiceUpdateReason.valueForString(example);
+        example = "ACTIVATED";
+        ServiceUpdateReason enumActivated = ServiceUpdateReason.valueForString(example);
+        example = "DEACTIVATED";
+        ServiceUpdateReason enumDeactivated = ServiceUpdateReason.valueForString(example);
+        example = "MANIFEST_UPDATE";
+        ServiceUpdateReason enumManifestUpdate = ServiceUpdateReason.valueForString(example);
 
 
-		assertNotNull("PUBLISHED returned null", enumPublished);
-		assertNotNull("REMOVED returned null", enumRemoved);
-		assertNotNull("ACTIVATED returned null", enumActivated);
-		assertNotNull("DEACTIVATED returned null", enumDeactivated);
-		assertNotNull("MANIFEST_UPDATE returned null", enumManifestUpdate);
-	}
+        assertNotNull("PUBLISHED returned null", enumPublished);
+        assertNotNull("REMOVED returned null", enumRemoved);
+        assertNotNull("ACTIVATED returned null", enumActivated);
+        assertNotNull("DEACTIVATED returned null", enumDeactivated);
+        assertNotNull("MANIFEST_UPDATE returned null", enumManifestUpdate);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "HalFActIvAted";
-		try {
-			ServiceUpdateReason temp = ServiceUpdateReason.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "HalFActIvAted";
+        try {
+            ServiceUpdateReason temp = ServiceUpdateReason.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			ServiceUpdateReason temp = ServiceUpdateReason.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            ServiceUpdateReason temp = ServiceUpdateReason.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of ServiceUpdateReason.
-	 */
-	public void testListEnum() {
-		List<ServiceUpdateReason> enumValueList = Arrays.asList(ServiceUpdateReason.values());
+    /**
+     * Verifies the possible enum values of ServiceUpdateReason.
+     */
+    public void testListEnum() {
+        List<ServiceUpdateReason> enumValueList = Arrays.asList(ServiceUpdateReason.values());
 
-		List<ServiceUpdateReason> enumTestList = new ArrayList<>();
-		enumTestList.add(ServiceUpdateReason.MANIFEST_UPDATE);
-		enumTestList.add(ServiceUpdateReason.ACTIVATED);
-		enumTestList.add(ServiceUpdateReason.DEACTIVATED);
-		enumTestList.add(ServiceUpdateReason.PUBLISHED);
-		enumTestList.add(ServiceUpdateReason.REMOVED);
+        List<ServiceUpdateReason> enumTestList = new ArrayList<>();
+        enumTestList.add(ServiceUpdateReason.MANIFEST_UPDATE);
+        enumTestList.add(ServiceUpdateReason.ACTIVATED);
+        enumTestList.add(ServiceUpdateReason.DEACTIVATED);
+        enumTestList.add(ServiceUpdateReason.PUBLISHED);
+        enumTestList.add(ServiceUpdateReason.REMOVED);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
index c41e9351a..dffae494a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
@@ -9,68 +9,66 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "IMAGE";
-		SoftButtonType enumImage = SoftButtonType.valueForString(example);
-		example = "BOTH";
-		SoftButtonType enumBoth = SoftButtonType.valueForString(example);
-		
-		assertNotNull("TEXT returned null", enumText);
-		assertNotNull("IMAGE returned null", enumImage);
-		assertNotNull("BOTH returned null", enumBoth);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "TEXT";
+        SoftButtonType enumText = SoftButtonType.valueForString(example);
+        example = "IMAGE";
+        SoftButtonType enumImage = SoftButtonType.valueForString(example);
+        example = "BOTH";
+        SoftButtonType enumBoth = SoftButtonType.valueForString(example);
 
+        assertNotNull("TEXT returned null", enumText);
+        assertNotNull("IMAGE returned null", enumImage);
+        assertNotNull("BOTH returned null", enumBoth);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "teXT";
-		try {
-		    SoftButtonType temp = SoftButtonType.valueForString(example);
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "teXT";
+        try {
+            SoftButtonType temp = SoftButtonType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    SoftButtonType temp = SoftButtonType.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            SoftButtonType temp = SoftButtonType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of SoftButtonType.
+     */
+    public void testListEnum() {
+        List<SoftButtonType> enumValueList = Arrays.asList(SoftButtonType.values());
 
-	/**
-	 * Verifies the possible enum values of SoftButtonType.
-	 */
-	public void testListEnum() {
- 		List<SoftButtonType> enumValueList = Arrays.asList(SoftButtonType.values());
+        List<SoftButtonType> enumTestList = new ArrayList<SoftButtonType>();
+        enumTestList.add(SoftButtonType.SBT_TEXT);
+        enumTestList.add(SoftButtonType.SBT_IMAGE);
+        enumTestList.add(SoftButtonType.SBT_BOTH);
 
-		List<SoftButtonType> enumTestList = new ArrayList<SoftButtonType>();
-		enumTestList.add(SoftButtonType.SBT_TEXT);
-		enumTestList.add(SoftButtonType.SBT_IMAGE);
-		enumTestList.add(SoftButtonType.SBT_BOTH);
-		
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
index d2da4699b..33170ea2f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
@@ -9,76 +9,74 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "SAPI_PHONEMES";
-		SpeechCapabilities enumSapiPhonemes = SpeechCapabilities.valueForString(example);
-		example = "LHPLUS_PHONEMES";
-		SpeechCapabilities enumLhplusPhonemes = SpeechCapabilities.valueForString(example);
-		example = "PRE_RECORDED";
-		SpeechCapabilities enumPreRecorded = SpeechCapabilities.valueForString(example);
-		example = "SILENCE";
-		SpeechCapabilities enumSilence = SpeechCapabilities.valueForString(example);
-		
-		assertNotNull("TEXT returned null", enumText);
-		assertNotNull("SAPI_PHONEMES returned null", enumSapiPhonemes);
-		assertNotNull("LHPLUS_PHONEMES returned null", enumLhplusPhonemes);
-		assertNotNull("PRE_RECORDED returned null", enumPreRecorded);
-		assertNotNull("SILENCE returned null", enumSilence);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "TEXT";
+        SpeechCapabilities enumText = SpeechCapabilities.valueForString(example);
+        example = "SAPI_PHONEMES";
+        SpeechCapabilities enumSapiPhonemes = SpeechCapabilities.valueForString(example);
+        example = "LHPLUS_PHONEMES";
+        SpeechCapabilities enumLhplusPhonemes = SpeechCapabilities.valueForString(example);
+        example = "PRE_RECORDED";
+        SpeechCapabilities enumPreRecorded = SpeechCapabilities.valueForString(example);
+        example = "SILENCE";
+        SpeechCapabilities enumSilence = SpeechCapabilities.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "teXT";
-		try {
-		    SpeechCapabilities temp = SpeechCapabilities.valueForString(example);
+        assertNotNull("TEXT returned null", enumText);
+        assertNotNull("SAPI_PHONEMES returned null", enumSapiPhonemes);
+        assertNotNull("LHPLUS_PHONEMES returned null", enumLhplusPhonemes);
+        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 {
+            SpeechCapabilities temp = SpeechCapabilities.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    SpeechCapabilities temp = SpeechCapabilities.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            SpeechCapabilities temp = SpeechCapabilities.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of SpeechCapabilities.
-	 */
-	public void testListEnum() {
- 		List<SpeechCapabilities> enumValueList = Arrays.asList(SpeechCapabilities.values());
+    /**
+     * Verifies the possible enum values of SpeechCapabilities.
+     */
+    public void testListEnum() {
+        List<SpeechCapabilities> enumValueList = Arrays.asList(SpeechCapabilities.values());
 
-		List<SpeechCapabilities> enumTestList = new ArrayList<SpeechCapabilities>();
-		enumTestList.add(SpeechCapabilities.TEXT);
-		enumTestList.add(SpeechCapabilities.SAPI_PHONEMES);
-		enumTestList.add(SpeechCapabilities.LHPLUS_PHONEMES);
-		enumTestList.add(SpeechCapabilities.PRE_RECORDED);
-		enumTestList.add(SpeechCapabilities.SILENCE);
-		enumTestList.add(SpeechCapabilities.FILE);
+        List<SpeechCapabilities> enumTestList = new ArrayList<SpeechCapabilities>();
+        enumTestList.add(SpeechCapabilities.TEXT);
+        enumTestList.add(SpeechCapabilities.SAPI_PHONEMES);
+        enumTestList.add(SpeechCapabilities.LHPLUS_PHONEMES);
+        enumTestList.add(SpeechCapabilities.PRE_RECORDED);
+        enumTestList.add(SpeechCapabilities.SILENCE);
+        enumTestList.add(SpeechCapabilities.FILE);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java
index b85905039..e4c81deea 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/StaticIconNameTests.java
@@ -14,918 +14,916 @@ import java.util.List;
  */
 public class StaticIconNameTests extends TestCase {
 
-	public void testValidEnums(){
-		String example = "0x29";
-		StaticIconName ACCEPT_CALL = StaticIconName.valueForString(example);
-		assertNotNull("ACCEPT_CALL returned null", ACCEPT_CALL);
+    public void testValidEnums() {
+        String example = "0x29";
+        StaticIconName ACCEPT_CALL = StaticIconName.valueForString(example);
+        assertNotNull("ACCEPT_CALL returned null", ACCEPT_CALL);
 
-		example = "0x1B";
-		StaticIconName ADD_WAYPOINT = StaticIconName.valueForString(example);
-		assertNotNull("ADD_WAYPOINT returned null", ADD_WAYPOINT);
+        example = "0x1B";
+        StaticIconName ADD_WAYPOINT = StaticIconName.valueForString(example);
+        assertNotNull("ADD_WAYPOINT returned null", ADD_WAYPOINT);
 
-		example = "0x21";
-		StaticIconName ALBUM = StaticIconName.valueForString(example);
-		assertNotNull("ALBUM returned null", ALBUM);
+        example = "0x21";
+        StaticIconName ALBUM = StaticIconName.valueForString(example);
+        assertNotNull("ALBUM returned null", ALBUM);
 
-		example = "0x3d";
-		StaticIconName AMBIENT_LIGHTING = StaticIconName.valueForString(example);
-		assertNotNull("AMBIENT_LIGHTING returned null", AMBIENT_LIGHTING);
+        example = "0x3d";
+        StaticIconName AMBIENT_LIGHTING = StaticIconName.valueForString(example);
+        assertNotNull("AMBIENT_LIGHTING returned null", AMBIENT_LIGHTING);
 
-		example = "0x40";
-		StaticIconName ARROW_NORTH = StaticIconName.valueForString(example);
-		assertNotNull("ARROW_NORTH returned null", ARROW_NORTH);
+        example = "0x40";
+        StaticIconName ARROW_NORTH = StaticIconName.valueForString(example);
+        assertNotNull("ARROW_NORTH returned null", ARROW_NORTH);
 
-		example = "0x12";
-		StaticIconName AUDIO_MUTE = StaticIconName.valueForString(example);
-		assertNotNull("AUDIO_MUTE returned null", AUDIO_MUTE);
+        example = "0x12";
+        StaticIconName AUDIO_MUTE = StaticIconName.valueForString(example);
+        assertNotNull("AUDIO_MUTE returned null", AUDIO_MUTE);
 
-		example = "0x83";
-		StaticIconName AUDIOBOOK_EPISODE = StaticIconName.valueForString(example);
-		assertNotNull("AUDIOBOOK_EPISODE returned null", AUDIOBOOK_EPISODE);
+        example = "0x83";
+        StaticIconName AUDIOBOOK_EPISODE = StaticIconName.valueForString(example);
+        assertNotNull("AUDIOBOOK_EPISODE returned null", AUDIOBOOK_EPISODE);
 
-		example = "0x82";
-		StaticIconName AUDIOBOOK_NARRATOR = StaticIconName.valueForString(example);
-		assertNotNull("AUDIOBOOK_NARRATOR returned null", AUDIOBOOK_NARRATOR);
+        example = "0x82";
+        StaticIconName AUDIOBOOK_NARRATOR = StaticIconName.valueForString(example);
+        assertNotNull("AUDIOBOOK_NARRATOR returned null", AUDIOBOOK_NARRATOR);
 
-		example = "0x45";
-		StaticIconName AUXILLARY_AUDIO = StaticIconName.valueForString(example);
-		assertNotNull("AUXILLARY_AUDIO returned null", AUXILLARY_AUDIO);
+        example = "0x45";
+        StaticIconName AUXILLARY_AUDIO = StaticIconName.valueForString(example);
+        assertNotNull("AUXILLARY_AUDIO returned null", AUXILLARY_AUDIO);
 
-		example = "0x86";
-		StaticIconName BACK = StaticIconName.valueForString(example);
-		assertNotNull("BACK returned null", BACK);
+        example = "0x86";
+        StaticIconName BACK = StaticIconName.valueForString(example);
+        assertNotNull("BACK returned null", BACK);
 
-		example = "0xF7";
-		StaticIconName BATTERY_CAPACITY_0_OF_5 = StaticIconName.valueForString(example);
-		assertNotNull("BATTERY_CAPACITY_0_OF_5 returned null", BATTERY_CAPACITY_0_OF_5);
+        example = "0xF7";
+        StaticIconName BATTERY_CAPACITY_0_OF_5 = StaticIconName.valueForString(example);
+        assertNotNull("BATTERY_CAPACITY_0_OF_5 returned null", BATTERY_CAPACITY_0_OF_5);
 
-		example = "0xF8";
-		StaticIconName BATTERY_CAPACITY_1_OF_5 = StaticIconName.valueForString(example);
-		assertNotNull("BATTERY_CAPACITY_1_OF_5 returned null", BATTERY_CAPACITY_1_OF_5);
+        example = "0xF8";
+        StaticIconName BATTERY_CAPACITY_1_OF_5 = StaticIconName.valueForString(example);
+        assertNotNull("BATTERY_CAPACITY_1_OF_5 returned null", BATTERY_CAPACITY_1_OF_5);
 
-		example = "0xF9";
-		StaticIconName BATTERY_CAPACITY_2_OF_5 = StaticIconName.valueForString(example);
-		assertNotNull("BATTERY_CAPACITY_2_OF_5 returned null", BATTERY_CAPACITY_2_OF_5);
+        example = "0xF9";
+        StaticIconName BATTERY_CAPACITY_2_OF_5 = StaticIconName.valueForString(example);
+        assertNotNull("BATTERY_CAPACITY_2_OF_5 returned null", BATTERY_CAPACITY_2_OF_5);
 
-		example = "0xFA";
-		StaticIconName BATTERY_CAPACITY_3_OF_5 = StaticIconName.valueForString(example);
-		assertNotNull("BATTERY_CAPACITY_3_OF_5 returned null", BATTERY_CAPACITY_3_OF_5);
+        example = "0xFA";
+        StaticIconName BATTERY_CAPACITY_3_OF_5 = StaticIconName.valueForString(example);
+        assertNotNull("BATTERY_CAPACITY_3_OF_5 returned null", BATTERY_CAPACITY_3_OF_5);
 
-		example = "0xf6";
-		StaticIconName BATTERY_CAPACITY_4_OF_5 = StaticIconName.valueForString(example);
-		assertNotNull("BATTERY_CAPACITY_4_OF_5 returned null", BATTERY_CAPACITY_4_OF_5);
+        example = "0xf6";
+        StaticIconName BATTERY_CAPACITY_4_OF_5 = StaticIconName.valueForString(example);
+        assertNotNull("BATTERY_CAPACITY_4_OF_5 returned null", BATTERY_CAPACITY_4_OF_5);
 
-		example = "0xFB";
-		StaticIconName BATTERY_CAPACITY_5_OF_5 = StaticIconName.valueForString(example);
-		assertNotNull("BATTERY_CAPACITY_5_OF_5 returned null", BATTERY_CAPACITY_5_OF_5);
+        example = "0xFB";
+        StaticIconName BATTERY_CAPACITY_5_OF_5 = StaticIconName.valueForString(example);
+        assertNotNull("BATTERY_CAPACITY_5_OF_5 returned null", BATTERY_CAPACITY_5_OF_5);
 
-		example = "0x09";
-		StaticIconName BLUETOOTH_AUDIO_SOURCE = StaticIconName.valueForString(example);
-		assertNotNull("BLUETOOTH_AUDIO_SOURCE returned null", BLUETOOTH_AUDIO_SOURCE);
+        example = "0x09";
+        StaticIconName BLUETOOTH_AUDIO_SOURCE = StaticIconName.valueForString(example);
+        assertNotNull("BLUETOOTH_AUDIO_SOURCE returned null", BLUETOOTH_AUDIO_SOURCE);
 
-		example = "0xcc";
-		StaticIconName BLUETOOTH1 = StaticIconName.valueForString(example);
-		assertNotNull("BLUETOOTH1 returned null", BLUETOOTH1);
+        example = "0xcc";
+        StaticIconName BLUETOOTH1 = StaticIconName.valueForString(example);
+        assertNotNull("BLUETOOTH1 returned null", BLUETOOTH1);
 
-		example = "0xCD";
-		StaticIconName BLUETOOTH2 = StaticIconName.valueForString(example);
-		assertNotNull("BLUETOOTH2 returned null", BLUETOOTH2);
+        example = "0xCD";
+        StaticIconName BLUETOOTH2 = StaticIconName.valueForString(example);
+        assertNotNull("BLUETOOTH2 returned null", BLUETOOTH2);
 
-		example = "0x77";
-		StaticIconName BROWSE = StaticIconName.valueForString(example);
-		assertNotNull("BROWSE returned null", BROWSE);
+        example = "0x77";
+        StaticIconName BROWSE = StaticIconName.valueForString(example);
+        assertNotNull("BROWSE returned null", BROWSE);
 
-		example = "0x66";
-		StaticIconName CELL_PHONE_IN_ROAMING_MODE = StaticIconName.valueForString(example);
-		assertNotNull("CELL_PHONE_IN_ROAMING_MODE returned null", CELL_PHONE_IN_ROAMING_MODE);
+        example = "0x66";
+        StaticIconName CELL_PHONE_IN_ROAMING_MODE = StaticIconName.valueForString(example);
+        assertNotNull("CELL_PHONE_IN_ROAMING_MODE returned null", CELL_PHONE_IN_ROAMING_MODE);
 
-		example = "0x67";
-		StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS = StaticIconName.valueForString(example);
-		assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS);
+        example = "0x67";
+        StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS = StaticIconName.valueForString(example);
+        assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS);
 
-		example = "0x68";
-		StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS = StaticIconName.valueForString(example);
-		assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS);
+        example = "0x68";
+        StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS = StaticIconName.valueForString(example);
+        assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS);
 
-		example = "0x69";
-		StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS = StaticIconName.valueForString(example);
-		assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS);
+        example = "0x69";
+        StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS = StaticIconName.valueForString(example);
+        assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS);
 
-		example = "0x6A";
-		StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS = StaticIconName.valueForString(example);
-		assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS);
+        example = "0x6A";
+        StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS = StaticIconName.valueForString(example);
+        assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS);
 
-		example = "0x6B";
-		StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS = StaticIconName.valueForString(example);
-		assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS);
+        example = "0x6B";
+        StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS = StaticIconName.valueForString(example);
+        assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS);
 
-		example = "0xd3";
-		StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS = StaticIconName.valueForString(example);
-		assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS);
+        example = "0xd3";
+        StaticIconName CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS = StaticIconName.valueForString(example);
+        assertNotNull("CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS returned null", CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS);
 
-		example = "0xc3";
-		StaticIconName CHANGE_LANE_LEFT = StaticIconName.valueForString(example);
-		assertNotNull("CHANGE_LANE_LEFT returned null", CHANGE_LANE_LEFT);
+        example = "0xc3";
+        StaticIconName CHANGE_LANE_LEFT = StaticIconName.valueForString(example);
+        assertNotNull("CHANGE_LANE_LEFT returned null", CHANGE_LANE_LEFT);
 
-		example = "0xc1";
-		StaticIconName CHANGE_LANE_RIGHT = StaticIconName.valueForString(example);
-		assertNotNull("CHANGE_LANE_RIGHT returned null", CHANGE_LANE_RIGHT);
+        example = "0xc1";
+        StaticIconName CHANGE_LANE_RIGHT = StaticIconName.valueForString(example);
+        assertNotNull("CHANGE_LANE_RIGHT returned null", CHANGE_LANE_RIGHT);
 
-		example = "0x27";
-		StaticIconName CHECK_BOX_CHECKED = StaticIconName.valueForString(example);
-		assertNotNull("CHECK_BOX_CHECKED returned null", CHECK_BOX_CHECKED);
+        example = "0x27";
+        StaticIconName CHECK_BOX_CHECKED = StaticIconName.valueForString(example);
+        assertNotNull("CHECK_BOX_CHECKED returned null", CHECK_BOX_CHECKED);
 
-		example = "0x28";
-		StaticIconName CHECK_BOX_UNCHECKED = StaticIconName.valueForString(example);
-		assertNotNull("CHECK_BOX_UNCHECKED returned null", CHECK_BOX_UNCHECKED);
+        example = "0x28";
+        StaticIconName CHECK_BOX_UNCHECKED = StaticIconName.valueForString(example);
+        assertNotNull("CHECK_BOX_UNCHECKED returned null", CHECK_BOX_UNCHECKED);
 
-		example = "0xd1";
-		StaticIconName CLIMATE = StaticIconName.valueForString(example);
-		assertNotNull("CLIMATE returned null", CLIMATE);
+        example = "0xd1";
+        StaticIconName CLIMATE = StaticIconName.valueForString(example);
+        assertNotNull("CLIMATE returned null", CLIMATE);
 
-		example = "0xfc";
-		StaticIconName CLOCK = StaticIconName.valueForString(example);
-		assertNotNull("CLOCK returned null", CLOCK);
+        example = "0xfc";
+        StaticIconName CLOCK = StaticIconName.valueForString(example);
+        assertNotNull("CLOCK returned null", CLOCK);
 
-		example = "0x1A";
-		StaticIconName COMPOSE = StaticIconName.valueForString(example);
-		assertNotNull("COMPOSE returned null", COMPOSE);
+        example = "0x1A";
+        StaticIconName COMPOSE = StaticIconName.valueForString(example);
+        assertNotNull("COMPOSE returned null", COMPOSE);
 
-		example = "0x5C";
-		StaticIconName CONTACT = StaticIconName.valueForString(example);
-		assertNotNull("CONTACT returned null", CONTACT);
+        example = "0x5C";
+        StaticIconName CONTACT = StaticIconName.valueForString(example);
+        assertNotNull("CONTACT returned null", CONTACT);
 
-		example = "0x42";
-		StaticIconName CONTINUE = StaticIconName.valueForString(example);
-		assertNotNull("CONTINUE returned null", CONTINUE);
+        example = "0x42";
+        StaticIconName CONTINUE = StaticIconName.valueForString(example);
+        assertNotNull("CONTINUE returned null", CONTINUE);
 
-		example = "0x7F";
-		StaticIconName DASH = StaticIconName.valueForString(example);
-		assertNotNull("DASH returned null", DASH);
+        example = "0x7F";
+        StaticIconName DASH = StaticIconName.valueForString(example);
+        assertNotNull("DASH returned null", DASH);
 
-		example = "0x87";
-		StaticIconName DATE = StaticIconName.valueForString(example);
-		assertNotNull("DATE returned null", DATE);
+        example = "0x87";
+        StaticIconName DATE = StaticIconName.valueForString(example);
+        assertNotNull("DATE returned null", DATE);
 
-		example = "0x0F";
-		StaticIconName DELETE = StaticIconName.valueForString(example);
-		assertNotNull("DELETE returned null", DELETE);
+        example = "0x0F";
+        StaticIconName DELETE = StaticIconName.valueForString(example);
+        assertNotNull("DELETE returned null", DELETE);
 
-		example = "0x94";
-		StaticIconName DESTINATION = StaticIconName.valueForString(example);
-		assertNotNull("DESTINATION returned null", DESTINATION);
+        example = "0x94";
+        StaticIconName DESTINATION = StaticIconName.valueForString(example);
+        assertNotNull("DESTINATION returned null", DESTINATION);
 
-		example = "0x4D";
-		StaticIconName DESTINATION_FERRY_AHEAD = StaticIconName.valueForString(example);
-		assertNotNull("DESTINATION_FERRY_AHEAD returned null", DESTINATION_FERRY_AHEAD);
+        example = "0x4D";
+        StaticIconName DESTINATION_FERRY_AHEAD = StaticIconName.valueForString(example);
+        assertNotNull("DESTINATION_FERRY_AHEAD returned null", DESTINATION_FERRY_AHEAD);
 
-		example = "0x2B";
-		StaticIconName EBOOKMARK = StaticIconName.valueForString(example);
-		assertNotNull("EBOOKMARK returned null", EBOOKMARK);
+        example = "0x2B";
+        StaticIconName EBOOKMARK = StaticIconName.valueForString(example);
+        assertNotNull("EBOOKMARK returned null", EBOOKMARK);
 
-		example = "0x2C";
-		StaticIconName END_CALL = StaticIconName.valueForString(example);
-		assertNotNull("END_CALL returned null", END_CALL);
+        example = "0x2C";
+        StaticIconName END_CALL = StaticIconName.valueForString(example);
+        assertNotNull("END_CALL returned null", END_CALL);
 
-		example = "0xD6";
-		StaticIconName FAIL = StaticIconName.valueForString(example);
-		assertNotNull("FAIL returned null", FAIL);
+        example = "0xD6";
+        StaticIconName FAIL = StaticIconName.valueForString(example);
+        assertNotNull("FAIL returned null", FAIL);
 
-		example = "0x08";
-		StaticIconName FAST_FORWARD_30_SECS = StaticIconName.valueForString(example);
-		assertNotNull("FAST_FORWARD_30_SECS returned null", FAST_FORWARD_30_SECS);
+        example = "0x08";
+        StaticIconName FAST_FORWARD_30_SECS = StaticIconName.valueForString(example);
+        assertNotNull("FAST_FORWARD_30_SECS returned null", FAST_FORWARD_30_SECS);
 
-		example = "0x0E";
-		StaticIconName FAVORITE_HEART = StaticIconName.valueForString(example);
-		assertNotNull("FAVORITE_HEART returned null", FAVORITE_HEART);
+        example = "0x0E";
+        StaticIconName FAVORITE_HEART = StaticIconName.valueForString(example);
+        assertNotNull("FAVORITE_HEART returned null", FAVORITE_HEART);
 
-		example = "0x95";
-		StaticIconName FAVORITE_STAR = StaticIconName.valueForString(example);
-		assertNotNull("FAVORITE_STAR returned null", FAVORITE_STAR);
+        example = "0x95";
+        StaticIconName FAVORITE_STAR = StaticIconName.valueForString(example);
+        assertNotNull("FAVORITE_STAR returned null", FAVORITE_STAR);
 
-		example = "0x80";
-		StaticIconName FAX_NUMBER = StaticIconName.valueForString(example);
-		assertNotNull("FAX_NUMBER returned null", FAX_NUMBER);
+        example = "0x80";
+        StaticIconName FAX_NUMBER = StaticIconName.valueForString(example);
+        assertNotNull("FAX_NUMBER returned null", FAX_NUMBER);
 
-		example = "0x50";
-		StaticIconName FILENAME = StaticIconName.valueForString(example);
-		assertNotNull("FILENAME returned null", FILENAME);
+        example = "0x50";
+        StaticIconName FILENAME = StaticIconName.valueForString(example);
+        assertNotNull("FILENAME returned null", FILENAME);
 
-		example = "0x79";
-		StaticIconName FILTER = StaticIconName.valueForString(example);
-		assertNotNull("FILTER returned null", FILTER);
+        example = "0x79";
+        StaticIconName FILTER = StaticIconName.valueForString(example);
+        assertNotNull("FILTER returned null", FILTER);
 
-		example = "0x1C";
-		StaticIconName FOLDER = StaticIconName.valueForString(example);
-		assertNotNull("FOLDER returned null", FOLDER);
+        example = "0x1C";
+        StaticIconName FOLDER = StaticIconName.valueForString(example);
+        assertNotNull("FOLDER returned null", FOLDER);
 
-		example = "0xe9";
-		StaticIconName FUEL_PRICES = StaticIconName.valueForString(example);
-		assertNotNull("FUEL_PRICES returned null", FUEL_PRICES);
+        example = "0xe9";
+        StaticIconName FUEL_PRICES = StaticIconName.valueForString(example);
+        assertNotNull("FUEL_PRICES returned null", FUEL_PRICES);
 
-		example = "0x0c";
-		StaticIconName FULL_MAP = StaticIconName.valueForString(example);
-		assertNotNull("FULL_MAP returned null", FULL_MAP);
+        example = "0x0c";
+        StaticIconName FULL_MAP = StaticIconName.valueForString(example);
+        assertNotNull("FULL_MAP returned null", FULL_MAP);
 
-		example = "0x53";
-		StaticIconName GENERIC_PHONE_NUMBER = StaticIconName.valueForString(example);
-		assertNotNull("GENERIC_PHONE_NUMBER returned null", GENERIC_PHONE_NUMBER);
+        example = "0x53";
+        StaticIconName GENERIC_PHONE_NUMBER = StaticIconName.valueForString(example);
+        assertNotNull("GENERIC_PHONE_NUMBER returned null", GENERIC_PHONE_NUMBER);
 
-		example = "0x4E";
-		StaticIconName GENRE = StaticIconName.valueForString(example);
-		assertNotNull("GENRE returned null", GENRE);
+        example = "0x4E";
+        StaticIconName GENRE = StaticIconName.valueForString(example);
+        assertNotNull("GENRE returned null", GENRE);
 
-		example = "0xea";
-		StaticIconName GLOBAL_KEYBOARD = StaticIconName.valueForString(example);
-		assertNotNull("GLOBAL_KEYBOARD returned null", GLOBAL_KEYBOARD);
+        example = "0xea";
+        StaticIconName GLOBAL_KEYBOARD = StaticIconName.valueForString(example);
+        assertNotNull("GLOBAL_KEYBOARD returned null", GLOBAL_KEYBOARD);
 
-		example = "0xf4";
-		StaticIconName HIGHWAY_EXIT_INFORMATION = StaticIconName.valueForString(example);
-		assertNotNull("HIGHWAY_EXIT_INFORMATION returned null", HIGHWAY_EXIT_INFORMATION);
+        example = "0xf4";
+        StaticIconName HIGHWAY_EXIT_INFORMATION = StaticIconName.valueForString(example);
+        assertNotNull("HIGHWAY_EXIT_INFORMATION returned null", HIGHWAY_EXIT_INFORMATION);
 
-		example = "0x55";
-		StaticIconName HOME_PHONE_NUMBER = StaticIconName.valueForString(example);
-		assertNotNull("HOME_PHONE_NUMBER returned null", HOME_PHONE_NUMBER);
+        example = "0x55";
+        StaticIconName HOME_PHONE_NUMBER = StaticIconName.valueForString(example);
+        assertNotNull("HOME_PHONE_NUMBER returned null", HOME_PHONE_NUMBER);
 
-		example = "0x78";
-		StaticIconName HYPERLINK = StaticIconName.valueForString(example);
-		assertNotNull("HYPERLINK returned null", HYPERLINK);
+        example = "0x78";
+        StaticIconName HYPERLINK = StaticIconName.valueForString(example);
+        assertNotNull("HYPERLINK returned null", HYPERLINK);
 
-		example = "0x51";
-		StaticIconName ID3_TAG_UNKNOWN = StaticIconName.valueForString(example);
-		assertNotNull("ID3_TAG_UNKNOWN returned null", ID3_TAG_UNKNOWN);
+        example = "0x51";
+        StaticIconName ID3_TAG_UNKNOWN = StaticIconName.valueForString(example);
+        assertNotNull("ID3_TAG_UNKNOWN returned null", ID3_TAG_UNKNOWN);
 
-		example = "0x57";
-		StaticIconName INCOMING_CALLS = StaticIconName.valueForString(example);
-		assertNotNull("INCOMING_CALLS returned null", INCOMING_CALLS);
+        example = "0x57";
+        StaticIconName INCOMING_CALLS = StaticIconName.valueForString(example);
+        assertNotNull("INCOMING_CALLS returned null", INCOMING_CALLS);
 
-		example = "0x5d";
-		StaticIconName INFORMATION = StaticIconName.valueForString(example);
-		assertNotNull("INFORMATION returned null", INFORMATION);
+        example = "0x5d";
+        StaticIconName INFORMATION = StaticIconName.valueForString(example);
+        assertNotNull("INFORMATION returned null", INFORMATION);
 
-		example = "0x0D";
-		StaticIconName IPOD_MEDIA_SOURCE = StaticIconName.valueForString(example);
-		assertNotNull("IPOD_MEDIA_SOURCE returned null", IPOD_MEDIA_SOURCE);
+        example = "0x0D";
+        StaticIconName IPOD_MEDIA_SOURCE = StaticIconName.valueForString(example);
+        assertNotNull("IPOD_MEDIA_SOURCE returned null", IPOD_MEDIA_SOURCE);
 
-		example = "0x02";
-		StaticIconName JOIN_CALLS = StaticIconName.valueForString(example);
-		assertNotNull("JOIN_CALLS returned null", JOIN_CALLS);
+        example = "0x02";
+        StaticIconName JOIN_CALLS = StaticIconName.valueForString(example);
+        assertNotNull("JOIN_CALLS returned null", JOIN_CALLS);
 
-		example = "0x46";
-		StaticIconName KEEP_LEFT = StaticIconName.valueForString(example);
-		assertNotNull("KEEP_LEFT returned null", KEEP_LEFT);
+        example = "0x46";
+        StaticIconName KEEP_LEFT = StaticIconName.valueForString(example);
+        assertNotNull("KEEP_LEFT returned null", KEEP_LEFT);
 
-		example = "0x48";
-		StaticIconName KEEP_RIGHT = StaticIconName.valueForString(example);
-		assertNotNull("KEEP_RIGHT returned null", KEEP_RIGHT);
+        example = "0x48";
+        StaticIconName KEEP_RIGHT = StaticIconName.valueForString(example);
+        assertNotNull("KEEP_RIGHT returned null", KEEP_RIGHT);
 
-		example = "0x7D";
-		StaticIconName KEY = StaticIconName.valueForString(example);
-		assertNotNull("KEY returned null", KEY);
+        example = "0x7D";
+        StaticIconName KEY = StaticIconName.valueForString(example);
+        assertNotNull("KEY returned null", KEY);
 
-		example = "0x9f";
-		StaticIconName LEFT = StaticIconName.valueForString(example);
-		assertNotNull("LEFT returned null", LEFT);
+        example = "0x9f";
+        StaticIconName LEFT = StaticIconName.valueForString(example);
+        assertNotNull("LEFT returned null", LEFT);
 
-		example = "0x4B";
-		StaticIconName LEFT_ARROW = StaticIconName.valueForString(example);
-		assertNotNull("LEFT_ARROW returned null", LEFT_ARROW);
+        example = "0x4B";
+        StaticIconName LEFT_ARROW = StaticIconName.valueForString(example);
+        assertNotNull("LEFT_ARROW returned null", LEFT_ARROW);
 
-		example = "0xaf";
-		StaticIconName LEFT_EXIT = StaticIconName.valueForString(example);
-		assertNotNull("LEFT_EXIT returned null", LEFT_EXIT);
+        example = "0xaf";
+        StaticIconName LEFT_EXIT = StaticIconName.valueForString(example);
+        assertNotNull("LEFT_EXIT returned null", LEFT_EXIT);
 
-		example = "0x06";
-		StaticIconName LINE_IN_AUDIO_SOURCE = StaticIconName.valueForString(example);
-		assertNotNull("LINE_IN_AUDIO_SOURCE returned null", LINE_IN_AUDIO_SOURCE);
+        example = "0x06";
+        StaticIconName LINE_IN_AUDIO_SOURCE = StaticIconName.valueForString(example);
+        assertNotNull("LINE_IN_AUDIO_SOURCE returned null", LINE_IN_AUDIO_SOURCE);
 
-		example = "0x22";
-		StaticIconName LOCKED = StaticIconName.valueForString(example);
-		assertNotNull("LOCKED returned null", LOCKED);
+        example = "0x22";
+        StaticIconName LOCKED = StaticIconName.valueForString(example);
+        assertNotNull("LOCKED returned null", LOCKED);
 
-		example = "0x17";
-		StaticIconName MEDIA_CONTROL_LEFT_ARROW = StaticIconName.valueForString(example);
-		assertNotNull("MEDIA_CONTROL_LEFT_ARROW returned null", MEDIA_CONTROL_LEFT_ARROW);
+        example = "0x17";
+        StaticIconName MEDIA_CONTROL_LEFT_ARROW = StaticIconName.valueForString(example);
+        assertNotNull("MEDIA_CONTROL_LEFT_ARROW returned null", MEDIA_CONTROL_LEFT_ARROW);
 
-		example = "0x20";
-		StaticIconName MEDIA_CONTROL_RECORDING = StaticIconName.valueForString(example);
-		assertNotNull("MEDIA_CONTROL_RECORDING returned null", MEDIA_CONTROL_RECORDING);
+        example = "0x20";
+        StaticIconName MEDIA_CONTROL_RECORDING = StaticIconName.valueForString(example);
+        assertNotNull("MEDIA_CONTROL_RECORDING returned null", MEDIA_CONTROL_RECORDING);
 
-		example = "0x15";
-		StaticIconName MEDIA_CONTROL_RIGHT_ARROW = StaticIconName.valueForString(example);
-		assertNotNull("MEDIA_CONTROL_RIGHT_ARROW returned null", MEDIA_CONTROL_RIGHT_ARROW);
+        example = "0x15";
+        StaticIconName MEDIA_CONTROL_RIGHT_ARROW = StaticIconName.valueForString(example);
+        assertNotNull("MEDIA_CONTROL_RIGHT_ARROW returned null", MEDIA_CONTROL_RIGHT_ARROW);
 
-		example = "0x16";
-		StaticIconName MEDIA_CONTROL_STOP = StaticIconName.valueForString(example);
-		assertNotNull("MEDIA_CONTROL_STOP returned null", MEDIA_CONTROL_STOP);
+        example = "0x16";
+        StaticIconName MEDIA_CONTROL_STOP = StaticIconName.valueForString(example);
+        assertNotNull("MEDIA_CONTROL_STOP returned null", MEDIA_CONTROL_STOP);
 
-		example = "0xe8";
-		StaticIconName MICROPHONE = StaticIconName.valueForString(example);
-		assertNotNull("MICROPHONE returned null", MICROPHONE);
+        example = "0xe8";
+        StaticIconName MICROPHONE = StaticIconName.valueForString(example);
+        assertNotNull("MICROPHONE returned null", MICROPHONE);
 
-		example = "0x58";
-		StaticIconName MISSED_CALLS = StaticIconName.valueForString(example);
-		assertNotNull("MISSED_CALLS returned null", MISSED_CALLS);
+        example = "0x58";
+        StaticIconName MISSED_CALLS = StaticIconName.valueForString(example);
+        assertNotNull("MISSED_CALLS returned null", MISSED_CALLS);
 
-		example = "0x54";
-		StaticIconName MOBILE_PHONE_NUMBER = StaticIconName.valueForString(example);
-		assertNotNull("MOBILE_PHONE_NUMBER returned null", MOBILE_PHONE_NUMBER);
+        example = "0x54";
+        StaticIconName MOBILE_PHONE_NUMBER = StaticIconName.valueForString(example);
+        assertNotNull("MOBILE_PHONE_NUMBER returned null", MOBILE_PHONE_NUMBER);
 
-		example = "0xE5";
-		StaticIconName MOVE_DOWN = StaticIconName.valueForString(example);
-		assertNotNull("MOVE_DOWN returned null", MOVE_DOWN);
+        example = "0xE5";
+        StaticIconName MOVE_DOWN = StaticIconName.valueForString(example);
+        assertNotNull("MOVE_DOWN returned null", MOVE_DOWN);
 
-		example = "0xe4";
-		StaticIconName MOVE_UP = StaticIconName.valueForString(example);
-		assertNotNull("MOVE_UP returned null", MOVE_UP);
+        example = "0xe4";
+        StaticIconName MOVE_UP = StaticIconName.valueForString(example);
+        assertNotNull("MOVE_UP returned null", MOVE_UP);
 
-		example = "0x24";
-		StaticIconName MP3_TAG_ARTIST = StaticIconName.valueForString(example);
-		assertNotNull("MP3_TAG_ARTIST returned null", MP3_TAG_ARTIST);
+        example = "0x24";
+        StaticIconName MP3_TAG_ARTIST = StaticIconName.valueForString(example);
+        assertNotNull("MP3_TAG_ARTIST returned null", MP3_TAG_ARTIST);
 
-		example = "0x8e";
-		StaticIconName NAVIGATION = StaticIconName.valueForString(example);
-		assertNotNull("NAVIGATION returned null", NAVIGATION);
+        example = "0x8e";
+        StaticIconName NAVIGATION = StaticIconName.valueForString(example);
+        assertNotNull("NAVIGATION returned null", NAVIGATION);
 
-		example = "0x0a";
-		StaticIconName NAVIGATION_CURRENT_DIRECTION = StaticIconName.valueForString(example);
-		assertNotNull("NAVIGATION_CURRENT_DIRECTION returned null", NAVIGATION_CURRENT_DIRECTION);
+        example = "0x0a";
+        StaticIconName NAVIGATION_CURRENT_DIRECTION = StaticIconName.valueForString(example);
+        assertNotNull("NAVIGATION_CURRENT_DIRECTION returned null", NAVIGATION_CURRENT_DIRECTION);
 
-		example = "0x14";
-		StaticIconName NEGATIVE_RATING_THUMBS_DOWN = StaticIconName.valueForString(example);
-		assertNotNull("NEGATIVE_RATING_THUMBS_DOWN returned null", NEGATIVE_RATING_THUMBS_DOWN);
+        example = "0x14";
+        StaticIconName NEGATIVE_RATING_THUMBS_DOWN = StaticIconName.valueForString(example);
+        assertNotNull("NEGATIVE_RATING_THUMBS_DOWN returned null", NEGATIVE_RATING_THUMBS_DOWN);
 
-		example = "0x5E";
-		StaticIconName NEW = StaticIconName.valueForString(example);
-		assertNotNull("NEW returned null", NEW);
+        example = "0x5E";
+        StaticIconName NEW = StaticIconName.valueForString(example);
+        assertNotNull("NEW returned null", NEW);
 
-		example = "0x56";
-		StaticIconName OFFICE_PHONE_NUMBER = StaticIconName.valueForString(example);
-		assertNotNull("OFFICE_PHONE_NUMBER returned null", OFFICE_PHONE_NUMBER);
+        example = "0x56";
+        StaticIconName OFFICE_PHONE_NUMBER = StaticIconName.valueForString(example);
+        assertNotNull("OFFICE_PHONE_NUMBER returned null", OFFICE_PHONE_NUMBER);
 
-		example = "0x5F";
-		StaticIconName OPENED = StaticIconName.valueForString(example);
-		assertNotNull("OPENED returned null", OPENED);
+        example = "0x5F";
+        StaticIconName OPENED = StaticIconName.valueForString(example);
+        assertNotNull("OPENED returned null", OPENED);
 
-		example = "0x96";
-		StaticIconName ORIGIN = StaticIconName.valueForString(example);
-		assertNotNull("ORIGIN returned null", ORIGIN);
+        example = "0x96";
+        StaticIconName ORIGIN = StaticIconName.valueForString(example);
+        assertNotNull("ORIGIN returned null", ORIGIN);
 
-		example = "0x59";
-		StaticIconName OUTGOING_CALLS = StaticIconName.valueForString(example);
-		assertNotNull("OUTGOING_CALLS returned null", OUTGOING_CALLS);
+        example = "0x59";
+        StaticIconName OUTGOING_CALLS = StaticIconName.valueForString(example);
+        assertNotNull("OUTGOING_CALLS returned null", OUTGOING_CALLS);
 
-		example = "0x1D";
-		StaticIconName PHONE_CALL_1 = StaticIconName.valueForString(example);
-		assertNotNull("PHONE_CALL_1 returned null", PHONE_CALL_1);
+        example = "0x1D";
+        StaticIconName PHONE_CALL_1 = StaticIconName.valueForString(example);
+        assertNotNull("PHONE_CALL_1 returned null", PHONE_CALL_1);
 
-		example = "0x1E";
-		StaticIconName PHONE_CALL_2 = StaticIconName.valueForString(example);
-		assertNotNull("PHONE_CALL_2 returned null", PHONE_CALL_2);
+        example = "0x1E";
+        StaticIconName PHONE_CALL_2 = StaticIconName.valueForString(example);
+        assertNotNull("PHONE_CALL_2 returned null", PHONE_CALL_2);
 
-		example = "0x03";
-		StaticIconName PHONE_DEVICE = StaticIconName.valueForString(example);
-		assertNotNull("PHONE_DEVICE returned null", PHONE_DEVICE);
+        example = "0x03";
+        StaticIconName PHONE_DEVICE = StaticIconName.valueForString(example);
+        assertNotNull("PHONE_DEVICE returned null", PHONE_DEVICE);
 
-		example = "0x81";
-		StaticIconName PHONEBOOK = StaticIconName.valueForString(example);
-		assertNotNull("PHONEBOOK returned null", PHONEBOOK);
+        example = "0x81";
+        StaticIconName PHONEBOOK = StaticIconName.valueForString(example);
+        assertNotNull("PHONEBOOK returned null", PHONEBOOK);
 
-		example = "0x88";
-		StaticIconName PHOTO = StaticIconName.valueForString(example);
-		assertNotNull("PHOTO returned null", PHOTO);
+        example = "0x88";
+        StaticIconName PHOTO = StaticIconName.valueForString(example);
+        assertNotNull("PHOTO returned null", PHOTO);
 
-		example = "0xD0";
-		StaticIconName PLAY = StaticIconName.valueForString(example);
-		assertNotNull("PLAY returned null", PLAY);
+        example = "0xD0";
+        StaticIconName PLAY = StaticIconName.valueForString(example);
+        assertNotNull("PLAY returned null", PLAY);
 
-		example = "0x4F";
-		StaticIconName PLAYLIST = StaticIconName.valueForString(example);
-		assertNotNull("PLAYLIST returned null", PLAYLIST);
+        example = "0x4F";
+        StaticIconName PLAYLIST = StaticIconName.valueForString(example);
+        assertNotNull("PLAYLIST returned null", PLAYLIST);
 
-		example = "0x76";
-		StaticIconName POPUP = StaticIconName.valueForString(example);
-		assertNotNull("POPUP returned null", POPUP);
+        example = "0x76";
+        StaticIconName POPUP = StaticIconName.valueForString(example);
+        assertNotNull("POPUP returned null", POPUP);
 
-		example = "0x13";
-		StaticIconName POSITIVE_RATING_THUMBS_UP = StaticIconName.valueForString(example);
-		assertNotNull("POSITIVE_RATING_THUMBS_UP returned null", POSITIVE_RATING_THUMBS_UP);
+        example = "0x13";
+        StaticIconName POSITIVE_RATING_THUMBS_UP = StaticIconName.valueForString(example);
+        assertNotNull("POSITIVE_RATING_THUMBS_UP returned null", POSITIVE_RATING_THUMBS_UP);
 
-		example = "0x5b";
-		StaticIconName POWER = StaticIconName.valueForString(example);
-		assertNotNull("POWER returned null", POWER);
+        example = "0x5b";
+        StaticIconName POWER = StaticIconName.valueForString(example);
+        assertNotNull("POWER returned null", POWER);
 
-		example = "0x1F";
-		StaticIconName PRIMARY_PHONE = StaticIconName.valueForString(example);
-		assertNotNull("PRIMARY_PHONE returned null", PRIMARY_PHONE);
+        example = "0x1F";
+        StaticIconName PRIMARY_PHONE = StaticIconName.valueForString(example);
+        assertNotNull("PRIMARY_PHONE returned null", PRIMARY_PHONE);
 
-		example = "0x25";
-		StaticIconName RADIO_BUTTON_CHECKED = StaticIconName.valueForString(example);
-		assertNotNull("RADIO_BUTTON_CHECKED returned null", RADIO_BUTTON_CHECKED);
+        example = "0x25";
+        StaticIconName RADIO_BUTTON_CHECKED = StaticIconName.valueForString(example);
+        assertNotNull("RADIO_BUTTON_CHECKED returned null", RADIO_BUTTON_CHECKED);
 
-		example = "0x26";
-		StaticIconName RADIO_BUTTON_UNCHECKED = StaticIconName.valueForString(example);
-		assertNotNull("RADIO_BUTTON_UNCHECKED returned null", RADIO_BUTTON_UNCHECKED);
+        example = "0x26";
+        StaticIconName RADIO_BUTTON_UNCHECKED = StaticIconName.valueForString(example);
+        assertNotNull("RADIO_BUTTON_UNCHECKED returned null", RADIO_BUTTON_UNCHECKED);
 
-		example = "0xe7";
-		StaticIconName RECENT_CALLS = StaticIconName.valueForString(example);
-		assertNotNull("RECENT_CALLS returned null", RECENT_CALLS);
+        example = "0xe7";
+        StaticIconName RECENT_CALLS = StaticIconName.valueForString(example);
+        assertNotNull("RECENT_CALLS returned null", RECENT_CALLS);
 
-		example = "0xf2";
-		StaticIconName RECENT_DESTINATIONS = StaticIconName.valueForString(example);
-		assertNotNull("RECENT_DESTINATIONS returned null", RECENT_DESTINATIONS);
+        example = "0xf2";
+        StaticIconName RECENT_DESTINATIONS = StaticIconName.valueForString(example);
+        assertNotNull("RECENT_DESTINATIONS returned null", RECENT_DESTINATIONS);
 
-		example = "0x19";
-		StaticIconName REDO = StaticIconName.valueForString(example);
-		assertNotNull("REDO returned null", REDO);
+        example = "0x19";
+        StaticIconName REDO = StaticIconName.valueForString(example);
+        assertNotNull("REDO returned null", REDO);
 
-		example = "0x97";
-		StaticIconName REFRESH = StaticIconName.valueForString(example);
-		assertNotNull("REFRESH returned null", REFRESH);
+        example = "0x97";
+        StaticIconName REFRESH = StaticIconName.valueForString(example);
+        assertNotNull("REFRESH returned null", REFRESH);
 
-		example = "0x7E";
-		StaticIconName REMOTE_DIAGNOSTICS_CHECK_ENGINE = StaticIconName.valueForString(example);
-		assertNotNull("REMOTE_DIAGNOSTICS_CHECK_ENGINE returned null", REMOTE_DIAGNOSTICS_CHECK_ENGINE);
+        example = "0x7E";
+        StaticIconName REMOTE_DIAGNOSTICS_CHECK_ENGINE = StaticIconName.valueForString(example);
+        assertNotNull("REMOTE_DIAGNOSTICS_CHECK_ENGINE returned null", REMOTE_DIAGNOSTICS_CHECK_ENGINE);
 
-		example = "0xac";
-		StaticIconName RENDERED_911_ASSIST = StaticIconName.valueForString(example);
-		assertNotNull("RENDERED_911_ASSIST returned null", RENDERED_911_ASSIST);
+        example = "0xac";
+        StaticIconName RENDERED_911_ASSIST = StaticIconName.valueForString(example);
+        assertNotNull("RENDERED_911_ASSIST returned null", RENDERED_911_ASSIST);
 
-		example = "0xe6";
-		StaticIconName REPEAT = StaticIconName.valueForString(example);
-		assertNotNull("REPEAT returned null", REPEAT);
+        example = "0xe6";
+        StaticIconName REPEAT = StaticIconName.valueForString(example);
+        assertNotNull("REPEAT returned null", REPEAT);
 
-		example = "0x73";
-		StaticIconName REPEAT_PLAY = StaticIconName.valueForString(example);
-		assertNotNull("REPEAT_PLAY returned null", REPEAT_PLAY);
+        example = "0x73";
+        StaticIconName REPEAT_PLAY = StaticIconName.valueForString(example);
+        assertNotNull("REPEAT_PLAY returned null", REPEAT_PLAY);
 
-		example = "0x04";
-		StaticIconName REPLY = StaticIconName.valueForString(example);
-		assertNotNull("REPLY returned null", REPLY);
+        example = "0x04";
+        StaticIconName REPLY = StaticIconName.valueForString(example);
+        assertNotNull("REPLY returned null", REPLY);
 
-		example = "0x07";
-		StaticIconName REWIND_30_SECS = StaticIconName.valueForString(example);
-		assertNotNull("REWIND_30_SECS returned null", REWIND_30_SECS);
+        example = "0x07";
+        StaticIconName REWIND_30_SECS = StaticIconName.valueForString(example);
+        assertNotNull("REWIND_30_SECS returned null", REWIND_30_SECS);
 
-		example = "0xa3";
-		StaticIconName RIGHT = StaticIconName.valueForString(example);
-		assertNotNull("RIGHT returned null", RIGHT);
+        example = "0xa3";
+        StaticIconName RIGHT = StaticIconName.valueForString(example);
+        assertNotNull("RIGHT returned null", RIGHT);
 
-		example = "0xb1";
-		StaticIconName RIGHT_EXIT = StaticIconName.valueForString(example);
-		assertNotNull("RIGHT_EXIT returned null", RIGHT_EXIT);
+        example = "0xb1";
+        StaticIconName RIGHT_EXIT = StaticIconName.valueForString(example);
+        assertNotNull("RIGHT_EXIT returned null", RIGHT_EXIT);
 
-		example = "0x5A";
-		StaticIconName RINGTONES = StaticIconName.valueForString(example);
-		assertNotNull("RINGTONES returned null", RINGTONES);
+        example = "0x5A";
+        StaticIconName RINGTONES = StaticIconName.valueForString(example);
+        assertNotNull("RINGTONES returned null", RINGTONES);
 
-		example = "0xee";
-		StaticIconName ROUNDABOUT_LEFT_HAND_1 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_LEFT_HAND_1 returned null", ROUNDABOUT_LEFT_HAND_1);
+        example = "0xee";
+        StaticIconName ROUNDABOUT_LEFT_HAND_1 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_LEFT_HAND_1 returned null", ROUNDABOUT_LEFT_HAND_1);
 
-		example = "0x8c";
-		StaticIconName ROUNDABOUT_LEFT_HAND_2 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_LEFT_HAND_2 returned null", ROUNDABOUT_LEFT_HAND_2);
+        example = "0x8c";
+        StaticIconName ROUNDABOUT_LEFT_HAND_2 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_LEFT_HAND_2 returned null", ROUNDABOUT_LEFT_HAND_2);
 
-		example = "0x84";
-		StaticIconName ROUNDABOUT_LEFT_HAND_3 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_LEFT_HAND_3 returned null", ROUNDABOUT_LEFT_HAND_3);
+        example = "0x84";
+        StaticIconName ROUNDABOUT_LEFT_HAND_3 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_LEFT_HAND_3 returned null", ROUNDABOUT_LEFT_HAND_3);
 
-		example = "0x72";
-		StaticIconName ROUNDABOUT_LEFT_HAND_4 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_LEFT_HAND_4 returned null", ROUNDABOUT_LEFT_HAND_4);
+        example = "0x72";
+        StaticIconName ROUNDABOUT_LEFT_HAND_4 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_LEFT_HAND_4 returned null", ROUNDABOUT_LEFT_HAND_4);
 
-		example = "0x6e";
-		StaticIconName ROUNDABOUT_LEFT_HAND_5 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_LEFT_HAND_5 returned null", ROUNDABOUT_LEFT_HAND_5);
+        example = "0x6e";
+        StaticIconName ROUNDABOUT_LEFT_HAND_5 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_LEFT_HAND_5 returned null", ROUNDABOUT_LEFT_HAND_5);
 
-		example = "0x64";
-		StaticIconName ROUNDABOUT_LEFT_HAND_6 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_LEFT_HAND_6 returned null", ROUNDABOUT_LEFT_HAND_6);
+        example = "0x64";
+        StaticIconName ROUNDABOUT_LEFT_HAND_6 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_LEFT_HAND_6 returned null", ROUNDABOUT_LEFT_HAND_6);
 
-		example = "0x60";
-		StaticIconName ROUNDABOUT_LEFT_HAND_7 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_LEFT_HAND_7 returned null", ROUNDABOUT_LEFT_HAND_7);
+        example = "0x60";
+        StaticIconName ROUNDABOUT_LEFT_HAND_7 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_LEFT_HAND_7 returned null", ROUNDABOUT_LEFT_HAND_7);
 
-		example = "0x62";
-		StaticIconName ROUNDABOUT_RIGHT_HAND_1 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_RIGHT_HAND_1 returned null", ROUNDABOUT_RIGHT_HAND_1);
+        example = "0x62";
+        StaticIconName ROUNDABOUT_RIGHT_HAND_1 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_RIGHT_HAND_1 returned null", ROUNDABOUT_RIGHT_HAND_1);
 
-		example = "0x6c";
-		StaticIconName ROUNDABOUT_RIGHT_HAND_2 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_RIGHT_HAND_2 returned null", ROUNDABOUT_RIGHT_HAND_2);
+        example = "0x6c";
+        StaticIconName ROUNDABOUT_RIGHT_HAND_2 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_RIGHT_HAND_2 returned null", ROUNDABOUT_RIGHT_HAND_2);
 
-		example = "0x70";
-		StaticIconName ROUNDABOUT_RIGHT_HAND_3 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_RIGHT_HAND_3 returned null", ROUNDABOUT_RIGHT_HAND_3);
+        example = "0x70";
+        StaticIconName ROUNDABOUT_RIGHT_HAND_3 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_RIGHT_HAND_3 returned null", ROUNDABOUT_RIGHT_HAND_3);
 
-		example = "0x7a";
-		StaticIconName ROUNDABOUT_RIGHT_HAND_4 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_RIGHT_HAND_4 returned null", ROUNDABOUT_RIGHT_HAND_4);
+        example = "0x7a";
+        StaticIconName ROUNDABOUT_RIGHT_HAND_4 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_RIGHT_HAND_4 returned null", ROUNDABOUT_RIGHT_HAND_4);
 
-		example = "0x8a";
-		StaticIconName ROUNDABOUT_RIGHT_HAND_5 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_RIGHT_HAND_5 returned null", ROUNDABOUT_RIGHT_HAND_5);
+        example = "0x8a";
+        StaticIconName ROUNDABOUT_RIGHT_HAND_5 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_RIGHT_HAND_5 returned null", ROUNDABOUT_RIGHT_HAND_5);
 
-		example = "0xec";
-		StaticIconName ROUNDABOUT_RIGHT_HAND_6 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_RIGHT_HAND_6 returned null", ROUNDABOUT_RIGHT_HAND_6);
+        example = "0xec";
+        StaticIconName ROUNDABOUT_RIGHT_HAND_6 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_RIGHT_HAND_6 returned null", ROUNDABOUT_RIGHT_HAND_6);
 
-		example = "0xf0";
-		StaticIconName ROUNDABOUT_RIGHT_HAND_7 = StaticIconName.valueForString(example);
-		assertNotNull("ROUNDABOUT_RIGHT_HAND_7 returned null", ROUNDABOUT_RIGHT_HAND_7);
+        example = "0xf0";
+        StaticIconName ROUNDABOUT_RIGHT_HAND_7 = StaticIconName.valueForString(example);
+        assertNotNull("ROUNDABOUT_RIGHT_HAND_7 returned null", ROUNDABOUT_RIGHT_HAND_7);
 
-		example = "0x89";
-		StaticIconName RSS = StaticIconName.valueForString(example);
-		assertNotNull("RSS returned null", RSS);
+        example = "0x89";
+        StaticIconName RSS = StaticIconName.valueForString(example);
+        assertNotNull("RSS returned null", RSS);
 
-		example = "0x49";
-		StaticIconName SETTINGS = StaticIconName.valueForString(example);
-		assertNotNull("SETTINGS returned null", SETTINGS);
+        example = "0x49";
+        StaticIconName SETTINGS = StaticIconName.valueForString(example);
+        assertNotNull("SETTINGS returned null", SETTINGS);
 
-		example = "0xa5";
-		StaticIconName SHARP_LEFT = StaticIconName.valueForString(example);
-		assertNotNull("SHARP_LEFT returned null", SHARP_LEFT);
+        example = "0xa5";
+        StaticIconName SHARP_LEFT = StaticIconName.valueForString(example);
+        assertNotNull("SHARP_LEFT returned null", SHARP_LEFT);
 
-		example = "0xe1";
-		StaticIconName SHOW = StaticIconName.valueForString(example);
-		assertNotNull("SHOW returned null", SHOW);
+        example = "0xe1";
+        StaticIconName SHOW = StaticIconName.valueForString(example);
+        assertNotNull("SHOW returned null", SHOW);
 
-		example = "0x74";
-		StaticIconName SHUFFLE_PLAY = StaticIconName.valueForString(example);
-		assertNotNull("SHUFFLE_PLAY returned null", SHUFFLE_PLAY);
+        example = "0x74";
+        StaticIconName SHUFFLE_PLAY = StaticIconName.valueForString(example);
+        assertNotNull("SHUFFLE_PLAY returned null", SHUFFLE_PLAY);
 
-		example = "0xab";
-		StaticIconName SKI_PLACES = StaticIconName.valueForString(example);
-		assertNotNull("SKI_PLACES returned null", SKI_PLACES);
+        example = "0xab";
+        StaticIconName SKI_PLACES = StaticIconName.valueForString(example);
+        assertNotNull("SKI_PLACES returned null", SKI_PLACES);
 
-		example = "0x9d";
-		StaticIconName SLIGHT_LEFT = StaticIconName.valueForString(example);
-		assertNotNull("SLIGHT_LEFT returned null", SLIGHT_LEFT);
+        example = "0x9d";
+        StaticIconName SLIGHT_LEFT = StaticIconName.valueForString(example);
+        assertNotNull("SLIGHT_LEFT returned null", SLIGHT_LEFT);
 
-		example = "0xa1";
-		StaticIconName SLIGHT_RIGHT = StaticIconName.valueForString(example);
-		assertNotNull("SLIGHT_RIGHT returned null", SLIGHT_RIGHT);
+        example = "0xa1";
+        StaticIconName SLIGHT_RIGHT = StaticIconName.valueForString(example);
+        assertNotNull("SLIGHT_RIGHT returned null", SLIGHT_RIGHT);
 
-		example = "0x05";
-		StaticIconName SMARTPHONE = StaticIconName.valueForString(example);
-		assertNotNull("SMARTPHONE returned null", SMARTPHONE);
+        example = "0x05";
+        StaticIconName SMARTPHONE = StaticIconName.valueForString(example);
+        assertNotNull("SMARTPHONE returned null", SMARTPHONE);
 
-		example = "0x7B";
-		StaticIconName SORT_LIST = StaticIconName.valueForString(example);
-		assertNotNull("SORT_LIST returned null", SORT_LIST);
+        example = "0x7B";
+        StaticIconName SORT_LIST = StaticIconName.valueForString(example);
+        assertNotNull("SORT_LIST returned null", SORT_LIST);
 
-		example = "0xE0";
-		StaticIconName SPEED_DIAL_NUMBERS_NUMBER_0 = StaticIconName.valueForString(example);
-		assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_0 returned null", SPEED_DIAL_NUMBERS_NUMBER_0);
+        example = "0xE0";
+        StaticIconName SPEED_DIAL_NUMBERS_NUMBER_0 = StaticIconName.valueForString(example);
+        assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_0 returned null", SPEED_DIAL_NUMBERS_NUMBER_0);
 
-		example = "0xD7";
-		StaticIconName SPEED_DIAL_NUMBERS_NUMBER_1 = StaticIconName.valueForString(example);
-		assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_1 returned null", SPEED_DIAL_NUMBERS_NUMBER_1);
+        example = "0xD7";
+        StaticIconName SPEED_DIAL_NUMBERS_NUMBER_1 = StaticIconName.valueForString(example);
+        assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_1 returned null", SPEED_DIAL_NUMBERS_NUMBER_1);
 
-		example = "0xD8";
-		StaticIconName SPEED_DIAL_NUMBERS_NUMBER_2 = StaticIconName.valueForString(example);
-		assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_2 returned null", SPEED_DIAL_NUMBERS_NUMBER_2);
+        example = "0xD8";
+        StaticIconName SPEED_DIAL_NUMBERS_NUMBER_2 = StaticIconName.valueForString(example);
+        assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_2 returned null", SPEED_DIAL_NUMBERS_NUMBER_2);
 
-		example = "0xD9";
-		StaticIconName SPEED_DIAL_NUMBERS_NUMBER_3 = StaticIconName.valueForString(example);
-		assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_3 returned null", SPEED_DIAL_NUMBERS_NUMBER_3);
+        example = "0xD9";
+        StaticIconName SPEED_DIAL_NUMBERS_NUMBER_3 = StaticIconName.valueForString(example);
+        assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_3 returned null", SPEED_DIAL_NUMBERS_NUMBER_3);
 
-		example = "0xDA";
-		StaticIconName SPEED_DIAL_NUMBERS_NUMBER_4 = StaticIconName.valueForString(example);
-		assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_4 returned null", SPEED_DIAL_NUMBERS_NUMBER_4);
+        example = "0xDA";
+        StaticIconName SPEED_DIAL_NUMBERS_NUMBER_4 = StaticIconName.valueForString(example);
+        assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_4 returned null", SPEED_DIAL_NUMBERS_NUMBER_4);
 
-		example = "0xDB";
-		StaticIconName SPEED_DIAL_NUMBERS_NUMBER_5 = StaticIconName.valueForString(example);
-		assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_5 returned null", SPEED_DIAL_NUMBERS_NUMBER_5);
+        example = "0xDB";
+        StaticIconName SPEED_DIAL_NUMBERS_NUMBER_5 = StaticIconName.valueForString(example);
+        assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_5 returned null", SPEED_DIAL_NUMBERS_NUMBER_5);
 
-		example = "0xDC";
-		StaticIconName SPEED_DIAL_NUMBERS_NUMBER_6 = StaticIconName.valueForString(example);
-		assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_6 returned null", SPEED_DIAL_NUMBERS_NUMBER_6);
+        example = "0xDC";
+        StaticIconName SPEED_DIAL_NUMBERS_NUMBER_6 = StaticIconName.valueForString(example);
+        assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_6 returned null", SPEED_DIAL_NUMBERS_NUMBER_6);
 
-		example = "0xDD";
-		StaticIconName SPEED_DIAL_NUMBERS_NUMBER_7 = StaticIconName.valueForString(example);
-		assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_7 returned null", SPEED_DIAL_NUMBERS_NUMBER_7);
+        example = "0xDD";
+        StaticIconName SPEED_DIAL_NUMBERS_NUMBER_7 = StaticIconName.valueForString(example);
+        assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_7 returned null", SPEED_DIAL_NUMBERS_NUMBER_7);
 
-		example = "0xDE";
-		StaticIconName SPEED_DIAL_NUMBERS_NUMBER_8 = StaticIconName.valueForString(example);
-		assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_8 returned null", SPEED_DIAL_NUMBERS_NUMBER_8);
+        example = "0xDE";
+        StaticIconName SPEED_DIAL_NUMBERS_NUMBER_8 = StaticIconName.valueForString(example);
+        assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_8 returned null", SPEED_DIAL_NUMBERS_NUMBER_8);
 
-		example = "0xDF";
-		StaticIconName SPEED_DIAL_NUMBERS_NUMBER_9 = StaticIconName.valueForString(example);
-		assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_9 returned null", SPEED_DIAL_NUMBERS_NUMBER_9);
+        example = "0xDF";
+        StaticIconName SPEED_DIAL_NUMBERS_NUMBER_9 = StaticIconName.valueForString(example);
+        assertNotNull("SPEED_DIAL_NUMBERS_NUMBER_9 returned null", SPEED_DIAL_NUMBERS_NUMBER_9);
 
-		example = "0xD5";
-		StaticIconName SUCCESS = StaticIconName.valueForString(example);
-		assertNotNull("SUCCESS returned null", SUCCESS);
-
-		example = "0x4C";
-		StaticIconName TRACK_TITLE = StaticIconName.valueForString(example);
-		assertNotNull("TRACK_TITLE returned null", TRACK_TITLE);
-
-		example = "0x2A";
-		StaticIconName TRAFFIC_REPORT = StaticIconName.valueForString(example);
-		assertNotNull("TRAFFIC_REPORT returned null", TRAFFIC_REPORT);
-
-		example = "0x10";
-		StaticIconName TURN_LIST = StaticIconName.valueForString(example);
-		assertNotNull("TURN_LIST returned null", TURN_LIST);
-
-		example = "0xad";
-		StaticIconName UTURN_LEFT_TRAFFIC = StaticIconName.valueForString(example);
-		assertNotNull("UTURN_LEFT_TRAFFIC returned null", UTURN_LEFT_TRAFFIC);
-
-		example = "0xa9";
-		StaticIconName UTURN_RIGHT_TRAFFIC = StaticIconName.valueForString(example);
-		assertNotNull("UTURN_RIGHT_TRAFFIC returned null", UTURN_RIGHT_TRAFFIC);
-
-		example = "0x18";
-		StaticIconName UNDO = StaticIconName.valueForString(example);
-		assertNotNull("UNDO returned null", UNDO);
-
-		example = "0x23";
-		StaticIconName UNLOCKED = StaticIconName.valueForString(example);
-		assertNotNull("UNLOCKED returned null", UNLOCKED);
-
-		example = "0x0B";
-		StaticIconName USB_MEDIA_AUDIO_SOURCE = StaticIconName.valueForString(example);
-		assertNotNull("USB_MEDIA_AUDIO_SOURCE returned null", USB_MEDIA_AUDIO_SOURCE);
-
-		example = "0xC7";
-		StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1 = StaticIconName.valueForString(example);
-		assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1);
-
-		example = "0xC8";
-		StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2 = StaticIconName.valueForString(example);
-		assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2);
-
-		example = "0xC9";
-		StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3 = StaticIconName.valueForString(example);
-		assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3);
-
-		example = "0xCA";
-		StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4 = StaticIconName.valueForString(example);
-		assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4);
-
-		example = "0x90";
-		StaticIconName VOICE_RECOGNITION_FAILED = StaticIconName.valueForString(example);
-		assertNotNull("VOICE_RECOGNITION_FAILED returned null", VOICE_RECOGNITION_FAILED);
-
-		example = "0x92";
-		StaticIconName VOICE_RECOGNITION_PAUSE = StaticIconName.valueForString(example);
-		assertNotNull("VOICE_RECOGNITION_PAUSE returned null", VOICE_RECOGNITION_PAUSE);
-
-		example = "0x8F";
-		StaticIconName VOICE_RECOGNITION_SUCCESSFUL = StaticIconName.valueForString(example);
-		assertNotNull("VOICE_RECOGNITION_SUCCESSFUL returned null", VOICE_RECOGNITION_SUCCESSFUL);
-
-		example = "0x11";
-		StaticIconName VOICE_RECOGNITION_SYSTEM_ACTIVE = StaticIconName.valueForString(example);
-		assertNotNull("VOICE_RECOGNITION_SYSTEM_ACTIVE returned null", VOICE_RECOGNITION_SYSTEM_ACTIVE);
-
-		example = "0x91";
-		StaticIconName VOICE_RECOGNITION_SYSTEM_LISTENING = StaticIconName.valueForString(example);
-		assertNotNull("VOICE_RECOGNITION_SYSTEM_LISTENING returned null", VOICE_RECOGNITION_SYSTEM_LISTENING);
-
-		example = "0x93";
-		StaticIconName VOICE_RECOGNITION_TRY_AGAIN = StaticIconName.valueForString(example);
-		assertNotNull("VOICE_RECOGNITION_TRY_AGAIN returned null", VOICE_RECOGNITION_TRY_AGAIN);
-
-		example = "0xfe";
-		StaticIconName WARNING = StaticIconName.valueForString(example);
-		assertNotNull("WARNING returned null", WARNING);
-
-		example = "0xeb";
-		StaticIconName WEATHER = StaticIconName.valueForString(example);
-		assertNotNull("WEATHER returned null", WEATHER);
-
-		example = "0x43";
-		StaticIconName WIFI_FULL = StaticIconName.valueForString(example);
-		assertNotNull("WIFI_FULL returned null", WIFI_FULL);
-
-		example = "0x98";
-		StaticIconName ZOOM_IN = StaticIconName.valueForString(example);
-		assertNotNull("ZOOM_IN returned null", ZOOM_IN);
-
-		example = "0x9a";
-		StaticIconName ZOOM_OUT = StaticIconName.valueForString(example);
-		assertNotNull("ZOOM_OUT returned null", ZOOM_OUT);
-	}
-
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "SoMeThInG";
-		try {
-			StaticIconName SOMETHING = StaticIconName.valueForString(example);
-			assertNull("Result of valueForString should be null.", SOMETHING);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			StaticIconName temp = StaticIconName.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
-
-	/**
-	 * Verifies the possible enum values of StaticIconNames.
-	 */
-	public void testListEnum() {
-
-		List<StaticIconName> enumValueList = Arrays.asList(StaticIconName.values());
-
-		List<StaticIconName> enumTestList = new ArrayList<>();
-		enumTestList.add(StaticIconName.ACCEPT_CALL);
-		enumTestList.add(StaticIconName.ADD_WAYPOINT);
-		enumTestList.add(StaticIconName.ALBUM);
-		enumTestList.add(StaticIconName.AMBIENT_LIGHTING);
-		enumTestList.add(StaticIconName.ARROW_NORTH);
-		enumTestList.add(StaticIconName.AUDIO_MUTE);
-		enumTestList.add(StaticIconName.AUDIOBOOK_EPISODE);
-		enumTestList.add(StaticIconName.AUDIOBOOK_NARRATOR);
-		enumTestList.add(StaticIconName.AUXILLARY_AUDIO);
-		enumTestList.add(StaticIconName.BACK);
-		enumTestList.add(StaticIconName.BATTERY_CAPACITY_0_OF_5);
-		enumTestList.add(StaticIconName.BATTERY_CAPACITY_1_OF_5);
-		enumTestList.add(StaticIconName.BATTERY_CAPACITY_2_OF_5);
-		enumTestList.add(StaticIconName.BATTERY_CAPACITY_3_OF_5);
-		enumTestList.add(StaticIconName.BATTERY_CAPACITY_4_OF_5);
-		enumTestList.add(StaticIconName.BATTERY_CAPACITY_5_OF_5);
-		enumTestList.add(StaticIconName.BLUETOOTH_AUDIO_SOURCE);
-		enumTestList.add(StaticIconName.BLUETOOTH1);
-		enumTestList.add(StaticIconName.BLUETOOTH2);
-		enumTestList.add(StaticIconName.BROWSE);
-		enumTestList.add(StaticIconName.CELL_PHONE_IN_ROAMING_MODE);
-		enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS);
-		enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS);
-		enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS);
-		enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS);
-		enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS);
-		enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS);
-		enumTestList.add(StaticIconName.CHANGE_LANE_LEFT);
-		enumTestList.add(StaticIconName.CHANGE_LANE_RIGHT);
-		enumTestList.add(StaticIconName.CHECK_BOX_CHECKED);
-		enumTestList.add(StaticIconName.CHECK_BOX_UNCHECKED);
-		enumTestList.add(StaticIconName.CLIMATE);
-		enumTestList.add(StaticIconName.CLOCK);
-		enumTestList.add(StaticIconName.COMPOSE);
-		enumTestList.add(StaticIconName.CONTACT);
-		enumTestList.add(StaticIconName.CONTINUE);
-		enumTestList.add(StaticIconName.DASH);
-		enumTestList.add(StaticIconName.DATE);
-		enumTestList.add(StaticIconName.DELETE);
-		enumTestList.add(StaticIconName.DESTINATION);
-		enumTestList.add(StaticIconName.DESTINATION_FERRY_AHEAD);
-		enumTestList.add(StaticIconName.EBOOKMARK);
-		enumTestList.add(StaticIconName.END_CALL);
-		enumTestList.add(StaticIconName.FAIL);
-		enumTestList.add(StaticIconName.FAST_FORWARD_30_SECS);
-		enumTestList.add(StaticIconName.FAVORITE_HEART);
-		enumTestList.add(StaticIconName.FAVORITE_STAR);
-		enumTestList.add(StaticIconName.FAX_NUMBER);
-		enumTestList.add(StaticIconName.FILENAME);
-		enumTestList.add(StaticIconName.FILTER);
-		enumTestList.add(StaticIconName.FOLDER);
-		enumTestList.add(StaticIconName.FUEL_PRICES);
-		enumTestList.add(StaticIconName.FULL_MAP);
-		enumTestList.add(StaticIconName.GENERIC_PHONE_NUMBER);
-		enumTestList.add(StaticIconName.GENRE);
-		enumTestList.add(StaticIconName.GLOBAL_KEYBOARD);
-		enumTestList.add(StaticIconName.HIGHWAY_EXIT_INFORMATION);
-		enumTestList.add(StaticIconName.HOME_PHONE_NUMBER);
-		enumTestList.add(StaticIconName.HYPERLINK);
-		enumTestList.add(StaticIconName.ID3_TAG_UNKNOWN);
-		enumTestList.add(StaticIconName.INCOMING_CALLS);
-		enumTestList.add(StaticIconName.INFORMATION);
-		enumTestList.add(StaticIconName.IPOD_MEDIA_SOURCE);
-		enumTestList.add(StaticIconName.JOIN_CALLS);
-		enumTestList.add(StaticIconName.KEEP_LEFT);
-		enumTestList.add(StaticIconName.KEEP_RIGHT);
-		enumTestList.add(StaticIconName.KEY);
-		enumTestList.add(StaticIconName.LEFT);
-		enumTestList.add(StaticIconName.LEFT_ARROW);
-		enumTestList.add(StaticIconName.LEFT_EXIT);
-		enumTestList.add(StaticIconName.LINE_IN_AUDIO_SOURCE);
-		enumTestList.add(StaticIconName.LOCKED);
-		enumTestList.add(StaticIconName.MEDIA_CONTROL_LEFT_ARROW);
-		enumTestList.add(StaticIconName.MEDIA_CONTROL_RECORDING);
-		enumTestList.add(StaticIconName.MEDIA_CONTROL_RIGHT_ARROW);
-		enumTestList.add(StaticIconName.MEDIA_CONTROL_STOP);
-		enumTestList.add(StaticIconName.MICROPHONE);
-		enumTestList.add(StaticIconName.MISSED_CALLS);
-		enumTestList.add(StaticIconName.MOBILE_PHONE_NUMBER);
-		enumTestList.add(StaticIconName.MOVE_DOWN);
-		enumTestList.add(StaticIconName.MOVE_UP);
-		enumTestList.add(StaticIconName.MP3_TAG_ARTIST);
-		enumTestList.add(StaticIconName.NAVIGATION);
-		enumTestList.add(StaticIconName.NAVIGATION_CURRENT_DIRECTION);
-		enumTestList.add(StaticIconName.NEGATIVE_RATING_THUMBS_DOWN);
-		enumTestList.add(StaticIconName.NEW);
-		enumTestList.add(StaticIconName.OFFICE_PHONE_NUMBER);
-		enumTestList.add(StaticIconName.OPENED);
-		enumTestList.add(StaticIconName.ORIGIN);
-		enumTestList.add(StaticIconName.OUTGOING_CALLS);
-		enumTestList.add(StaticIconName.PHONE_CALL_1);
-		enumTestList.add(StaticIconName.PHONE_CALL_2);
-		enumTestList.add(StaticIconName.PHONE_DEVICE);
-		enumTestList.add(StaticIconName.PHONEBOOK);
-		enumTestList.add(StaticIconName.PHOTO);
-		enumTestList.add(StaticIconName.PLAY);
-		enumTestList.add(StaticIconName.PLAYLIST);
-		enumTestList.add(StaticIconName.POPUP);
-		enumTestList.add(StaticIconName.POSITIVE_RATING_THUMBS_UP);
-		enumTestList.add(StaticIconName.POWER);
-		enumTestList.add(StaticIconName.PRIMARY_PHONE);
-		enumTestList.add(StaticIconName.RADIO_BUTTON_CHECKED);
-		enumTestList.add(StaticIconName.RADIO_BUTTON_UNCHECKED);
-		enumTestList.add(StaticIconName.RECENT_CALLS);
-		enumTestList.add(StaticIconName.RECENT_DESTINATIONS);
-		enumTestList.add(StaticIconName.REDO);
-		enumTestList.add(StaticIconName.REFRESH);
-		enumTestList.add(StaticIconName.REMOTE_DIAGNOSTICS_CHECK_ENGINE);
-		enumTestList.add(StaticIconName.RENDERED_911_ASSIST);
-		enumTestList.add(StaticIconName.REPEAT);
-		enumTestList.add(StaticIconName.REPEAT_PLAY);
-		enumTestList.add(StaticIconName.REPLY);
-		enumTestList.add(StaticIconName.REWIND_30_SECS);
-		enumTestList.add(StaticIconName.RIGHT);
-		enumTestList.add(StaticIconName.RIGHT_EXIT);
-		enumTestList.add(StaticIconName.RINGTONES);
-		enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_1);
-		enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_2);
-		enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_3);
-		enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_4);
-		enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_5);
-		enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_6);
-		enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_7);
-		enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_1);
-		enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_2);
-		enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_3);
-		enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_4);
-		enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_5);
-		enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_6);
-		enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_7);
-		enumTestList.add(StaticIconName.RSS);
-		enumTestList.add(StaticIconName.SETTINGS);
-		enumTestList.add(StaticIconName.SHARP_LEFT);
-		enumTestList.add(StaticIconName.SHARP_RIGHT);
-		enumTestList.add(StaticIconName.SHOW);
-		enumTestList.add(StaticIconName.SHUFFLE_PLAY);
-		enumTestList.add(StaticIconName.SKI_PLACES);
-		enumTestList.add(StaticIconName.SLIGHT_LEFT);
-		enumTestList.add(StaticIconName.SLIGHT_RIGHT);
-		enumTestList.add(StaticIconName.SMARTPHONE);
-		enumTestList.add(StaticIconName.SORT_LIST);
-		enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_0);
-		enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_1);
-		enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_2);
-		enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_3);
-		enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_4);
-		enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_5);
-		enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_6);
-		enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_7);
-		enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_8);
-		enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_9);
-		enumTestList.add(StaticIconName.SUCCESS);
-		enumTestList.add(StaticIconName.TRACK_TITLE);
-		enumTestList.add(StaticIconName.TRAFFIC_REPORT);
-		enumTestList.add(StaticIconName.TURN_LIST);
-		enumTestList.add(StaticIconName.UTURN_LEFT_TRAFFIC);
-		enumTestList.add(StaticIconName.UTURN_RIGHT_TRAFFIC);
-		enumTestList.add(StaticIconName.UNDO);
-		enumTestList.add(StaticIconName.UNLOCKED);
-		enumTestList.add(StaticIconName.USB_MEDIA_AUDIO_SOURCE);
-		enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1);
-		enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2);
-		enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3);
-		enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4);
-		enumTestList.add(StaticIconName.VOICE_RECOGNITION_FAILED);
-		enumTestList.add(StaticIconName.VOICE_RECOGNITION_PAUSE);
-		enumTestList.add(StaticIconName.VOICE_RECOGNITION_SUCCESSFUL);
-		enumTestList.add(StaticIconName.VOICE_RECOGNITION_SYSTEM_ACTIVE);
-		enumTestList.add(StaticIconName.VOICE_RECOGNITION_SYSTEM_LISTENING);
-		enumTestList.add(StaticIconName.VOICE_RECOGNITION_TRY_AGAIN);
-		enumTestList.add(StaticIconName.WARNING);
-		enumTestList.add(StaticIconName.WEATHER);
-		enumTestList.add(StaticIconName.WIFI_FULL);
-		enumTestList.add(StaticIconName.ZOOM_IN);
-		enumTestList.add(StaticIconName.ZOOM_OUT);
-
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        example = "0xD5";
+        StaticIconName SUCCESS = StaticIconName.valueForString(example);
+        assertNotNull("SUCCESS returned null", SUCCESS);
+
+        example = "0x4C";
+        StaticIconName TRACK_TITLE = StaticIconName.valueForString(example);
+        assertNotNull("TRACK_TITLE returned null", TRACK_TITLE);
+
+        example = "0x2A";
+        StaticIconName TRAFFIC_REPORT = StaticIconName.valueForString(example);
+        assertNotNull("TRAFFIC_REPORT returned null", TRAFFIC_REPORT);
+
+        example = "0x10";
+        StaticIconName TURN_LIST = StaticIconName.valueForString(example);
+        assertNotNull("TURN_LIST returned null", TURN_LIST);
+
+        example = "0xad";
+        StaticIconName UTURN_LEFT_TRAFFIC = StaticIconName.valueForString(example);
+        assertNotNull("UTURN_LEFT_TRAFFIC returned null", UTURN_LEFT_TRAFFIC);
+
+        example = "0xa9";
+        StaticIconName UTURN_RIGHT_TRAFFIC = StaticIconName.valueForString(example);
+        assertNotNull("UTURN_RIGHT_TRAFFIC returned null", UTURN_RIGHT_TRAFFIC);
+
+        example = "0x18";
+        StaticIconName UNDO = StaticIconName.valueForString(example);
+        assertNotNull("UNDO returned null", UNDO);
+
+        example = "0x23";
+        StaticIconName UNLOCKED = StaticIconName.valueForString(example);
+        assertNotNull("UNLOCKED returned null", UNLOCKED);
+
+        example = "0x0B";
+        StaticIconName USB_MEDIA_AUDIO_SOURCE = StaticIconName.valueForString(example);
+        assertNotNull("USB_MEDIA_AUDIO_SOURCE returned null", USB_MEDIA_AUDIO_SOURCE);
+
+        example = "0xC7";
+        StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1 = StaticIconName.valueForString(example);
+        assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1);
+
+        example = "0xC8";
+        StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2 = StaticIconName.valueForString(example);
+        assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2);
+
+        example = "0xC9";
+        StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3 = StaticIconName.valueForString(example);
+        assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3);
+
+        example = "0xCA";
+        StaticIconName VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4 = StaticIconName.valueForString(example);
+        assertNotNull("VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4 returned null", VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4);
+
+        example = "0x90";
+        StaticIconName VOICE_RECOGNITION_FAILED = StaticIconName.valueForString(example);
+        assertNotNull("VOICE_RECOGNITION_FAILED returned null", VOICE_RECOGNITION_FAILED);
+
+        example = "0x92";
+        StaticIconName VOICE_RECOGNITION_PAUSE = StaticIconName.valueForString(example);
+        assertNotNull("VOICE_RECOGNITION_PAUSE returned null", VOICE_RECOGNITION_PAUSE);
+
+        example = "0x8F";
+        StaticIconName VOICE_RECOGNITION_SUCCESSFUL = StaticIconName.valueForString(example);
+        assertNotNull("VOICE_RECOGNITION_SUCCESSFUL returned null", VOICE_RECOGNITION_SUCCESSFUL);
+
+        example = "0x11";
+        StaticIconName VOICE_RECOGNITION_SYSTEM_ACTIVE = StaticIconName.valueForString(example);
+        assertNotNull("VOICE_RECOGNITION_SYSTEM_ACTIVE returned null", VOICE_RECOGNITION_SYSTEM_ACTIVE);
+
+        example = "0x91";
+        StaticIconName VOICE_RECOGNITION_SYSTEM_LISTENING = StaticIconName.valueForString(example);
+        assertNotNull("VOICE_RECOGNITION_SYSTEM_LISTENING returned null", VOICE_RECOGNITION_SYSTEM_LISTENING);
+
+        example = "0x93";
+        StaticIconName VOICE_RECOGNITION_TRY_AGAIN = StaticIconName.valueForString(example);
+        assertNotNull("VOICE_RECOGNITION_TRY_AGAIN returned null", VOICE_RECOGNITION_TRY_AGAIN);
+
+        example = "0xfe";
+        StaticIconName WARNING = StaticIconName.valueForString(example);
+        assertNotNull("WARNING returned null", WARNING);
+
+        example = "0xeb";
+        StaticIconName WEATHER = StaticIconName.valueForString(example);
+        assertNotNull("WEATHER returned null", WEATHER);
+
+        example = "0x43";
+        StaticIconName WIFI_FULL = StaticIconName.valueForString(example);
+        assertNotNull("WIFI_FULL returned null", WIFI_FULL);
+
+        example = "0x98";
+        StaticIconName ZOOM_IN = StaticIconName.valueForString(example);
+        assertNotNull("ZOOM_IN returned null", ZOOM_IN);
+
+        example = "0x9a";
+        StaticIconName ZOOM_OUT = StaticIconName.valueForString(example);
+        assertNotNull("ZOOM_OUT returned null", ZOOM_OUT);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "SoMeThInG";
+        try {
+            StaticIconName SOMETHING = StaticIconName.valueForString(example);
+            assertNull("Result of valueForString should be null.", SOMETHING);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            StaticIconName temp = StaticIconName.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of StaticIconNames.
+     */
+    public void testListEnum() {
+
+        List<StaticIconName> enumValueList = Arrays.asList(StaticIconName.values());
+
+        List<StaticIconName> enumTestList = new ArrayList<>();
+        enumTestList.add(StaticIconName.ACCEPT_CALL);
+        enumTestList.add(StaticIconName.ADD_WAYPOINT);
+        enumTestList.add(StaticIconName.ALBUM);
+        enumTestList.add(StaticIconName.AMBIENT_LIGHTING);
+        enumTestList.add(StaticIconName.ARROW_NORTH);
+        enumTestList.add(StaticIconName.AUDIO_MUTE);
+        enumTestList.add(StaticIconName.AUDIOBOOK_EPISODE);
+        enumTestList.add(StaticIconName.AUDIOBOOK_NARRATOR);
+        enumTestList.add(StaticIconName.AUXILLARY_AUDIO);
+        enumTestList.add(StaticIconName.BACK);
+        enumTestList.add(StaticIconName.BATTERY_CAPACITY_0_OF_5);
+        enumTestList.add(StaticIconName.BATTERY_CAPACITY_1_OF_5);
+        enumTestList.add(StaticIconName.BATTERY_CAPACITY_2_OF_5);
+        enumTestList.add(StaticIconName.BATTERY_CAPACITY_3_OF_5);
+        enumTestList.add(StaticIconName.BATTERY_CAPACITY_4_OF_5);
+        enumTestList.add(StaticIconName.BATTERY_CAPACITY_5_OF_5);
+        enumTestList.add(StaticIconName.BLUETOOTH_AUDIO_SOURCE);
+        enumTestList.add(StaticIconName.BLUETOOTH1);
+        enumTestList.add(StaticIconName.BLUETOOTH2);
+        enumTestList.add(StaticIconName.BROWSE);
+        enumTestList.add(StaticIconName.CELL_PHONE_IN_ROAMING_MODE);
+        enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_0_OF_5_BARS);
+        enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_1_OF_5_BARS);
+        enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_2_OF_5_BARS);
+        enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_3_OF_5_BARS);
+        enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_4_OF_5_BARS);
+        enumTestList.add(StaticIconName.CELL_SERVICE_SIGNAL_STRENGTH_5_OF_5_BARS);
+        enumTestList.add(StaticIconName.CHANGE_LANE_LEFT);
+        enumTestList.add(StaticIconName.CHANGE_LANE_RIGHT);
+        enumTestList.add(StaticIconName.CHECK_BOX_CHECKED);
+        enumTestList.add(StaticIconName.CHECK_BOX_UNCHECKED);
+        enumTestList.add(StaticIconName.CLIMATE);
+        enumTestList.add(StaticIconName.CLOCK);
+        enumTestList.add(StaticIconName.COMPOSE);
+        enumTestList.add(StaticIconName.CONTACT);
+        enumTestList.add(StaticIconName.CONTINUE);
+        enumTestList.add(StaticIconName.DASH);
+        enumTestList.add(StaticIconName.DATE);
+        enumTestList.add(StaticIconName.DELETE);
+        enumTestList.add(StaticIconName.DESTINATION);
+        enumTestList.add(StaticIconName.DESTINATION_FERRY_AHEAD);
+        enumTestList.add(StaticIconName.EBOOKMARK);
+        enumTestList.add(StaticIconName.END_CALL);
+        enumTestList.add(StaticIconName.FAIL);
+        enumTestList.add(StaticIconName.FAST_FORWARD_30_SECS);
+        enumTestList.add(StaticIconName.FAVORITE_HEART);
+        enumTestList.add(StaticIconName.FAVORITE_STAR);
+        enumTestList.add(StaticIconName.FAX_NUMBER);
+        enumTestList.add(StaticIconName.FILENAME);
+        enumTestList.add(StaticIconName.FILTER);
+        enumTestList.add(StaticIconName.FOLDER);
+        enumTestList.add(StaticIconName.FUEL_PRICES);
+        enumTestList.add(StaticIconName.FULL_MAP);
+        enumTestList.add(StaticIconName.GENERIC_PHONE_NUMBER);
+        enumTestList.add(StaticIconName.GENRE);
+        enumTestList.add(StaticIconName.GLOBAL_KEYBOARD);
+        enumTestList.add(StaticIconName.HIGHWAY_EXIT_INFORMATION);
+        enumTestList.add(StaticIconName.HOME_PHONE_NUMBER);
+        enumTestList.add(StaticIconName.HYPERLINK);
+        enumTestList.add(StaticIconName.ID3_TAG_UNKNOWN);
+        enumTestList.add(StaticIconName.INCOMING_CALLS);
+        enumTestList.add(StaticIconName.INFORMATION);
+        enumTestList.add(StaticIconName.IPOD_MEDIA_SOURCE);
+        enumTestList.add(StaticIconName.JOIN_CALLS);
+        enumTestList.add(StaticIconName.KEEP_LEFT);
+        enumTestList.add(StaticIconName.KEEP_RIGHT);
+        enumTestList.add(StaticIconName.KEY);
+        enumTestList.add(StaticIconName.LEFT);
+        enumTestList.add(StaticIconName.LEFT_ARROW);
+        enumTestList.add(StaticIconName.LEFT_EXIT);
+        enumTestList.add(StaticIconName.LINE_IN_AUDIO_SOURCE);
+        enumTestList.add(StaticIconName.LOCKED);
+        enumTestList.add(StaticIconName.MEDIA_CONTROL_LEFT_ARROW);
+        enumTestList.add(StaticIconName.MEDIA_CONTROL_RECORDING);
+        enumTestList.add(StaticIconName.MEDIA_CONTROL_RIGHT_ARROW);
+        enumTestList.add(StaticIconName.MEDIA_CONTROL_STOP);
+        enumTestList.add(StaticIconName.MICROPHONE);
+        enumTestList.add(StaticIconName.MISSED_CALLS);
+        enumTestList.add(StaticIconName.MOBILE_PHONE_NUMBER);
+        enumTestList.add(StaticIconName.MOVE_DOWN);
+        enumTestList.add(StaticIconName.MOVE_UP);
+        enumTestList.add(StaticIconName.MP3_TAG_ARTIST);
+        enumTestList.add(StaticIconName.NAVIGATION);
+        enumTestList.add(StaticIconName.NAVIGATION_CURRENT_DIRECTION);
+        enumTestList.add(StaticIconName.NEGATIVE_RATING_THUMBS_DOWN);
+        enumTestList.add(StaticIconName.NEW);
+        enumTestList.add(StaticIconName.OFFICE_PHONE_NUMBER);
+        enumTestList.add(StaticIconName.OPENED);
+        enumTestList.add(StaticIconName.ORIGIN);
+        enumTestList.add(StaticIconName.OUTGOING_CALLS);
+        enumTestList.add(StaticIconName.PHONE_CALL_1);
+        enumTestList.add(StaticIconName.PHONE_CALL_2);
+        enumTestList.add(StaticIconName.PHONE_DEVICE);
+        enumTestList.add(StaticIconName.PHONEBOOK);
+        enumTestList.add(StaticIconName.PHOTO);
+        enumTestList.add(StaticIconName.PLAY);
+        enumTestList.add(StaticIconName.PLAYLIST);
+        enumTestList.add(StaticIconName.POPUP);
+        enumTestList.add(StaticIconName.POSITIVE_RATING_THUMBS_UP);
+        enumTestList.add(StaticIconName.POWER);
+        enumTestList.add(StaticIconName.PRIMARY_PHONE);
+        enumTestList.add(StaticIconName.RADIO_BUTTON_CHECKED);
+        enumTestList.add(StaticIconName.RADIO_BUTTON_UNCHECKED);
+        enumTestList.add(StaticIconName.RECENT_CALLS);
+        enumTestList.add(StaticIconName.RECENT_DESTINATIONS);
+        enumTestList.add(StaticIconName.REDO);
+        enumTestList.add(StaticIconName.REFRESH);
+        enumTestList.add(StaticIconName.REMOTE_DIAGNOSTICS_CHECK_ENGINE);
+        enumTestList.add(StaticIconName.RENDERED_911_ASSIST);
+        enumTestList.add(StaticIconName.REPEAT);
+        enumTestList.add(StaticIconName.REPEAT_PLAY);
+        enumTestList.add(StaticIconName.REPLY);
+        enumTestList.add(StaticIconName.REWIND_30_SECS);
+        enumTestList.add(StaticIconName.RIGHT);
+        enumTestList.add(StaticIconName.RIGHT_EXIT);
+        enumTestList.add(StaticIconName.RINGTONES);
+        enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_1);
+        enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_2);
+        enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_3);
+        enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_4);
+        enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_5);
+        enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_6);
+        enumTestList.add(StaticIconName.ROUNDABOUT_LEFT_HAND_7);
+        enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_1);
+        enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_2);
+        enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_3);
+        enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_4);
+        enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_5);
+        enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_6);
+        enumTestList.add(StaticIconName.ROUNDABOUT_RIGHT_HAND_7);
+        enumTestList.add(StaticIconName.RSS);
+        enumTestList.add(StaticIconName.SETTINGS);
+        enumTestList.add(StaticIconName.SHARP_LEFT);
+        enumTestList.add(StaticIconName.SHARP_RIGHT);
+        enumTestList.add(StaticIconName.SHOW);
+        enumTestList.add(StaticIconName.SHUFFLE_PLAY);
+        enumTestList.add(StaticIconName.SKI_PLACES);
+        enumTestList.add(StaticIconName.SLIGHT_LEFT);
+        enumTestList.add(StaticIconName.SLIGHT_RIGHT);
+        enumTestList.add(StaticIconName.SMARTPHONE);
+        enumTestList.add(StaticIconName.SORT_LIST);
+        enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_0);
+        enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_1);
+        enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_2);
+        enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_3);
+        enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_4);
+        enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_5);
+        enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_6);
+        enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_7);
+        enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_8);
+        enumTestList.add(StaticIconName.SPEED_DIAL_NUMBERS_NUMBER_9);
+        enumTestList.add(StaticIconName.SUCCESS);
+        enumTestList.add(StaticIconName.TRACK_TITLE);
+        enumTestList.add(StaticIconName.TRAFFIC_REPORT);
+        enumTestList.add(StaticIconName.TURN_LIST);
+        enumTestList.add(StaticIconName.UTURN_LEFT_TRAFFIC);
+        enumTestList.add(StaticIconName.UTURN_RIGHT_TRAFFIC);
+        enumTestList.add(StaticIconName.UNDO);
+        enumTestList.add(StaticIconName.UNLOCKED);
+        enumTestList.add(StaticIconName.USB_MEDIA_AUDIO_SOURCE);
+        enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_1);
+        enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_2);
+        enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_3);
+        enumTestList.add(StaticIconName.VOICE_CONTROL_SCROLLBAR_LIST_ITEM_NO_4);
+        enumTestList.add(StaticIconName.VOICE_RECOGNITION_FAILED);
+        enumTestList.add(StaticIconName.VOICE_RECOGNITION_PAUSE);
+        enumTestList.add(StaticIconName.VOICE_RECOGNITION_SUCCESSFUL);
+        enumTestList.add(StaticIconName.VOICE_RECOGNITION_SYSTEM_ACTIVE);
+        enumTestList.add(StaticIconName.VOICE_RECOGNITION_SYSTEM_LISTENING);
+        enumTestList.add(StaticIconName.VOICE_RECOGNITION_TRY_AGAIN);
+        enumTestList.add(StaticIconName.WARNING);
+        enumTestList.add(StaticIconName.WEATHER);
+        enumTestList.add(StaticIconName.WIFI_FULL);
+        enumTestList.add(StaticIconName.ZOOM_IN);
+        enumTestList.add(StaticIconName.ZOOM_OUT);
+
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java
index 7bea14061..44c55cb08 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SupportedSeatTests.java
@@ -14,56 +14,56 @@ import java.util.List;
  */
 public class SupportedSeatTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums() {
-		String example = "DRIVER";
-		SupportedSeat enumDriver = SupportedSeat.valueForString(example);
-		example = "FRONT_PASSENGER";
-		SupportedSeat enumFrontPassenger = SupportedSeat.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "DRIVER";
+        SupportedSeat enumDriver = SupportedSeat.valueForString(example);
+        example = "FRONT_PASSENGER";
+        SupportedSeat enumFrontPassenger = SupportedSeat.valueForString(example);
 
-		assertNotNull("DRIVER returned null", enumDriver);
-		assertNotNull("FRONT_PASSENGER returned null", enumFrontPassenger);
-	}
+        assertNotNull("DRIVER returned null", enumDriver);
+        assertNotNull("FRONT_PASSENGER returned null", enumFrontPassenger);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum() {
-		String example = "dRIVER";
-		try {
-			SupportedSeat temp = SupportedSeat.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "dRIVER";
+        try {
+            SupportedSeat temp = SupportedSeat.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum() {
-		String example = null;
-		try {
-			SupportedSeat temp = SupportedSeat.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		} catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            SupportedSeat temp = SupportedSeat.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of SupportedSeat.
-	 */
-	public void testListEnum() {
-		List<SupportedSeat> enumValueList = Arrays.asList(SupportedSeat.values());
+    /**
+     * Verifies the possible enum values of SupportedSeat.
+     */
+    public void testListEnum() {
+        List<SupportedSeat> enumValueList = Arrays.asList(SupportedSeat.values());
 
-		List<SupportedSeat> enumTestList = new ArrayList<SupportedSeat>();
-		enumTestList.add(SupportedSeat.DRIVER);
-		enumTestList.add(SupportedSeat.FRONT_PASSENGER);
+        List<SupportedSeat> enumTestList = new ArrayList<SupportedSeat>();
+        enumTestList.add(SupportedSeat.DRIVER);
+        enumTestList.add(SupportedSeat.FRONT_PASSENGER);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
index 4cb1fca51..8d4fc78f8 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "STEAL_FOCUS";
-		SystemAction enumStealFocus = SystemAction.valueForString(example);
-		example = "KEEP_CONTEXT";
-		SystemAction enumKeepContext = SystemAction.valueForString(example);
-		
-		assertNotNull("DEFAULT_ACTION returned null", enumDefaultAction);
-		assertNotNull("STEAL_FOCUS returned null", enumStealFocus);
-		assertNotNull("KEEP_CONTEXT returned null", enumKeepContext);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "DEFAULT_ACTION";
+        SystemAction enumDefaultAction = SystemAction.valueForString(example);
+        example = "STEAL_FOCUS";
+        SystemAction enumStealFocus = SystemAction.valueForString(example);
+        example = "KEEP_CONTEXT";
+        SystemAction enumKeepContext = SystemAction.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "deFaulT_ActiON";
-		try {
-		    SystemAction temp = SystemAction.valueForString(example);
+        assertNotNull("DEFAULT_ACTION returned null", enumDefaultAction);
+        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 {
+            SystemAction temp = SystemAction.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    SystemAction temp = SystemAction.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            SystemAction temp = SystemAction.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of SystemAction.
-	 */
-	public void testListEnum() {
- 		List<SystemAction> enumValueList = Arrays.asList(SystemAction.values());
+    /**
+     * Verifies the possible enum values of SystemAction.
+     */
+    public void testListEnum() {
+        List<SystemAction> enumValueList = Arrays.asList(SystemAction.values());
 
-		List<SystemAction> enumTestList = new ArrayList<SystemAction>();
-		enumTestList.add(SystemAction.DEFAULT_ACTION);
-		enumTestList.add(SystemAction.STEAL_FOCUS);
-		enumTestList.add(SystemAction.KEEP_CONTEXT);
+        List<SystemAction> enumTestList = new ArrayList<SystemAction>();
+        enumTestList.add(SystemAction.DEFAULT_ACTION);
+        enumTestList.add(SystemAction.STEAL_FOCUS);
+        enumTestList.add(SystemAction.KEEP_CONTEXT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java
index 94617493c..e5dce7185 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemCapabilityTypeTests.java
@@ -9,133 +9,131 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType}
  */
 public class SystemCapabilityTypeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {	
-		String example = "NAVIGATION";
-		SystemCapabilityType enumNavigation = SystemCapabilityType.valueForString(example);
-		example = "PHONE_CALL";
-		SystemCapabilityType enumPhoneCall = SystemCapabilityType.valueForString(example);
-		example = "VIDEO_STREAMING";
-		SystemCapabilityType enumVideoStreaming = SystemCapabilityType.valueForString(example);
-		example = "REMOTE_CONTROL";
-		SystemCapabilityType enumRemoteControl = SystemCapabilityType.valueForString(example);
-		example = "HMI";
-		SystemCapabilityType enumHmi = SystemCapabilityType.valueForString(example);
-		example = "DISPLAY";
-		SystemCapabilityType enumDisplay = SystemCapabilityType.valueForString(example);
-		example = "AUDIO_PASSTHROUGH";
-		SystemCapabilityType enumAudioPassThrough = SystemCapabilityType.valueForString(example);
-		example = "BUTTON";
-		SystemCapabilityType enumButton = SystemCapabilityType.valueForString(example);
-		example = "HMI_ZONE";
-		SystemCapabilityType enumHmiZone = SystemCapabilityType.valueForString(example);
-		example = "PRESET_BANK";
-		SystemCapabilityType enumPresetBank = SystemCapabilityType.valueForString(example);
-		example = "SOFTBUTTON";
-		SystemCapabilityType enumSoftButton = SystemCapabilityType.valueForString(example);
-		example = "SPEECH";
-		SystemCapabilityType enumSpeech = SystemCapabilityType.valueForString(example);
-		example = "VOICE_RECOGNITION";
-		SystemCapabilityType enumVoiceRecognition = SystemCapabilityType.valueForString(example);
-		example = "PCM_STREAMING";
-		SystemCapabilityType enumPCM = SystemCapabilityType.valueForString(example);
-		example = "APP_SERVICES";
-		SystemCapabilityType enumAppServices = SystemCapabilityType.valueForString(example);
-		example = "SEAT_LOCATION";
-		SystemCapabilityType enumSeatLocation = SystemCapabilityType.valueForString(example);
-		example = "PRERECORDED_SPEECH";
-		SystemCapabilityType enumPrerecordedSpeech = SystemCapabilityType.valueForString(example);
-		example = "DISPLAYS";
-		SystemCapabilityType enumDisplays = SystemCapabilityType.valueForString(example);
-		example = "DRIVER_DISTRACTION";
-		SystemCapabilityType enumDriverDistraction = SystemCapabilityType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NAVIGATION";
+        SystemCapabilityType enumNavigation = SystemCapabilityType.valueForString(example);
+        example = "PHONE_CALL";
+        SystemCapabilityType enumPhoneCall = SystemCapabilityType.valueForString(example);
+        example = "VIDEO_STREAMING";
+        SystemCapabilityType enumVideoStreaming = SystemCapabilityType.valueForString(example);
+        example = "REMOTE_CONTROL";
+        SystemCapabilityType enumRemoteControl = SystemCapabilityType.valueForString(example);
+        example = "HMI";
+        SystemCapabilityType enumHmi = SystemCapabilityType.valueForString(example);
+        example = "DISPLAY";
+        SystemCapabilityType enumDisplay = SystemCapabilityType.valueForString(example);
+        example = "AUDIO_PASSTHROUGH";
+        SystemCapabilityType enumAudioPassThrough = SystemCapabilityType.valueForString(example);
+        example = "BUTTON";
+        SystemCapabilityType enumButton = SystemCapabilityType.valueForString(example);
+        example = "HMI_ZONE";
+        SystemCapabilityType enumHmiZone = SystemCapabilityType.valueForString(example);
+        example = "PRESET_BANK";
+        SystemCapabilityType enumPresetBank = SystemCapabilityType.valueForString(example);
+        example = "SOFTBUTTON";
+        SystemCapabilityType enumSoftButton = SystemCapabilityType.valueForString(example);
+        example = "SPEECH";
+        SystemCapabilityType enumSpeech = SystemCapabilityType.valueForString(example);
+        example = "VOICE_RECOGNITION";
+        SystemCapabilityType enumVoiceRecognition = SystemCapabilityType.valueForString(example);
+        example = "PCM_STREAMING";
+        SystemCapabilityType enumPCM = SystemCapabilityType.valueForString(example);
+        example = "APP_SERVICES";
+        SystemCapabilityType enumAppServices = SystemCapabilityType.valueForString(example);
+        example = "SEAT_LOCATION";
+        SystemCapabilityType enumSeatLocation = SystemCapabilityType.valueForString(example);
+        example = "PRERECORDED_SPEECH";
+        SystemCapabilityType enumPrerecordedSpeech = SystemCapabilityType.valueForString(example);
+        example = "DISPLAYS";
+        SystemCapabilityType enumDisplays = SystemCapabilityType.valueForString(example);
+        example = "DRIVER_DISTRACTION";
+        SystemCapabilityType enumDriverDistraction = SystemCapabilityType.valueForString(example);
 
-		assertNotNull("NAVIGATION returned null", enumNavigation);
-		assertNotNull("PHONE_CALL returned null", enumPhoneCall);
-		assertNotNull("VIDEO_STREAMING returned null", enumVideoStreaming);
-		assertNotNull("REMOTE_CONTROL returned null", enumRemoteControl);
-		assertNotNull("HMI returned null", enumHmi);
-		assertNotNull("DISPLAY returned null", enumDisplay);
-		assertNotNull("AUDIO_PASSTHROUGH returned null", enumAudioPassThrough);
-		assertNotNull("BUTTON returned null", enumButton);
-		assertNotNull("HMI_ZONE returned null", enumHmiZone);
-		assertNotNull("PRESET_BANK returned null", enumPresetBank);
-		assertNotNull("SOFTBUTTON returned null", enumSoftButton);
-		assertNotNull("SPEECH returned null", enumSpeech);
-		assertNotNull("VOICE_RECOGNITION returned null", enumVoiceRecognition);
-		assertNotNull("PCM_STREAMING", enumPCM);
-		assertNotNull("APP_SERVICES", enumAppServices);
-		assertNotNull("SEAT_LOCATION return null", enumSeatLocation);
-		assertNotNull("PRERECORDED_SPEECH", enumPrerecordedSpeech);
-		assertNotNull("DISPLAYS", enumDisplays);
-		assertNotNull("DRIVER_DISTRACTION", enumDriverDistraction);
+        assertNotNull("NAVIGATION returned null", enumNavigation);
+        assertNotNull("PHONE_CALL returned null", enumPhoneCall);
+        assertNotNull("VIDEO_STREAMING returned null", enumVideoStreaming);
+        assertNotNull("REMOTE_CONTROL returned null", enumRemoteControl);
+        assertNotNull("HMI returned null", enumHmi);
+        assertNotNull("DISPLAY returned null", enumDisplay);
+        assertNotNull("AUDIO_PASSTHROUGH returned null", enumAudioPassThrough);
+        assertNotNull("BUTTON returned null", enumButton);
+        assertNotNull("HMI_ZONE returned null", enumHmiZone);
+        assertNotNull("PRESET_BANK returned null", enumPresetBank);
+        assertNotNull("SOFTBUTTON returned null", enumSoftButton);
+        assertNotNull("SPEECH returned null", enumSpeech);
+        assertNotNull("VOICE_RECOGNITION returned null", enumVoiceRecognition);
+        assertNotNull("PCM_STREAMING", enumPCM);
+        assertNotNull("APP_SERVICES", enumAppServices);
+        assertNotNull("SEAT_LOCATION return null", enumSeatLocation);
+        assertNotNull("PRERECORDED_SPEECH", enumPrerecordedSpeech);
+        assertNotNull("DISPLAYS", enumDisplays);
+        assertNotNull("DRIVER_DISTRACTION", enumDriverDistraction);
 
-	}
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "nAVIGATION";
-		try {
-			SystemCapabilityType temp = SystemCapabilityType.valueForString(example);
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "nAVIGATION";
+        try {
+            SystemCapabilityType temp = SystemCapabilityType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			SystemCapabilityType temp = SystemCapabilityType.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            SystemCapabilityType temp = SystemCapabilityType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of SystemCapabilityType.
-	 */
-	public void testListEnum() {
- 		List<SystemCapabilityType> enumValueList = Arrays.asList(SystemCapabilityType.values());
+    /**
+     * Verifies the possible enum values of SystemCapabilityType.
+     */
+    public void testListEnum() {
+        List<SystemCapabilityType> enumValueList = Arrays.asList(SystemCapabilityType.values());
 
-		List<SystemCapabilityType> enumTestList = new ArrayList<SystemCapabilityType>();
-		enumTestList.add(SystemCapabilityType.NAVIGATION);
-		enumTestList.add(SystemCapabilityType.PHONE_CALL);
-		enumTestList.add(SystemCapabilityType.VIDEO_STREAMING);
-		enumTestList.add(SystemCapabilityType.REMOTE_CONTROL);
-		enumTestList.add(SystemCapabilityType.HMI);
-		enumTestList.add(SystemCapabilityType.DISPLAY);
-		enumTestList.add(SystemCapabilityType.AUDIO_PASSTHROUGH);
-		enumTestList.add(SystemCapabilityType.BUTTON);
-		enumTestList.add(SystemCapabilityType.HMI_ZONE);
-		enumTestList.add(SystemCapabilityType.PRESET_BANK);
-		enumTestList.add(SystemCapabilityType.SOFTBUTTON);
-		enumTestList.add(SystemCapabilityType.SPEECH);
-		enumTestList.add(SystemCapabilityType.VOICE_RECOGNITION);
-		enumTestList.add(SystemCapabilityType.PCM_STREAMING);
-		enumTestList.add(SystemCapabilityType.APP_SERVICES);
-		enumTestList.add(SystemCapabilityType.SEAT_LOCATION);
-		enumTestList.add(SystemCapabilityType.PRERECORDED_SPEECH);
-		enumTestList.add(SystemCapabilityType.DISPLAYS);
-		enumTestList.add(SystemCapabilityType.DRIVER_DISTRACTION);
+        List<SystemCapabilityType> enumTestList = new ArrayList<SystemCapabilityType>();
+        enumTestList.add(SystemCapabilityType.NAVIGATION);
+        enumTestList.add(SystemCapabilityType.PHONE_CALL);
+        enumTestList.add(SystemCapabilityType.VIDEO_STREAMING);
+        enumTestList.add(SystemCapabilityType.REMOTE_CONTROL);
+        enumTestList.add(SystemCapabilityType.HMI);
+        enumTestList.add(SystemCapabilityType.DISPLAY);
+        enumTestList.add(SystemCapabilityType.AUDIO_PASSTHROUGH);
+        enumTestList.add(SystemCapabilityType.BUTTON);
+        enumTestList.add(SystemCapabilityType.HMI_ZONE);
+        enumTestList.add(SystemCapabilityType.PRESET_BANK);
+        enumTestList.add(SystemCapabilityType.SOFTBUTTON);
+        enumTestList.add(SystemCapabilityType.SPEECH);
+        enumTestList.add(SystemCapabilityType.VOICE_RECOGNITION);
+        enumTestList.add(SystemCapabilityType.PCM_STREAMING);
+        enumTestList.add(SystemCapabilityType.APP_SERVICES);
+        enumTestList.add(SystemCapabilityType.SEAT_LOCATION);
+        enumTestList.add(SystemCapabilityType.PRERECORDED_SPEECH);
+        enumTestList.add(SystemCapabilityType.DISPLAYS);
+        enumTestList.add(SystemCapabilityType.DRIVER_DISTRACTION);
 
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
index 00e8477ac..9998227bd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
@@ -9,75 +9,73 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "VRSESSION";
-		SystemContext enumVrSession = SystemContext.valueForString(example);
-		example = "MENU";
-		SystemContext enumMenu = SystemContext.valueForString(example);
-		example = "HMI_OBSCURED";
-		SystemContext enumHmiObscured = SystemContext.valueForString(example);
-		example = "ALERT";
-		SystemContext enumAlert = SystemContext.valueForString(example);
-		
-		assertNotNull("MAIN returned null", enumMain);
-		assertNotNull("VRSESSION returned null", enumVrSession);
-		assertNotNull("MENU returned null", enumMenu);
-		assertNotNull("HMI_OBSCURED returned null", enumHmiObscured);
-		assertNotNull("ALERT returned null", enumAlert);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "MAIN";
+        SystemContext enumMain = SystemContext.valueForString(example);
+        example = "VRSESSION";
+        SystemContext enumVrSession = SystemContext.valueForString(example);
+        example = "MENU";
+        SystemContext enumMenu = SystemContext.valueForString(example);
+        example = "HMI_OBSCURED";
+        SystemContext enumHmiObscured = SystemContext.valueForString(example);
+        example = "ALERT";
+        SystemContext enumAlert = SystemContext.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "mAIn";
-		try {
-		    SystemContext temp = SystemContext.valueForString(example);
+        assertNotNull("MAIN returned null", enumMain);
+        assertNotNull("VRSESSION returned null", enumVrSession);
+        assertNotNull("MENU returned null", enumMenu);
+        assertNotNull("HMI_OBSCURED returned null", enumHmiObscured);
+        assertNotNull("ALERT returned null", enumAlert);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "mAIn";
+        try {
+            SystemContext temp = SystemContext.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    SystemContext temp = SystemContext.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            SystemContext temp = SystemContext.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of SystemContext.
+     */
+    public void testListEnum() {
+        List<SystemContext> enumValueList = Arrays.asList(SystemContext.values());
 
-	/**
-	 * Verifies the possible enum values of SystemContext.
-	 */
-	public void testListEnum() {
- 		List<SystemContext> enumValueList = Arrays.asList(SystemContext.values());
+        List<SystemContext> enumTestList = new ArrayList<SystemContext>();
+        enumTestList.add(SystemContext.SYSCTXT_MAIN);
+        enumTestList.add(SystemContext.SYSCTXT_VRSESSION);
+        enumTestList.add(SystemContext.SYSCTXT_MENU);
+        enumTestList.add(SystemContext.SYSCTXT_HMI_OBSCURED);
+        enumTestList.add(SystemContext.SYSCTXT_ALERT);
 
-		List<SystemContext> enumTestList = new ArrayList<SystemContext>();
-		enumTestList.add(SystemContext.SYSCTXT_MAIN);
-		enumTestList.add(SystemContext.SYSCTXT_VRSESSION);
-		enumTestList.add(SystemContext.SYSCTXT_MENU);
-		enumTestList.add(SystemContext.SYSCTXT_HMI_OBSCURED);
-		enumTestList.add(SystemContext.SYSCTXT_ALERT);
-		
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java
index c573a0d7a..cfdf1e718 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TPMSTests.java
@@ -14,82 +14,80 @@ import java.util.List;
  */
 public class TPMSTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "UNKNOWN";
-		TPMS unknown = TPMS.valueForString(example);
-		example = "SYSTEM_FAULT";
-		TPMS systemFault = TPMS.valueForString(example);
-		example = "SENSOR_FAULT";
-		TPMS sensorFault = TPMS.valueForString(example);
-		example = "LOW";
-		TPMS low = TPMS.valueForString(example);
-		example = "SYSTEM_ACTIVE";
-		TPMS systemActive = TPMS.valueForString(example);
-		example = "TRAIN";
-		TPMS train = TPMS.valueForString(example);
-		example = "TRAINING_COMPLETE";
-		TPMS trainingComplete = TPMS.valueForString(example);
-		example = "NOT_TRAINED";
-		TPMS notTrained = TPMS.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "UNKNOWN";
+        TPMS unknown = TPMS.valueForString(example);
+        example = "SYSTEM_FAULT";
+        TPMS systemFault = TPMS.valueForString(example);
+        example = "SENSOR_FAULT";
+        TPMS sensorFault = TPMS.valueForString(example);
+        example = "LOW";
+        TPMS low = TPMS.valueForString(example);
+        example = "SYSTEM_ACTIVE";
+        TPMS systemActive = TPMS.valueForString(example);
+        example = "TRAIN";
+        TPMS train = TPMS.valueForString(example);
+        example = "TRAINING_COMPLETE";
+        TPMS trainingComplete = TPMS.valueForString(example);
+        example = "NOT_TRAINED";
+        TPMS notTrained = TPMS.valueForString(example);
 
-		assertNotNull("UNKNOWN returned null", unknown);
-		assertNotNull("SYSTEM_FAULT returned null", systemFault);
-		assertNotNull("SENSOR_FAULT returned null", sensorFault);
-		assertNotNull("LOW returned null", low);
-		assertNotNull("SYSTEM_ACTIVE returned null", systemActive);
-		assertNotNull("TRAIN returned null", train);
-		assertNotNull("TRAINING_COMPLETE returned null", trainingComplete);
-		assertNotNull("NOT_TRAINED returned null", notTrained);
-	}
+        assertNotNull("UNKNOWN returned null", unknown);
+        assertNotNull("SYSTEM_FAULT returned null", systemFault);
+        assertNotNull("SENSOR_FAULT returned null", sensorFault);
+        assertNotNull("LOW returned null", low);
+        assertNotNull("SYSTEM_ACTIVE returned null", systemActive);
+        assertNotNull("TRAIN returned null", train);
+        assertNotNull("TRAINING_COMPLETE returned null", trainingComplete);
+        assertNotNull("NOT_TRAINED returned null", notTrained);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "IsHoUldBeNulL";
-		try {
-			TPMS temp = TPMS.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "IsHoUldBeNulL";
+        try {
+            TPMS temp = TPMS.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			TPMS temp = TPMS.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            TPMS temp = TPMS.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of TPMS.
-	 */
-	public void testListEnum() {
-		List<TPMS> enumValueList = Arrays.asList(TPMS.values());
+    /**
+     * Verifies the possible enum values of TPMS.
+     */
+    public void testListEnum() {
+        List<TPMS> enumValueList = Arrays.asList(TPMS.values());
 
-		List<TPMS> enumTestList = new ArrayList<>();
-		enumTestList.add(TPMS.UNKNOWN);
-		enumTestList.add(TPMS.SYSTEM_FAULT);
-		enumTestList.add(TPMS.SENSOR_FAULT);
-		enumTestList.add(TPMS.LOW);
-		enumTestList.add(TPMS.SYSTEM_ACTIVE);
-		enumTestList.add(TPMS.TRAIN);
-		enumTestList.add(TPMS.TRAINING_COMPLETE);
-		enumTestList.add(TPMS.NOT_TRAINED);
+        List<TPMS> enumTestList = new ArrayList<>();
+        enumTestList.add(TPMS.UNKNOWN);
+        enumTestList.add(TPMS.SYSTEM_FAULT);
+        enumTestList.add(TPMS.SENSOR_FAULT);
+        enumTestList.add(TPMS.LOW);
+        enumTestList.add(TPMS.SYSTEM_ACTIVE);
+        enumTestList.add(TPMS.TRAIN);
+        enumTestList.add(TPMS.TRAINING_COMPLETE);
+        enumTestList.add(TPMS.NOT_TRAINED);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
index ff6be4608..8d87cda82 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
@@ -9,95 +9,93 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "ROUTE_ACCEPTED";
-		TBTState enumRouteAccepted = TBTState.valueForString(example);
-		example = "ROUTE_REFUSED";
-		TBTState enumRouteRefused = TBTState.valueForString(example);
-		example = "ROUTE_CANCELLED";
-		TBTState enumRouteCancelled = TBTState.valueForString(example);
-		example = "ETA_REQUEST";
-		TBTState enumEtaEquest = TBTState.valueForString(example);
-		example = "NEXT_TURN_REQUEST";
-		TBTState enumNextTurnRequest = TBTState.valueForString(example);
-		example = "ROUTE_STATUS_REQUEST";
-		TBTState enumRouteStatusRequest = TBTState.valueForString(example);
-		example = "ROUTE_SUMMARY_REQUEST";
-		TBTState enumRouteSummaryRequest = TBTState.valueForString(example);
-		example = "TRIP_STATUS_REQUEST";
-		TBTState enumTripStatusRequest = TBTState.valueForString(example);
-		example = "ROUTE_UPDATE_REQUEST_TIMEOUT";
-		TBTState enumRouteUpdateRequestTimeout = TBTState.valueForString(example);
-		
-		assertNotNull("ROUTE_UPDATE_REQUEST returned null", enumRouteUpdateRequest);
-		assertNotNull("ROUTE_ACCEPTED returned null", enumRouteAccepted);
-		assertNotNull("ROUTE_REFUSED returned null", enumRouteRefused);
-		assertNotNull("ROUTE_CANCELLED returned null", enumRouteCancelled);
-		assertNotNull("ETA_REQUEST returned null", enumEtaEquest);
-		assertNotNull("NEXT_TURN_REQUEST returned null", enumNextTurnRequest);
-		assertNotNull("ROUTE_STATUS_REQUEST returned null", enumRouteStatusRequest);
-		assertNotNull("ROUTE_SUMMARY_REQUEST returned null", enumRouteSummaryRequest);
-		assertNotNull("TRIP_STATUS_REQUEST returned null", enumTripStatusRequest);
-		assertNotNull("ROUTE_UPDATE_REQUEST_TIMEOUT returned null", enumRouteUpdateRequestTimeout);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "ROUTE_UPDATE_REQUEST";
+        TBTState enumRouteUpdateRequest = TBTState.valueForString(example);
+        example = "ROUTE_ACCEPTED";
+        TBTState enumRouteAccepted = TBTState.valueForString(example);
+        example = "ROUTE_REFUSED";
+        TBTState enumRouteRefused = TBTState.valueForString(example);
+        example = "ROUTE_CANCELLED";
+        TBTState enumRouteCancelled = TBTState.valueForString(example);
+        example = "ETA_REQUEST";
+        TBTState enumEtaEquest = TBTState.valueForString(example);
+        example = "NEXT_TURN_REQUEST";
+        TBTState enumNextTurnRequest = TBTState.valueForString(example);
+        example = "ROUTE_STATUS_REQUEST";
+        TBTState enumRouteStatusRequest = TBTState.valueForString(example);
+        example = "ROUTE_SUMMARY_REQUEST";
+        TBTState enumRouteSummaryRequest = TBTState.valueForString(example);
+        example = "TRIP_STATUS_REQUEST";
+        TBTState enumTripStatusRequest = TBTState.valueForString(example);
+        example = "ROUTE_UPDATE_REQUEST_TIMEOUT";
+        TBTState enumRouteUpdateRequestTimeout = TBTState.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "rOUte_UpDAte_reQuesT";
-		try {
-		    TBTState temp = TBTState.valueForString(example);
+        assertNotNull("ROUTE_UPDATE_REQUEST returned null", enumRouteUpdateRequest);
+        assertNotNull("ROUTE_ACCEPTED returned null", enumRouteAccepted);
+        assertNotNull("ROUTE_REFUSED returned null", enumRouteRefused);
+        assertNotNull("ROUTE_CANCELLED returned null", enumRouteCancelled);
+        assertNotNull("ETA_REQUEST returned null", enumEtaEquest);
+        assertNotNull("NEXT_TURN_REQUEST returned null", enumNextTurnRequest);
+        assertNotNull("ROUTE_STATUS_REQUEST returned null", enumRouteStatusRequest);
+        assertNotNull("ROUTE_SUMMARY_REQUEST returned null", enumRouteSummaryRequest);
+        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 {
+            TBTState temp = TBTState.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    TBTState temp = TBTState.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            TBTState temp = TBTState.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of TBTState.
-	 */
-	public void testListEnum() {
- 		List<TBTState> enumValueList = Arrays.asList(TBTState.values());
+    /**
+     * Verifies the possible enum values of TBTState.
+     */
+    public void testListEnum() {
+        List<TBTState> enumValueList = Arrays.asList(TBTState.values());
 
-		List<TBTState> enumTestList = new ArrayList<TBTState>();
-		enumTestList.add(TBTState.ROUTE_UPDATE_REQUEST);
-		enumTestList.add(TBTState.ROUTE_ACCEPTED);
-		enumTestList.add(TBTState.ROUTE_REFUSED);
-		enumTestList.add(TBTState.ROUTE_CANCELLED);
-		enumTestList.add(TBTState.ETA_REQUEST);
-		enumTestList.add(TBTState.NEXT_TURN_REQUEST);		
-		enumTestList.add(TBTState.ROUTE_STATUS_REQUEST);
-		enumTestList.add(TBTState.ROUTE_SUMMARY_REQUEST);	
-		enumTestList.add(TBTState.TRIP_STATUS_REQUEST);
-		enumTestList.add(TBTState.ROUTE_UPDATE_REQUEST_TIMEOUT);	
+        List<TBTState> enumTestList = new ArrayList<TBTState>();
+        enumTestList.add(TBTState.ROUTE_UPDATE_REQUEST);
+        enumTestList.add(TBTState.ROUTE_ACCEPTED);
+        enumTestList.add(TBTState.ROUTE_REFUSED);
+        enumTestList.add(TBTState.ROUTE_CANCELLED);
+        enumTestList.add(TBTState.ETA_REQUEST);
+        enumTestList.add(TBTState.NEXT_TURN_REQUEST);
+        enumTestList.add(TBTState.ROUTE_STATUS_REQUEST);
+        enumTestList.add(TBTState.ROUTE_SUMMARY_REQUEST);
+        enumTestList.add(TBTState.TRIP_STATUS_REQUEST);
+        enumTestList.add(TBTState.ROUTE_UPDATE_REQUEST_TIMEOUT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
index 57512eb45..7ec1e131d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "RIGHT_ALIGNED";
-		TextAlignment enumRightAligned = TextAlignment.valueForString(example);
-		example = "CENTERED";
-		TextAlignment enumCentered = TextAlignment.valueForString(example);
-		
-		assertNotNull("LEFT_ALIGNED returned null", enumLeftAligned);
-		assertNotNull("RIGHT_ALIGNED returned null", enumRightAligned);
-		assertNotNull("CENTERED returned null", enumCentered);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "LEFT_ALIGNED";
+        TextAlignment enumLeftAligned = TextAlignment.valueForString(example);
+        example = "RIGHT_ALIGNED";
+        TextAlignment enumRightAligned = TextAlignment.valueForString(example);
+        example = "CENTERED";
+        TextAlignment enumCentered = TextAlignment.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "leFT_AliGned";
-		try {
-		    TextAlignment temp = TextAlignment.valueForString(example);
+        assertNotNull("LEFT_ALIGNED returned null", enumLeftAligned);
+        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 {
+            TextAlignment temp = TextAlignment.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    TextAlignment temp = TextAlignment.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            TextAlignment temp = TextAlignment.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of TextAlignment.
-	 */
-	public void testListEnum() {
- 		List<TextAlignment> enumValueList = Arrays.asList(TextAlignment.values());
+    /**
+     * Verifies the possible enum values of TextAlignment.
+     */
+    public void testListEnum() {
+        List<TextAlignment> enumValueList = Arrays.asList(TextAlignment.values());
 
-		List<TextAlignment> enumTestList = new ArrayList<TextAlignment>();
-		enumTestList.add(TextAlignment.LEFT_ALIGNED);
-		enumTestList.add(TextAlignment.RIGHT_ALIGNED);
-		enumTestList.add(TextAlignment.CENTERED);
+        List<TextAlignment> enumTestList = new ArrayList<TextAlignment>();
+        enumTestList.add(TextAlignment.LEFT_ALIGNED);
+        enumTestList.add(TextAlignment.RIGHT_ALIGNED);
+        enumTestList.add(TextAlignment.CENTERED);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
index 8c8122fd8..0eb05f848 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
@@ -10,176 +10,174 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "mainField2";
-		TextFieldName enumMainField2 = TextFieldName.valueForString(example);
-		example = "mainField3";
-		TextFieldName enumMainField3 = TextFieldName.valueForString(example);
-		example = "mainField4";
-		TextFieldName enumMainField4 = TextFieldName.valueForString(example);
-		example = "statusBar";
-		TextFieldName enumStatusBar = TextFieldName.valueForString(example);
-		example = "mediaClock";
-		TextFieldName enumMediaClock = TextFieldName.valueForString(example);
-		example = "mediaTrack";
-		TextFieldName enumMediaTrack = TextFieldName.valueForString(example);
-		example = "alertText1";
-		TextFieldName enumAlertText1 = TextFieldName.valueForString(example);
-		example = "alertText2";
-		TextFieldName enumAlertText2 = TextFieldName.valueForString(example);
-		example = "alertText3";
-		TextFieldName enumAlertText3 = TextFieldName.valueForString(example);
-		example = "scrollableMessageBody";
-		TextFieldName enumScrollableMessageBody = TextFieldName.valueForString(example);
-		example = "initialInteractionText";
-		TextFieldName enumInitialInteractionText = TextFieldName.valueForString(example);
-		example = "navigationText1";
-		TextFieldName enumNavigationText1 = TextFieldName.valueForString(example);
-		example = "navigationText2";
-		TextFieldName enumNavigationText2 = TextFieldName.valueForString(example);
-		example = "ETA";
-		TextFieldName enumEta = TextFieldName.valueForString(example);
-		example = "totalDistance";
-		TextFieldName enumTotalDistance = TextFieldName.valueForString(example);
-		example = "audioPassThruDisplayText1";
-		TextFieldName enumAudioPassThruDisplayText1 = TextFieldName.valueForString(example);
-		example = "audioPassThruDisplayText2";
-		TextFieldName enumAudioPassThruDisplayText2 = TextFieldName.valueForString(example);
-		example = "sliderHeader";
-		TextFieldName enumSliderHeader = TextFieldName.valueForString(example);
-		example = "sliderFooter";
-		TextFieldName enumSliderFooter = TextFieldName.valueForString(example);
-		example = "menuName";
-		TextFieldName enumMenuName = TextFieldName.valueForString(example);
-		example = "secondaryText";
-		TextFieldName enumSecondaryText = TextFieldName.valueForString(example);
-		example = "tertiaryText";
-		TextFieldName enumTertiaryText = TextFieldName.valueForString(example);
-		example = "menuTitle";
-		TextFieldName enumMenuTitle = TextFieldName.valueForString(example);
-		example = "locationName";
-		TextFieldName enumLocName = TextFieldName.valueForString(example);
-		example = "locationDescription";
-		TextFieldName enumLocDesc = TextFieldName.valueForString(example);
-		example = "addressLines";
-		TextFieldName enumAddLines = TextFieldName.valueForString(example);
-		example = "phoneNumber";
-		TextFieldName enumPhone = TextFieldName.valueForString(example);
-		example = "templateTitle";
-		TextFieldName templateTitle = TextFieldName.valueForString(example);
-		
-		assertNotNull("mainField1 returned null", enumMainField1);
-		assertNotNull("mainField2 returned null", enumMainField2);
-		assertNotNull("mainField3 returned null", enumMainField3);
-		assertNotNull("mainField4 returned null", enumMainField4);
-		assertNotNull("statusBar returned null",  enumStatusBar);
-		assertNotNull("mediaClock returned null", enumMediaClock);
-		assertNotNull("mediaTrack returned null", enumMediaTrack);
-		assertNotNull("alertText1 returned null", enumAlertText1);
-		assertNotNull("alertText2 returned null", enumAlertText2);
-		assertNotNull("alertText3 returned null", enumAlertText3);
-		assertNotNull("scrollableMessageBody returned null", enumScrollableMessageBody);
-		assertNotNull("initialInteractionText returned null", enumInitialInteractionText);
-		assertNotNull("navigationText1 returned null", enumNavigationText1);
-		assertNotNull("navigationText2 returned null", enumNavigationText2);
-		assertNotNull("ETA returned null", enumEta);
-		assertNotNull("totalDistance returned null", enumTotalDistance);
-		assertNotNull("audioPassThruDisplayText1 returned null", enumAudioPassThruDisplayText1);
-		assertNotNull("audioPassThruDisplayText2 returned null", enumAudioPassThruDisplayText2);
-		assertNotNull("sliderHeader returned null", enumSliderHeader);
-		assertNotNull("sliderFooter returned null", enumSliderFooter);
-		assertNotNull("menuName returned null", enumMenuName);
-		assertNotNull("secondaryText returned null", enumSecondaryText);
-		assertNotNull("tertiaryText returned null", enumTertiaryText);
-		assertNotNull("menuTitle returned null", enumMenuTitle);
-		assertNotNull("templateTitle returned null", templateTitle);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "mainField1";
+        TextFieldName enumMainField1 = TextFieldName.valueForString(example);
+        example = "mainField2";
+        TextFieldName enumMainField2 = TextFieldName.valueForString(example);
+        example = "mainField3";
+        TextFieldName enumMainField3 = TextFieldName.valueForString(example);
+        example = "mainField4";
+        TextFieldName enumMainField4 = TextFieldName.valueForString(example);
+        example = "statusBar";
+        TextFieldName enumStatusBar = TextFieldName.valueForString(example);
+        example = "mediaClock";
+        TextFieldName enumMediaClock = TextFieldName.valueForString(example);
+        example = "mediaTrack";
+        TextFieldName enumMediaTrack = TextFieldName.valueForString(example);
+        example = "alertText1";
+        TextFieldName enumAlertText1 = TextFieldName.valueForString(example);
+        example = "alertText2";
+        TextFieldName enumAlertText2 = TextFieldName.valueForString(example);
+        example = "alertText3";
+        TextFieldName enumAlertText3 = TextFieldName.valueForString(example);
+        example = "scrollableMessageBody";
+        TextFieldName enumScrollableMessageBody = TextFieldName.valueForString(example);
+        example = "initialInteractionText";
+        TextFieldName enumInitialInteractionText = TextFieldName.valueForString(example);
+        example = "navigationText1";
+        TextFieldName enumNavigationText1 = TextFieldName.valueForString(example);
+        example = "navigationText2";
+        TextFieldName enumNavigationText2 = TextFieldName.valueForString(example);
+        example = "ETA";
+        TextFieldName enumEta = TextFieldName.valueForString(example);
+        example = "totalDistance";
+        TextFieldName enumTotalDistance = TextFieldName.valueForString(example);
+        example = "audioPassThruDisplayText1";
+        TextFieldName enumAudioPassThruDisplayText1 = TextFieldName.valueForString(example);
+        example = "audioPassThruDisplayText2";
+        TextFieldName enumAudioPassThruDisplayText2 = TextFieldName.valueForString(example);
+        example = "sliderHeader";
+        TextFieldName enumSliderHeader = TextFieldName.valueForString(example);
+        example = "sliderFooter";
+        TextFieldName enumSliderFooter = TextFieldName.valueForString(example);
+        example = "menuName";
+        TextFieldName enumMenuName = TextFieldName.valueForString(example);
+        example = "secondaryText";
+        TextFieldName enumSecondaryText = TextFieldName.valueForString(example);
+        example = "tertiaryText";
+        TextFieldName enumTertiaryText = TextFieldName.valueForString(example);
+        example = "menuTitle";
+        TextFieldName enumMenuTitle = TextFieldName.valueForString(example);
+        example = "locationName";
+        TextFieldName enumLocName = TextFieldName.valueForString(example);
+        example = "locationDescription";
+        TextFieldName enumLocDesc = TextFieldName.valueForString(example);
+        example = "addressLines";
+        TextFieldName enumAddLines = TextFieldName.valueForString(example);
+        example = "phoneNumber";
+        TextFieldName enumPhone = TextFieldName.valueForString(example);
+        example = "templateTitle";
+        TextFieldName templateTitle = TextFieldName.valueForString(example);
 
+        assertNotNull("mainField1 returned null", enumMainField1);
+        assertNotNull("mainField2 returned null", enumMainField2);
+        assertNotNull("mainField3 returned null", enumMainField3);
+        assertNotNull("mainField4 returned null", enumMainField4);
+        assertNotNull("statusBar returned null", enumStatusBar);
+        assertNotNull("mediaClock returned null", enumMediaClock);
+        assertNotNull("mediaTrack returned null", enumMediaTrack);
+        assertNotNull("alertText1 returned null", enumAlertText1);
+        assertNotNull("alertText2 returned null", enumAlertText2);
+        assertNotNull("alertText3 returned null", enumAlertText3);
+        assertNotNull("scrollableMessageBody returned null", enumScrollableMessageBody);
+        assertNotNull("initialInteractionText returned null", enumInitialInteractionText);
+        assertNotNull("navigationText1 returned null", enumNavigationText1);
+        assertNotNull("navigationText2 returned null", enumNavigationText2);
+        assertNotNull("ETA returned null", enumEta);
+        assertNotNull("totalDistance returned null", enumTotalDistance);
+        assertNotNull("audioPassThruDisplayText1 returned null", enumAudioPassThruDisplayText1);
+        assertNotNull("audioPassThruDisplayText2 returned null", enumAudioPassThruDisplayText2);
+        assertNotNull("sliderHeader returned null", enumSliderHeader);
+        assertNotNull("sliderFooter returned null", enumSliderFooter);
+        assertNotNull("menuName returned null", enumMenuName);
+        assertNotNull("secondaryText returned null", enumSecondaryText);
+        assertNotNull("tertiaryText returned null", enumTertiaryText);
+        assertNotNull("menuTitle returned null", enumMenuTitle);
+        assertNotNull("templateTitle returned null", templateTitle);
 
-		assertNotNull(TestValues.NOT_NULL, enumLocName);
-		assertNotNull(TestValues.NOT_NULL, enumLocDesc);
-		assertNotNull(TestValues.NOT_NULL, enumAddLines);
-		assertNotNull(TestValues.NOT_NULL, enumPhone);
-	}
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "mAinField1";
-		try {
-		    TextFieldName temp = TextFieldName.valueForString(example);
+        assertNotNull(TestValues.NOT_NULL, enumLocName);
+        assertNotNull(TestValues.NOT_NULL, enumLocDesc);
+        assertNotNull(TestValues.NOT_NULL, enumAddLines);
+        assertNotNull(TestValues.NOT_NULL, enumPhone);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "mAinField1";
+        try {
+            TextFieldName temp = TextFieldName.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    TextFieldName temp = TextFieldName.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            TextFieldName temp = TextFieldName.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of TextFieldName.
-	 */
-	public void testListEnum() {
- 		List<TextFieldName> enumValueList = Arrays.asList(TextFieldName.values());
+    /**
+     * Verifies the possible enum values of TextFieldName.
+     */
+    public void testListEnum() {
+        List<TextFieldName> enumValueList = Arrays.asList(TextFieldName.values());
 
-		List<TextFieldName> enumTestList = new ArrayList<TextFieldName>();
-		enumTestList.add(TextFieldName.mainField1);
-		enumTestList.add(TextFieldName.mainField2);
-		enumTestList.add(TextFieldName.mainField3);
-		enumTestList.add(TextFieldName.mainField4);
-		enumTestList.add(TextFieldName.statusBar);
-		enumTestList.add(TextFieldName.mediaClock);		
-		enumTestList.add(TextFieldName.mediaTrack);
-		enumTestList.add(TextFieldName.alertText1);	
-		enumTestList.add(TextFieldName.alertText2);
-		enumTestList.add(TextFieldName.alertText3);	
-		enumTestList.add(TextFieldName.scrollableMessageBody);	
-		enumTestList.add(TextFieldName.initialInteractionText);
-		enumTestList.add(TextFieldName.navigationText1);	
-		enumTestList.add(TextFieldName.navigationText2);
-		enumTestList.add(TextFieldName.ETA);	
-		enumTestList.add(TextFieldName.totalDistance);	
-		enumTestList.add(TextFieldName.audioPassThruDisplayText1);
-		enumTestList.add(TextFieldName.audioPassThruDisplayText2);
-		enumTestList.add(TextFieldName.sliderHeader);
-		enumTestList.add(TextFieldName.sliderFooter);
-		enumTestList.add(TextFieldName.menuName);
-		enumTestList.add(TextFieldName.secondaryText);		
-		enumTestList.add(TextFieldName.tertiaryText);
-		enumTestList.add(TextFieldName.menuTitle);
-		enumTestList.add(TextFieldName.locationName);	
-		enumTestList.add(TextFieldName.locationDescription);	
-		enumTestList.add(TextFieldName.addressLines);	
-		enumTestList.add(TextFieldName.phoneNumber);
-		enumTestList.add(TextFieldName.templateTitle);
-		enumTestList.add(TextFieldName.subtleAlertText1);
-		enumTestList.add(TextFieldName.subtleAlertText2);
-		enumTestList.add(TextFieldName.subtleAlertSoftButtonText);
+        List<TextFieldName> enumTestList = new ArrayList<TextFieldName>();
+        enumTestList.add(TextFieldName.mainField1);
+        enumTestList.add(TextFieldName.mainField2);
+        enumTestList.add(TextFieldName.mainField3);
+        enumTestList.add(TextFieldName.mainField4);
+        enumTestList.add(TextFieldName.statusBar);
+        enumTestList.add(TextFieldName.mediaClock);
+        enumTestList.add(TextFieldName.mediaTrack);
+        enumTestList.add(TextFieldName.alertText1);
+        enumTestList.add(TextFieldName.alertText2);
+        enumTestList.add(TextFieldName.alertText3);
+        enumTestList.add(TextFieldName.scrollableMessageBody);
+        enumTestList.add(TextFieldName.initialInteractionText);
+        enumTestList.add(TextFieldName.navigationText1);
+        enumTestList.add(TextFieldName.navigationText2);
+        enumTestList.add(TextFieldName.ETA);
+        enumTestList.add(TextFieldName.totalDistance);
+        enumTestList.add(TextFieldName.audioPassThruDisplayText1);
+        enumTestList.add(TextFieldName.audioPassThruDisplayText2);
+        enumTestList.add(TextFieldName.sliderHeader);
+        enumTestList.add(TextFieldName.sliderFooter);
+        enumTestList.add(TextFieldName.menuName);
+        enumTestList.add(TextFieldName.secondaryText);
+        enumTestList.add(TextFieldName.tertiaryText);
+        enumTestList.add(TextFieldName.menuTitle);
+        enumTestList.add(TextFieldName.locationName);
+        enumTestList.add(TextFieldName.locationDescription);
+        enumTestList.add(TextFieldName.addressLines);
+        enumTestList.add(TextFieldName.phoneNumber);
+        enumTestList.add(TextFieldName.templateTitle);
+        enumTestList.add(TextFieldName.subtleAlertText1);
+        enumTestList.add(TextFieldName.subtleAlertText2);
+        enumTestList.add(TextFieldName.subtleAlertSoftButtonText);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TimerModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TimerModeTests.java
index 892159a0d..03f26d543 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TimerModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TimerModeTests.java
@@ -46,62 +46,60 @@ import java.util.List;
  */
 public class TimerModeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "UP";
-		TimerMode enumUp = TimerMode.valueForString(example);
-		example = "DOWN";
-		TimerMode enumDown = TimerMode.valueForString(example);
-		example = "NONE";
-		TimerMode enumNone = TimerMode.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "UP";
+        TimerMode enumUp = TimerMode.valueForString(example);
+        example = "DOWN";
+        TimerMode enumDown = TimerMode.valueForString(example);
+        example = "NONE";
+        TimerMode enumNone = TimerMode.valueForString(example);
 
-		assertNotNull("UP returned null", enumUp);
-		assertNotNull("DOWN returned null", enumDown);
-		assertNotNull("NONE returned null", enumNone);
-	}
+        assertNotNull("UP returned null", enumUp);
+        assertNotNull("DOWN returned null", enumDown);
+        assertNotNull("NONE returned null", enumNone);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "NonE";
-		try {
-			TimerMode temp = TimerMode.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "NonE";
+        try {
+            TimerMode temp = TimerMode.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			TimerMode temp = TimerMode.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            TimerMode temp = TimerMode.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of TimerMode.
-	 */
-	public void testListEnum() {
-		List<TimerMode> enumValueList = Arrays.asList(TimerMode.values());
+    /**
+     * Verifies the possible enum values of TimerMode.
+     */
+    public void testListEnum() {
+        List<TimerMode> enumValueList = Arrays.asList(TimerMode.values());
 
-		List<TimerMode> enumTestList = new ArrayList<>();
-		enumTestList.add(TimerMode.UP);
-		enumTestList.add(TimerMode.DOWN);
-		enumTestList.add(TimerMode.NONE);
+        List<TimerMode> enumTestList = new ArrayList<>();
+        enumTestList.add(TimerMode.UP);
+        enumTestList.add(TimerMode.DOWN);
+        enumTestList.add(TimerMode.NONE);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
index db9c417ef..a9dc4aa2b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
@@ -9,73 +9,71 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "MOVE";
-		TouchType enumMove = TouchType.valueForString(example);
-		example = "END";
-		TouchType enumEnd = TouchType.valueForString(example);
-		example = "CANCEL";
-		TouchType enumCancel = TouchType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "BEGIN";
+        TouchType enumBegin = TouchType.valueForString(example);
+        example = "MOVE";
+        TouchType enumMove = TouchType.valueForString(example);
+        example = "END";
+        TouchType enumEnd = TouchType.valueForString(example);
+        example = "CANCEL";
+        TouchType enumCancel = TouchType.valueForString(example);
 
 
-		assertNotNull("BEGIN returned null", enumBegin);
-		assertNotNull("MOVE returned null", enumMove);
-		assertNotNull("END returned null", enumEnd);
-		assertNotNull("CANCEL returned null", enumCancel);
-	}
+        assertNotNull("BEGIN returned null", enumBegin);
+        assertNotNull("MOVE returned null", enumMove);
+        assertNotNull("END returned null", enumEnd);
+        assertNotNull("CANCEL returned null", enumCancel);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "bEgIn";
-		try {
-		    TouchType temp = TouchType.valueForString(example);
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "bEgIn";
+        try {
+            TouchType temp = TouchType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    TouchType temp = TouchType.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            TouchType temp = TouchType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of TouchType.
-	 */
-	public void testListEnum() {
- 		List<TouchType> enumValueList = Arrays.asList(TouchType.values());
 
-		List<TouchType> enumTestList = new ArrayList<TouchType>();
-		enumTestList.add(TouchType.BEGIN);
-		enumTestList.add(TouchType.MOVE);
-		enumTestList.add(TouchType.END);
-		enumTestList.add(TouchType.CANCEL);
+    /**
+     * Verifies the possible enum values of TouchType.
+     */
+    public void testListEnum() {
+        List<TouchType> enumValueList = Arrays.asList(TouchType.values());
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        List<TouchType> enumTestList = new ArrayList<TouchType>();
+        enumTestList.add(TouchType.BEGIN);
+        enumTestList.add(TouchType.MOVE);
+        enumTestList.add(TouchType.END);
+        enumTestList.add(TouchType.CANCEL);
+
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TransmissionTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TransmissionTypeTests.java
index 6a21c7cc2..005d57721 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TransmissionTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TransmissionTypeTests.java
@@ -12,7 +12,7 @@ public class TransmissionTypeTests extends TestCase {
     /**
      * Verifies that the enum values are not null upon valid assignment.
      */
-    public void testValidEnums () {
+    public void testValidEnums() {
         String example = "MANUAL";
         TransmissionType manual = TransmissionType.valueForString(example);
         example = "AUTOMATIC";
@@ -45,13 +45,12 @@ public class TransmissionTypeTests extends TestCase {
     /**
      * Verifies that an invalid assignment is null.
      */
-    public void testInvalidEnum () {
+    public void testInvalidEnum() {
         String example = "pARk";
         try {
             TransmissionType temp = TransmissionType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-        }
-        catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
         }
     }
@@ -59,13 +58,12 @@ public class TransmissionTypeTests extends TestCase {
     /**
      * Verifies that a null assignment is invalid.
      */
-    public void testNullEnum () {
+    public void testNullEnum() {
         String example = null;
         try {
             TransmissionType temp = TransmissionType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-        }
-        catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
index b4e1c2e16..a24f3ef96 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
@@ -9,68 +9,66 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "VR";
-		TriggerSource enumVr = TriggerSource.valueForString(example);
-		example = "KEYBOARD";
-		TriggerSource enumKeyboard = TriggerSource.valueForString(example);
-		
-		assertNotNull("MENU returned null", enumMenu);
-		assertNotNull("VR returned null", enumVr);
-		assertNotNull("KEYBOARD returned null", enumKeyboard);
-	}
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "MENU";
+        TriggerSource enumMenu = TriggerSource.valueForString(example);
+        example = "VR";
+        TriggerSource enumVr = TriggerSource.valueForString(example);
+        example = "KEYBOARD";
+        TriggerSource enumKeyboard = TriggerSource.valueForString(example);
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "meNU";
-		try {
-		    TriggerSource temp = TriggerSource.valueForString(example);
+        assertNotNull("MENU returned null", enumMenu);
+        assertNotNull("VR returned null", enumVr);
+        assertNotNull("KEYBOARD returned null", enumKeyboard);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "meNU";
+        try {
+            TriggerSource temp = TriggerSource.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    TriggerSource temp = TriggerSource.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            TriggerSource temp = TriggerSource.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
-	
+        }
+    }
+
+
+    /**
+     * Verifies the possible enum values of TriggerSource.
+     */
+    public void testListEnum() {
+        List<TriggerSource> enumValueList = Arrays.asList(TriggerSource.values());
 
-	/**
-	 * Verifies the possible enum values of TriggerSource.
-	 */
-	public void testListEnum() {
- 		List<TriggerSource> enumValueList = Arrays.asList(TriggerSource.values());
+        List<TriggerSource> enumTestList = new ArrayList<TriggerSource>();
+        enumTestList.add(TriggerSource.TS_MENU);
+        enumTestList.add(TriggerSource.TS_VR);
+        enumTestList.add(TriggerSource.TS_KEYBOARD);
 
-		List<TriggerSource> enumTestList = new ArrayList<TriggerSource>();
-		enumTestList.add(TriggerSource.TS_MENU);
-		enumTestList.add(TriggerSource.TS_VR);
-		enumTestList.add(TriggerSource.TS_KEYBOARD);
-		
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java
index a758d683e..56127dd16 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TurnSignalTests.java
@@ -14,66 +14,64 @@ import java.util.List;
  */
 public class TurnSignalTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "OFF";
-		TurnSignal off = TurnSignal.valueForString(example);
-		example = "LEFT";
-		TurnSignal left = TurnSignal.valueForString(example);
-		example = "RIGHT";
-		TurnSignal right = TurnSignal.valueForString(example);
-		example = "BOTH";
-		TurnSignal both = TurnSignal.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "OFF";
+        TurnSignal off = TurnSignal.valueForString(example);
+        example = "LEFT";
+        TurnSignal left = TurnSignal.valueForString(example);
+        example = "RIGHT";
+        TurnSignal right = TurnSignal.valueForString(example);
+        example = "BOTH";
+        TurnSignal both = TurnSignal.valueForString(example);
 
-		assertNotNull("OFF returned null", off);
-		assertNotNull("LEFT returned null", left);
-		assertNotNull("RIGHT returned null", right);
-		assertNotNull("BOTH returned null", both);
-	}
+        assertNotNull("OFF returned null", off);
+        assertNotNull("LEFT returned null", left);
+        assertNotNull("RIGHT returned null", right);
+        assertNotNull("BOTH returned null", both);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "IsHoUldBeNulL";
-		try {
-			TurnSignal temp = TurnSignal.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "IsHoUldBeNulL";
+        try {
+            TurnSignal temp = TurnSignal.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			TurnSignal temp = TurnSignal.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            TurnSignal temp = TurnSignal.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of TurnSignal.
-	 */
-	public void testListEnum() {
-		List<TurnSignal> enumValueList = Arrays.asList(TurnSignal.values());
+    /**
+     * Verifies the possible enum values of TurnSignal.
+     */
+    public void testListEnum() {
+        List<TurnSignal> enumValueList = Arrays.asList(TurnSignal.values());
 
-		List<TurnSignal> enumTestList = new ArrayList<>();
-		enumTestList.add(TurnSignal.OFF);
-		enumTestList.add(TurnSignal.LEFT);
-		enumTestList.add(TurnSignal.RIGHT);
-		enumTestList.add(TurnSignal.BOTH);
+        List<TurnSignal> enumTestList = new ArrayList<>();
+        enumTestList.add(TurnSignal.OFF);
+        enumTestList.add(TurnSignal.LEFT);
+        enumTestList.add(TurnSignal.RIGHT);
+        enumTestList.add(TurnSignal.BOTH);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
index 508282f97..5f7c0548c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
@@ -9,75 +9,73 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "COUNTDOWN";
-		UpdateMode enumCountDown = UpdateMode.valueForString(example);
-		example = "PAUSE";
-		UpdateMode enumPause = UpdateMode.valueForString(example);
-		example = "RESUME";
-		UpdateMode enumResume = UpdateMode.valueForString(example);
-		example = "CLEAR";
-		UpdateMode enumClear = UpdateMode.valueForString(example);
-		
-		assertNotNull("COUNTUP returned null", enumCountUp);
-		assertNotNull("COUNTDOWN returned null", enumCountDown);
-		assertNotNull("PAUSE returned null", enumPause);
-		assertNotNull("RESUME returned null", enumResume);
-		assertNotNull("CLEAR returned null", enumClear);
-	}
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "coUnTUp";
-		try {
-		    UpdateMode temp = UpdateMode.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "COUNTUP";
+        UpdateMode enumCountUp = UpdateMode.valueForString(example);
+        example = "COUNTDOWN";
+        UpdateMode enumCountDown = UpdateMode.valueForString(example);
+        example = "PAUSE";
+        UpdateMode enumPause = UpdateMode.valueForString(example);
+        example = "RESUME";
+        UpdateMode enumResume = UpdateMode.valueForString(example);
+        example = "CLEAR";
+        UpdateMode enumClear = UpdateMode.valueForString(example);
+
+        assertNotNull("COUNTUP returned null", enumCountUp);
+        assertNotNull("COUNTDOWN returned null", enumCountDown);
+        assertNotNull("PAUSE returned null", enumPause);
+        assertNotNull("RESUME returned null", enumResume);
+        assertNotNull("CLEAR returned null", enumClear);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "coUnTUp";
+        try {
+            UpdateMode temp = UpdateMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    UpdateMode temp = UpdateMode.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            UpdateMode temp = UpdateMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of UpdateMode.
-	 */
-	public void testListEnum() {
- 		List<UpdateMode> enumValueList = Arrays.asList(UpdateMode.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of UpdateMode.
+     */
+    public void testListEnum() {
+        List<UpdateMode> enumValueList = Arrays.asList(UpdateMode.values());
 
-		List<UpdateMode> enumTestList = new ArrayList<UpdateMode>();
-		enumTestList.add(UpdateMode.COUNTUP);
-		enumTestList.add(UpdateMode.COUNTDOWN);
-		enumTestList.add(UpdateMode.PAUSE);
-		enumTestList.add(UpdateMode.RESUME);
-		enumTestList.add(UpdateMode.CLEAR);
+        List<UpdateMode> enumTestList = new ArrayList<UpdateMode>();
+        enumTestList.add(UpdateMode.COUNTUP);
+        enumTestList.add(UpdateMode.COUNTDOWN);
+        enumTestList.add(UpdateMode.PAUSE);
+        enumTestList.add(UpdateMode.RESUME);
+        enumTestList.add(UpdateMode.CLEAR);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java
index b6ba15a7a..4f3c89191 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataActiveStatusTests.java
@@ -46,70 +46,68 @@ import java.util.List;
  */
 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);
-		example = "INACTIVE_CONFIRMED";
-		VehicleDataActiveStatus enumInactiveConfirmed = VehicleDataActiveStatus.valueForString(example);
-		example = "ACTIVE_NOT_CONFIRMED";
-		VehicleDataActiveStatus enumActiveNotConfirmed = VehicleDataActiveStatus.valueForString(example);
-		example = "ACTIVE_CONFIRMED";
-		VehicleDataActiveStatus enumActiveConfirmed = VehicleDataActiveStatus.valueForString(example);
-		example = "FAULT";
-		VehicleDataActiveStatus enumFault = VehicleDataActiveStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "INACTIVE_NOT_CONFIRMED";
+        VehicleDataActiveStatus enumInactiveNotConfirmed = VehicleDataActiveStatus.valueForString(example);
+        example = "INACTIVE_CONFIRMED";
+        VehicleDataActiveStatus enumInactiveConfirmed = VehicleDataActiveStatus.valueForString(example);
+        example = "ACTIVE_NOT_CONFIRMED";
+        VehicleDataActiveStatus enumActiveNotConfirmed = VehicleDataActiveStatus.valueForString(example);
+        example = "ACTIVE_CONFIRMED";
+        VehicleDataActiveStatus enumActiveConfirmed = VehicleDataActiveStatus.valueForString(example);
+        example = "FAULT";
+        VehicleDataActiveStatus enumFault = VehicleDataActiveStatus.valueForString(example);
 
-		assertNotNull("INACTIVE_NOT_CONFIRMED returned null", enumInactiveNotConfirmed);
-		assertNotNull("INACTIVE_CONFIRMED returned null", enumInactiveConfirmed);
-		assertNotNull("ACTIVE_NOT_CONFIRMED returned null", enumActiveNotConfirmed);
-		assertNotNull("ACTIVE_CONFIRMED returned null", enumActiveConfirmed);
-		assertNotNull("FAULT returned null", enumFault);
-	}
+        assertNotNull("INACTIVE_NOT_CONFIRMED returned null", enumInactiveNotConfirmed);
+        assertNotNull("INACTIVE_CONFIRMED returned null", enumInactiveConfirmed);
+        assertNotNull("ACTIVE_NOT_CONFIRMED returned null", enumActiveNotConfirmed);
+        assertNotNull("ACTIVE_CONFIRMED returned null", enumActiveConfirmed);
+        assertNotNull("FAULT returned null", enumFault);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "FauLt";
-		try {
-			VehicleDataActiveStatus temp = VehicleDataActiveStatus.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "FauLt";
+        try {
+            VehicleDataActiveStatus temp = VehicleDataActiveStatus.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			VehicleDataActiveStatus temp = VehicleDataActiveStatus.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VehicleDataActiveStatus temp = VehicleDataActiveStatus.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of VehicleDataActiveStatus.
-	 */
-	public void testListEnum() {
-		List<VehicleDataActiveStatus> enumValueList = Arrays.asList(VehicleDataActiveStatus.values());
+    /**
+     * Verifies the possible enum values of VehicleDataActiveStatus.
+     */
+    public void testListEnum() {
+        List<VehicleDataActiveStatus> enumValueList = Arrays.asList(VehicleDataActiveStatus.values());
 
-		List<VehicleDataActiveStatus> enumTestList = new ArrayList<>();
-		enumTestList.add(VehicleDataActiveStatus.INACTIVE_NOT_CONFIRMED);
-		enumTestList.add(VehicleDataActiveStatus.INACTIVE_CONFIRMED);
-		enumTestList.add(VehicleDataActiveStatus.ACTIVE_NOT_CONFIRMED);
-		enumTestList.add(VehicleDataActiveStatus.ACTIVE_CONFIRMED);
-		enumTestList.add(VehicleDataActiveStatus.FAULT);
+        List<VehicleDataActiveStatus> enumTestList = new ArrayList<>();
+        enumTestList.add(VehicleDataActiveStatus.INACTIVE_NOT_CONFIRMED);
+        enumTestList.add(VehicleDataActiveStatus.INACTIVE_CONFIRMED);
+        enumTestList.add(VehicleDataActiveStatus.ACTIVE_NOT_CONFIRMED);
+        enumTestList.add(VehicleDataActiveStatus.ACTIVE_CONFIRMED);
+        enumTestList.add(VehicleDataActiveStatus.FAULT);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
index d70d20446..4cee560c0 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
@@ -9,75 +9,73 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "NO";
-		VehicleDataEventStatus enumNo = VehicleDataEventStatus.valueForString(example);
-		example = "YES";
-		VehicleDataEventStatus enumYes = VehicleDataEventStatus.valueForString(example);
-		example = "NOT_SUPPORTED";
-		VehicleDataEventStatus enumNotSupported = VehicleDataEventStatus.valueForString(example);
-		example = "FAULT";
-		VehicleDataEventStatus enumFault = VehicleDataEventStatus.valueForString(example);
-		
-		assertNotNull("NO_EVENT returned null", enumNoEvent);
-		assertNotNull("NO returned null", enumNo);
-		assertNotNull("YES returned null", enumYes);
-		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 {
-		    VehicleDataEventStatus temp = VehicleDataEventStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NO_EVENT";
+        VehicleDataEventStatus enumNoEvent = VehicleDataEventStatus.valueForString(example);
+        example = "NO";
+        VehicleDataEventStatus enumNo = VehicleDataEventStatus.valueForString(example);
+        example = "YES";
+        VehicleDataEventStatus enumYes = VehicleDataEventStatus.valueForString(example);
+        example = "NOT_SUPPORTED";
+        VehicleDataEventStatus enumNotSupported = VehicleDataEventStatus.valueForString(example);
+        example = "FAULT";
+        VehicleDataEventStatus enumFault = VehicleDataEventStatus.valueForString(example);
+
+        assertNotNull("NO_EVENT returned null", enumNoEvent);
+        assertNotNull("NO returned null", enumNo);
+        assertNotNull("YES returned null", enumYes);
+        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 {
+            VehicleDataEventStatus temp = VehicleDataEventStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    VehicleDataEventStatus temp = VehicleDataEventStatus.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VehicleDataEventStatus temp = VehicleDataEventStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of AmbientLightStatus.
-	 */
-	public void testListEnum() {
- 		List<VehicleDataEventStatus> enumValueList = Arrays.asList(VehicleDataEventStatus.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of AmbientLightStatus.
+     */
+    public void testListEnum() {
+        List<VehicleDataEventStatus> enumValueList = Arrays.asList(VehicleDataEventStatus.values());
 
-		List<VehicleDataEventStatus> enumTestList = new ArrayList<VehicleDataEventStatus>();
-		enumTestList.add(VehicleDataEventStatus.NO_EVENT);
-		enumTestList.add(VehicleDataEventStatus.NO);
-		enumTestList.add(VehicleDataEventStatus.YES);
-		enumTestList.add(VehicleDataEventStatus.NOT_SUPPORTED);
-		enumTestList.add(VehicleDataEventStatus.FAULT);
+        List<VehicleDataEventStatus> enumTestList = new ArrayList<VehicleDataEventStatus>();
+        enumTestList.add(VehicleDataEventStatus.NO_EVENT);
+        enumTestList.add(VehicleDataEventStatus.NO);
+        enumTestList.add(VehicleDataEventStatus.YES);
+        enumTestList.add(VehicleDataEventStatus.NOT_SUPPORTED);
+        enumTestList.add(VehicleDataEventStatus.FAULT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
index 622938fbf..4641d92dd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
@@ -9,71 +9,69 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "NORMAL";
-		VehicleDataNotificationStatus enumNormal = VehicleDataNotificationStatus.valueForString(example);
-		example = "ACTIVE";
-		VehicleDataNotificationStatus enumActive = VehicleDataNotificationStatus.valueForString(example);
-		example = "NOT_USED";
-		VehicleDataNotificationStatus enumNotUsed = VehicleDataNotificationStatus.valueForString(example);
-		
-		assertNotNull("NOT_SUPPORTED returned null", enumNotSupported);
-		assertNotNull("NORMAL returned null", enumNormal);
-		assertNotNull("ACTIVE returned null", enumActive);
-		assertNotNull("NOT_USED returned null", enumNotUsed);
-	}
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "nOT_SuppOrTEd";
-		try {
-		    VehicleDataNotificationStatus temp = VehicleDataNotificationStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NOT_SUPPORTED";
+        VehicleDataNotificationStatus enumNotSupported = VehicleDataNotificationStatus.valueForString(example);
+        example = "NORMAL";
+        VehicleDataNotificationStatus enumNormal = VehicleDataNotificationStatus.valueForString(example);
+        example = "ACTIVE";
+        VehicleDataNotificationStatus enumActive = VehicleDataNotificationStatus.valueForString(example);
+        example = "NOT_USED";
+        VehicleDataNotificationStatus enumNotUsed = VehicleDataNotificationStatus.valueForString(example);
+
+        assertNotNull("NOT_SUPPORTED returned null", enumNotSupported);
+        assertNotNull("NORMAL returned null", enumNormal);
+        assertNotNull("ACTIVE returned null", enumActive);
+        assertNotNull("NOT_USED returned null", enumNotUsed);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "nOT_SuppOrTEd";
+        try {
+            VehicleDataNotificationStatus temp = VehicleDataNotificationStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    VehicleDataNotificationStatus temp = VehicleDataNotificationStatus.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VehicleDataNotificationStatus temp = VehicleDataNotificationStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of VehicleDataNotification.
-	 */
-	public void testListEnum() {
- 		List<VehicleDataNotificationStatus> enumValueList = Arrays.asList(VehicleDataNotificationStatus.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of VehicleDataNotification.
+     */
+    public void testListEnum() {
+        List<VehicleDataNotificationStatus> enumValueList = Arrays.asList(VehicleDataNotificationStatus.values());
 
-		List<VehicleDataNotificationStatus> enumTestList = new ArrayList<VehicleDataNotificationStatus>();
-		enumTestList.add(VehicleDataNotificationStatus.NOT_SUPPORTED);
-		enumTestList.add(VehicleDataNotificationStatus.NORMAL);
-		enumTestList.add(VehicleDataNotificationStatus.ACTIVE);
-		enumTestList.add(VehicleDataNotificationStatus.NOT_USED);
+        List<VehicleDataNotificationStatus> enumTestList = new ArrayList<VehicleDataNotificationStatus>();
+        enumTestList.add(VehicleDataNotificationStatus.NOT_SUPPORTED);
+        enumTestList.add(VehicleDataNotificationStatus.NORMAL);
+        enumTestList.add(VehicleDataNotificationStatus.ACTIVE);
+        enumTestList.add(VehicleDataNotificationStatus.NOT_USED);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
index df926b1aa..61705d8aa 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
@@ -9,91 +9,89 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "TRUNCATED_DATA";
-		VehicleDataResultCode enumTruncData = VehicleDataResultCode.valueForString(example);
-		example = "DISALLOWED";
-		VehicleDataResultCode enumDisallowed = VehicleDataResultCode.valueForString(example);
-		example = "USER_DISALLOWED";
-		VehicleDataResultCode enumUserDisallowed = VehicleDataResultCode.valueForString(example);
-		example = "INVALID_ID";
-		VehicleDataResultCode enumInvalidId = VehicleDataResultCode.valueForString(example);
-		example = "VEHICLE_DATA_NOT_AVAILABLE";
-		VehicleDataResultCode enumVehicleDataNotAvailable = VehicleDataResultCode.valueForString(example);
-		example = "DATA_ALREADY_SUBSCRIBED";
-		VehicleDataResultCode enumDataAlreadySubscribed = VehicleDataResultCode.valueForString(example);
-		example = "DATA_NOT_SUBSCRIBED";
-		VehicleDataResultCode enumDataNotSubscribed = VehicleDataResultCode.valueForString(example);
-		example = "IGNORED";
-		VehicleDataResultCode enumIgnored = VehicleDataResultCode.valueForString(example);
-		
-		assertNotNull("SUCCESS returned null", enumSuccess);
-		assertNotNull("TRUNCATED_DATA returned null", enumTruncData);
-		assertNotNull("DISALLOWED returned null", enumDisallowed);
-		assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed);
-		assertNotNull("INVALID_ID returned null", enumInvalidId);
-		assertNotNull("VEHICLE_DATA_NOT_AVAILABLE returned null", enumVehicleDataNotAvailable);
-		assertNotNull("DATA_ALREADY_SUBSCRIBED returned null", enumDataAlreadySubscribed);
-		assertNotNull("DATA_NOT_SUBSCRIBED returned null", enumDataNotSubscribed);
-		assertNotNull("IGNORED returned null", enumIgnored);
-	}
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "suCcesS";
-		try {
-		    VehicleDataResultCode temp = VehicleDataResultCode.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "SUCCESS";
+        VehicleDataResultCode enumSuccess = VehicleDataResultCode.valueForString(example);
+        example = "TRUNCATED_DATA";
+        VehicleDataResultCode enumTruncData = VehicleDataResultCode.valueForString(example);
+        example = "DISALLOWED";
+        VehicleDataResultCode enumDisallowed = VehicleDataResultCode.valueForString(example);
+        example = "USER_DISALLOWED";
+        VehicleDataResultCode enumUserDisallowed = VehicleDataResultCode.valueForString(example);
+        example = "INVALID_ID";
+        VehicleDataResultCode enumInvalidId = VehicleDataResultCode.valueForString(example);
+        example = "VEHICLE_DATA_NOT_AVAILABLE";
+        VehicleDataResultCode enumVehicleDataNotAvailable = VehicleDataResultCode.valueForString(example);
+        example = "DATA_ALREADY_SUBSCRIBED";
+        VehicleDataResultCode enumDataAlreadySubscribed = VehicleDataResultCode.valueForString(example);
+        example = "DATA_NOT_SUBSCRIBED";
+        VehicleDataResultCode enumDataNotSubscribed = VehicleDataResultCode.valueForString(example);
+        example = "IGNORED";
+        VehicleDataResultCode enumIgnored = VehicleDataResultCode.valueForString(example);
+
+        assertNotNull("SUCCESS returned null", enumSuccess);
+        assertNotNull("TRUNCATED_DATA returned null", enumTruncData);
+        assertNotNull("DISALLOWED returned null", enumDisallowed);
+        assertNotNull("USER_DISALLOWED returned null", enumUserDisallowed);
+        assertNotNull("INVALID_ID returned null", enumInvalidId);
+        assertNotNull("VEHICLE_DATA_NOT_AVAILABLE returned null", enumVehicleDataNotAvailable);
+        assertNotNull("DATA_ALREADY_SUBSCRIBED returned null", enumDataAlreadySubscribed);
+        assertNotNull("DATA_NOT_SUBSCRIBED returned null", enumDataNotSubscribed);
+        assertNotNull("IGNORED returned null", enumIgnored);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "suCcesS";
+        try {
+            VehicleDataResultCode temp = VehicleDataResultCode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    VehicleDataResultCode temp = VehicleDataResultCode.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VehicleDataResultCode temp = VehicleDataResultCode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of VehicleDataResultCode.
-	 */
-	public void testListEnum() {
- 		List<VehicleDataResultCode> enumValueList = Arrays.asList(VehicleDataResultCode.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of VehicleDataResultCode.
+     */
+    public void testListEnum() {
+        List<VehicleDataResultCode> enumValueList = Arrays.asList(VehicleDataResultCode.values());
 
-		List<VehicleDataResultCode> enumTestList = new ArrayList<VehicleDataResultCode>();
-		enumTestList.add(VehicleDataResultCode.SUCCESS);
-		enumTestList.add(VehicleDataResultCode.TRUNCATED_DATA);
-		enumTestList.add(VehicleDataResultCode.DISALLOWED);
-		enumTestList.add(VehicleDataResultCode.USER_DISALLOWED);
-		enumTestList.add(VehicleDataResultCode.INVALID_ID);
-		enumTestList.add(VehicleDataResultCode.VEHICLE_DATA_NOT_AVAILABLE);
-		enumTestList.add(VehicleDataResultCode.DATA_ALREADY_SUBSCRIBED);		
-		enumTestList.add(VehicleDataResultCode.DATA_NOT_SUBSCRIBED);
-		enumTestList.add(VehicleDataResultCode.IGNORED);	
+        List<VehicleDataResultCode> enumTestList = new ArrayList<VehicleDataResultCode>();
+        enumTestList.add(VehicleDataResultCode.SUCCESS);
+        enumTestList.add(VehicleDataResultCode.TRUNCATED_DATA);
+        enumTestList.add(VehicleDataResultCode.DISALLOWED);
+        enumTestList.add(VehicleDataResultCode.USER_DISALLOWED);
+        enumTestList.add(VehicleDataResultCode.INVALID_ID);
+        enumTestList.add(VehicleDataResultCode.VEHICLE_DATA_NOT_AVAILABLE);
+        enumTestList.add(VehicleDataResultCode.DATA_ALREADY_SUBSCRIBED);
+        enumTestList.add(VehicleDataResultCode.DATA_NOT_SUBSCRIBED);
+        enumTestList.add(VehicleDataResultCode.IGNORED);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
index 48f972baf..6808df33a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
@@ -9,67 +9,65 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		example = "OFF";
-		VehicleDataStatus enumOff = VehicleDataStatus.valueForString(example);
-		example = "ON";
-		VehicleDataStatus enumOn = VehicleDataStatus.valueForString(example);
-		
-		assertNotNull("NO_DATA_EXISTS returned null", enumNoDataExists);
-		assertNotNull("OFF returned null", enumOff);
-		assertNotNull("ON returned null", enumOn);
-	}
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "No_DatA_ExiSTs";
-		try {
-		    VehicleDataStatus temp = VehicleDataStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "NO_DATA_EXISTS";
+        VehicleDataStatus enumNoDataExists = VehicleDataStatus.valueForString(example);
+        example = "OFF";
+        VehicleDataStatus enumOff = VehicleDataStatus.valueForString(example);
+        example = "ON";
+        VehicleDataStatus enumOn = VehicleDataStatus.valueForString(example);
+
+        assertNotNull("NO_DATA_EXISTS returned null", enumNoDataExists);
+        assertNotNull("OFF returned null", enumOff);
+        assertNotNull("ON returned null", enumOn);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "No_DatA_ExiSTs";
+        try {
+            VehicleDataStatus temp = VehicleDataStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    VehicleDataStatus temp = VehicleDataStatus.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VehicleDataStatus temp = VehicleDataStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of VehicleDataStatus.
-	 */
-	public void testListEnum() {
- 		List<VehicleDataStatus> enumValueList = Arrays.asList(VehicleDataStatus.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of VehicleDataStatus.
+     */
+    public void testListEnum() {
+        List<VehicleDataStatus> enumValueList = Arrays.asList(VehicleDataStatus.values());
 
-		List<VehicleDataStatus> enumTestList = new ArrayList<VehicleDataStatus>();
-		enumTestList.add(VehicleDataStatus.NO_DATA_EXISTS);
-		enumTestList.add(VehicleDataStatus.OFF);
-		enumTestList.add(VehicleDataStatus.ON);
+        List<VehicleDataStatus> enumTestList = new ArrayList<VehicleDataStatus>();
+        enumTestList.add(VehicleDataStatus.NO_DATA_EXISTS);
+        enumTestList.add(VehicleDataStatus.OFF);
+        enumTestList.add(VehicleDataStatus.ON);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
index a337058f9..1b270a9dd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
@@ -9,199 +9,197 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.VehicleDataType}
  */
 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);
-		example = "VEHICLEDATA_SPEED";
-		VehicleDataType enumVehicleDataSpeed = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_RPM";
-		VehicleDataType enumVehicleDataRpm = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_FUELLEVEL";
-		VehicleDataType enumVehicleDataFuelLevel = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_FUELLEVEL_STATE";
-		VehicleDataType enumVehicleDataFuelLevelState = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_FUELCONSUMPTION";
-		VehicleDataType enumVehicleDataFuelConsumption = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_EXTERNTEMP";
-		VehicleDataType enumVehicleDataExternTemp = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_VIN";
-		VehicleDataType enumVehicleDataVin = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_PRNDL";
-		VehicleDataType enumVehicleDataPrndl = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_TIREPRESSURE";
-		VehicleDataType enumVehicleDataTirePressure = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_ODOMETER";
-		VehicleDataType enumVehicleDataOdometer = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_BELTSTATUS";
-		VehicleDataType enumVehicleDataBeltStatus = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_BODYINFO";
-		VehicleDataType enumVehicleDataBodyInfo = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_DEVICESTATUS";
-		VehicleDataType enumVehicleDataDeviceStatus = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_BRAKING";
-		VehicleDataType enumVehicleDataBraking = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_WIPERSTATUS";
-		VehicleDataType enumVehicleDataWiperStatus = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_HEADLAMPSTATUS";
-		VehicleDataType enumVehicleDataHeadlampStatus = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_BATTVOLTAGE";
-		VehicleDataType enumVehicleDataBattVoltage = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_ENGINETORQUE";
-		VehicleDataType enumVehicleDataEngineTorque = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_ENGINEOILLIFE";
-		VehicleDataType enumVehicleDataEngineOilLife = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_ACCPEDAL";
-		VehicleDataType enumVehicleDataAccPedal = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_STEERINGWHEEL";
-		VehicleDataType enumVehicleDataSteeringWheel = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_ECALLINFO";
-		VehicleDataType enumVehicleDataECallInfo = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_AIRBAGSTATUS";
-		VehicleDataType enumVehicleDataAirbagStatus = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_EMERGENCYEVENT";
-		VehicleDataType enumVehicleDataEmergencyEvent = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_CLUSTERMODESTATUS";
-		VehicleDataType enumVehicleDataClusterModeStatus = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_MYKEY";
-		VehicleDataType enumVehicleDataMyKey = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_FUELRANGE";
-		VehicleDataType enumVehicleDataFuelRange = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_TURNSIGNAL";
-		VehicleDataType enumVehicleDataTurnSignal = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_ELECTRONICPARKBRAKESTATUS";
-		VehicleDataType enumVehicleDataElectronicParkBrakeStatus = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_CLOUDAPPVEHICLEID";
-		VehicleDataType enumVehicleCloudAppVehicleId = VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_OEM_CUSTOM_DATA";
-		VehicleDataType enumVehicleDataOemVehicleDataType= VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_HANDSOFFSTEERING";
-		VehicleDataType enumVehicleDataHandsOffSteeringType= VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_GEARSTATUS";
-		VehicleDataType enumVehicleDataGearStatus= VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_WINDOWSTATUS";
-		VehicleDataType enumVehicleDataTypeWindowStatus= VehicleDataType.valueForString(example);
-		example = "VEHICLEDATA_STABILITYCONTROLSSTATUS";
-		VehicleDataType enumVehicleDataStabilityControlsStatus = VehicleDataType.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "VEHICLEDATA_GPS";
+        VehicleDataType enumVehicleDataGps = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_SPEED";
+        VehicleDataType enumVehicleDataSpeed = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_RPM";
+        VehicleDataType enumVehicleDataRpm = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_FUELLEVEL";
+        VehicleDataType enumVehicleDataFuelLevel = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_FUELLEVEL_STATE";
+        VehicleDataType enumVehicleDataFuelLevelState = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_FUELCONSUMPTION";
+        VehicleDataType enumVehicleDataFuelConsumption = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_EXTERNTEMP";
+        VehicleDataType enumVehicleDataExternTemp = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_VIN";
+        VehicleDataType enumVehicleDataVin = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_PRNDL";
+        VehicleDataType enumVehicleDataPrndl = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_TIREPRESSURE";
+        VehicleDataType enumVehicleDataTirePressure = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_ODOMETER";
+        VehicleDataType enumVehicleDataOdometer = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_BELTSTATUS";
+        VehicleDataType enumVehicleDataBeltStatus = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_BODYINFO";
+        VehicleDataType enumVehicleDataBodyInfo = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_DEVICESTATUS";
+        VehicleDataType enumVehicleDataDeviceStatus = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_BRAKING";
+        VehicleDataType enumVehicleDataBraking = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_WIPERSTATUS";
+        VehicleDataType enumVehicleDataWiperStatus = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_HEADLAMPSTATUS";
+        VehicleDataType enumVehicleDataHeadlampStatus = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_BATTVOLTAGE";
+        VehicleDataType enumVehicleDataBattVoltage = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_ENGINETORQUE";
+        VehicleDataType enumVehicleDataEngineTorque = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_ENGINEOILLIFE";
+        VehicleDataType enumVehicleDataEngineOilLife = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_ACCPEDAL";
+        VehicleDataType enumVehicleDataAccPedal = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_STEERINGWHEEL";
+        VehicleDataType enumVehicleDataSteeringWheel = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_ECALLINFO";
+        VehicleDataType enumVehicleDataECallInfo = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_AIRBAGSTATUS";
+        VehicleDataType enumVehicleDataAirbagStatus = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_EMERGENCYEVENT";
+        VehicleDataType enumVehicleDataEmergencyEvent = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_CLUSTERMODESTATUS";
+        VehicleDataType enumVehicleDataClusterModeStatus = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_MYKEY";
+        VehicleDataType enumVehicleDataMyKey = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_FUELRANGE";
+        VehicleDataType enumVehicleDataFuelRange = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_TURNSIGNAL";
+        VehicleDataType enumVehicleDataTurnSignal = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_ELECTRONICPARKBRAKESTATUS";
+        VehicleDataType enumVehicleDataElectronicParkBrakeStatus = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_CLOUDAPPVEHICLEID";
+        VehicleDataType enumVehicleCloudAppVehicleId = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_OEM_CUSTOM_DATA";
+        VehicleDataType enumVehicleDataOemVehicleDataType = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_HANDSOFFSTEERING";
+        VehicleDataType enumVehicleDataHandsOffSteeringType = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_GEARSTATUS";
+        VehicleDataType enumVehicleDataGearStatus = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_WINDOWSTATUS";
+        VehicleDataType enumVehicleDataTypeWindowStatus = VehicleDataType.valueForString(example);
+        example = "VEHICLEDATA_STABILITYCONTROLSSTATUS";
+        VehicleDataType enumVehicleDataStabilityControlsStatus = VehicleDataType.valueForString(example);
 
-		assertNotNull("VEHICLEDATA_GPS returned null", enumVehicleDataGps);
-		assertNotNull("VEHICLEDATA_SPEED returned null", enumVehicleDataSpeed);
-		assertNotNull("VEHICLEDATA_RPM returned null", enumVehicleDataRpm);
-		assertNotNull("VEHICLEDATA_FUELLEVEL returned null", enumVehicleDataFuelLevel);
-		assertNotNull("VEHICLEDATA_FUELLEVEL_STATE returned null", enumVehicleDataFuelLevelState);
-		assertNotNull("VEHICLEDATA_FUELCONSUMPTION returned null", enumVehicleDataFuelConsumption);
-		assertNotNull("VEHICLEDATA_EXTERNTEMP returned null", enumVehicleDataExternTemp);
-		assertNotNull("VEHICLEDATA_VIN returned null", enumVehicleDataVin);
-		assertNotNull("VEHICLEDATA_PRNDL returned null", enumVehicleDataPrndl);
-		assertNotNull("VEHICLEDATA_TIREPRESSURE returned null", enumVehicleDataTirePressure);
-		assertNotNull("VEHICLEDATA_ODOMETER returned null", enumVehicleDataOdometer);
-		assertNotNull("VEHICLEDATA_BELTSTATUS returned null", enumVehicleDataBeltStatus);
-		assertNotNull("VEHICLEDATA_BODYINFO returned null", enumVehicleDataBodyInfo);
-		assertNotNull("VEHICLEDATA_DEVICESTATUS returned null", enumVehicleDataDeviceStatus);
-		assertNotNull("VEHICLEDATA_BRAKING returned null", enumVehicleDataBraking);
-		assertNotNull("VEHICLEDATA_WIPERSTATUS returned null", enumVehicleDataWiperStatus);
-		assertNotNull("VEHICLEDATA_HEADLAMPSTATUS returned null", enumVehicleDataHeadlampStatus);
-		assertNotNull("VEHICLEDATA_BATTVOLTAGE returned null", enumVehicleDataBattVoltage);
-		assertNotNull("VEHICLEDATA_ENGINETORQUE returned null", enumVehicleDataEngineTorque);
-		assertNotNull("VEHICLEDATA_ENGINEOILLIFE returned null", enumVehicleDataEngineOilLife);
-		assertNotNull("VEHICLEDATA_ACCPEDAL returned null", enumVehicleDataAccPedal);
-		assertNotNull("VEHICLEDATA_STEERINGWHEEL returned null", enumVehicleDataSteeringWheel);
-		assertNotNull("VEHICLEDATA_ECALLINFO returned null", enumVehicleDataECallInfo);
-		assertNotNull("VEHICLEDATA_AIRBAGSTATUS returned null", enumVehicleDataAirbagStatus);
-		assertNotNull("VEHICLEDATA_EMERGENCYEVENT returned null", enumVehicleDataEmergencyEvent);
-		assertNotNull("VEHICLEDATA_CLUSTERMODESTATUS returned null", enumVehicleDataClusterModeStatus);
-		assertNotNull("VEHICLEDATA_MYKEY returned null", enumVehicleDataMyKey);
-		assertNotNull("VEHICLEDATA_FUELRANGE returned null", enumVehicleDataFuelRange);
-		assertNotNull("VEHICLEDATA_TURNSIGNAL returned null", enumVehicleDataTurnSignal);
-		assertNotNull("VEHICLEDATA_ELECTRONICPARKBRAKESTATUS returned null", enumVehicleDataElectronicParkBrakeStatus);
-		assertNotNull("VEHICLEDATA_CLOUDAPPVEHICLEID returned null", enumVehicleCloudAppVehicleId);
-		assertNotNull("VEHICLEDATA_OEM_CUSTOM_DATA returned null", enumVehicleDataOemVehicleDataType);
-		assertNotNull("VEHICLEDATA_HANDSOFFSTEERING returned null", enumVehicleDataHandsOffSteeringType);
-		assertNotNull("VEHICLEDATA_WINDOWSTATUS returned null", enumVehicleDataTypeWindowStatus);
-		assertNotNull("VEHICLEDATA_GEARSTATUS returned null", enumVehicleDataGearStatus);
-		assertNotNull("VEHICLEDATA_STABILITYCONTROLSSTATUS returned null", enumVehicleDataStabilityControlsStatus);
-	}
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "VeHIcLEDatA_GPs";
-		try {
-		    VehicleDataType temp = VehicleDataType.valueForString(example);
+        assertNotNull("VEHICLEDATA_GPS returned null", enumVehicleDataGps);
+        assertNotNull("VEHICLEDATA_SPEED returned null", enumVehicleDataSpeed);
+        assertNotNull("VEHICLEDATA_RPM returned null", enumVehicleDataRpm);
+        assertNotNull("VEHICLEDATA_FUELLEVEL returned null", enumVehicleDataFuelLevel);
+        assertNotNull("VEHICLEDATA_FUELLEVEL_STATE returned null", enumVehicleDataFuelLevelState);
+        assertNotNull("VEHICLEDATA_FUELCONSUMPTION returned null", enumVehicleDataFuelConsumption);
+        assertNotNull("VEHICLEDATA_EXTERNTEMP returned null", enumVehicleDataExternTemp);
+        assertNotNull("VEHICLEDATA_VIN returned null", enumVehicleDataVin);
+        assertNotNull("VEHICLEDATA_PRNDL returned null", enumVehicleDataPrndl);
+        assertNotNull("VEHICLEDATA_TIREPRESSURE returned null", enumVehicleDataTirePressure);
+        assertNotNull("VEHICLEDATA_ODOMETER returned null", enumVehicleDataOdometer);
+        assertNotNull("VEHICLEDATA_BELTSTATUS returned null", enumVehicleDataBeltStatus);
+        assertNotNull("VEHICLEDATA_BODYINFO returned null", enumVehicleDataBodyInfo);
+        assertNotNull("VEHICLEDATA_DEVICESTATUS returned null", enumVehicleDataDeviceStatus);
+        assertNotNull("VEHICLEDATA_BRAKING returned null", enumVehicleDataBraking);
+        assertNotNull("VEHICLEDATA_WIPERSTATUS returned null", enumVehicleDataWiperStatus);
+        assertNotNull("VEHICLEDATA_HEADLAMPSTATUS returned null", enumVehicleDataHeadlampStatus);
+        assertNotNull("VEHICLEDATA_BATTVOLTAGE returned null", enumVehicleDataBattVoltage);
+        assertNotNull("VEHICLEDATA_ENGINETORQUE returned null", enumVehicleDataEngineTorque);
+        assertNotNull("VEHICLEDATA_ENGINEOILLIFE returned null", enumVehicleDataEngineOilLife);
+        assertNotNull("VEHICLEDATA_ACCPEDAL returned null", enumVehicleDataAccPedal);
+        assertNotNull("VEHICLEDATA_STEERINGWHEEL returned null", enumVehicleDataSteeringWheel);
+        assertNotNull("VEHICLEDATA_ECALLINFO returned null", enumVehicleDataECallInfo);
+        assertNotNull("VEHICLEDATA_AIRBAGSTATUS returned null", enumVehicleDataAirbagStatus);
+        assertNotNull("VEHICLEDATA_EMERGENCYEVENT returned null", enumVehicleDataEmergencyEvent);
+        assertNotNull("VEHICLEDATA_CLUSTERMODESTATUS returned null", enumVehicleDataClusterModeStatus);
+        assertNotNull("VEHICLEDATA_MYKEY returned null", enumVehicleDataMyKey);
+        assertNotNull("VEHICLEDATA_FUELRANGE returned null", enumVehicleDataFuelRange);
+        assertNotNull("VEHICLEDATA_TURNSIGNAL returned null", enumVehicleDataTurnSignal);
+        assertNotNull("VEHICLEDATA_ELECTRONICPARKBRAKESTATUS returned null", enumVehicleDataElectronicParkBrakeStatus);
+        assertNotNull("VEHICLEDATA_CLOUDAPPVEHICLEID returned null", enumVehicleCloudAppVehicleId);
+        assertNotNull("VEHICLEDATA_OEM_CUSTOM_DATA returned null", enumVehicleDataOemVehicleDataType);
+        assertNotNull("VEHICLEDATA_HANDSOFFSTEERING returned null", enumVehicleDataHandsOffSteeringType);
+        assertNotNull("VEHICLEDATA_WINDOWSTATUS returned null", enumVehicleDataTypeWindowStatus);
+        assertNotNull("VEHICLEDATA_GEARSTATUS returned null", enumVehicleDataGearStatus);
+        assertNotNull("VEHICLEDATA_STABILITYCONTROLSSTATUS returned null", enumVehicleDataStabilityControlsStatus);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "VeHIcLEDatA_GPs";
+        try {
+            VehicleDataType temp = VehicleDataType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    VehicleDataType temp = VehicleDataType.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VehicleDataType temp = VehicleDataType.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of VehicleDataType.
-	 */
-	public void testListEnum() {
- 		List<VehicleDataType> enumValueList = Arrays.asList(VehicleDataType.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of VehicleDataType.
+     */
+    public void testListEnum() {
+        List<VehicleDataType> enumValueList = Arrays.asList(VehicleDataType.values());
 
-		List<VehicleDataType> enumTestList = new ArrayList<VehicleDataType>();
-		enumTestList.add(VehicleDataType.VEHICLEDATA_GPS);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_SPEED);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_RPM);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_FUELLEVEL);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION);		
-		enumTestList.add(VehicleDataType.VEHICLEDATA_EXTERNTEMP);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_VIN);	
-		enumTestList.add(VehicleDataType.VEHICLEDATA_PRNDL);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_TIREPRESSURE);	
-		enumTestList.add(VehicleDataType.VEHICLEDATA_ODOMETER);	
-		enumTestList.add(VehicleDataType.VEHICLEDATA_BELTSTATUS);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_BODYINFO);	
-		enumTestList.add(VehicleDataType.VEHICLEDATA_DEVICESTATUS);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_BRAKING);	
-		enumTestList.add(VehicleDataType.VEHICLEDATA_WIPERSTATUS);	
-		enumTestList.add(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_BATTVOLTAGE);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_ENGINETORQUE);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_ACCPEDAL);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_STEERINGWHEEL);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_ECALLINFO);		
-		enumTestList.add(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT);	
-		enumTestList.add(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_MYKEY);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_FUELRANGE);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_TURNSIGNAL);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_CLOUDAPPVEHICLEID);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_OEM_CUSTOM_DATA);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_WINDOWSTATUS);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_GEARSTATUS);
-		enumTestList.add(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS);
+        List<VehicleDataType> enumTestList = new ArrayList<VehicleDataType>();
+        enumTestList.add(VehicleDataType.VEHICLEDATA_GPS);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_SPEED);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_RPM);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_FUELLEVEL);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_EXTERNTEMP);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_VIN);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_PRNDL);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_TIREPRESSURE);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_ODOMETER);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_BELTSTATUS);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_BODYINFO);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_DEVICESTATUS);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_BRAKING);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_WIPERSTATUS);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_BATTVOLTAGE);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_ENGINETORQUE);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_ACCPEDAL);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_STEERINGWHEEL);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_ECALLINFO);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_MYKEY);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_FUELRANGE);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_TURNSIGNAL);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_CLOUDAPPVEHICLEID);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_OEM_CUSTOM_DATA);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_WINDOWSTATUS);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_GEARSTATUS);
+        enumTestList.add(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java
index 3cd7b4038..359b6fd2c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VentilationModeTests.java
@@ -9,71 +9,69 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.VentilationMode}
  */
 public class VentilationModeTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {	
-		String example = "UPPER";
-		VentilationMode enumUpper = VentilationMode.valueForString(example);
-		example = "LOWER";
-		VentilationMode enumLower = VentilationMode.valueForString(example);
-		example = "BOTH";
-		VentilationMode enumBoth = VentilationMode.valueForString(example);
-		example = "NONE";
-		VentilationMode enumNone = VentilationMode.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "UPPER";
+        VentilationMode enumUpper = VentilationMode.valueForString(example);
+        example = "LOWER";
+        VentilationMode enumLower = VentilationMode.valueForString(example);
+        example = "BOTH";
+        VentilationMode enumBoth = VentilationMode.valueForString(example);
+        example = "NONE";
+        VentilationMode enumNone = VentilationMode.valueForString(example);
 
-		assertNotNull("UPPER returned null", enumUpper);
-		assertNotNull("LOWER returned null", enumLower);
-		assertNotNull("BOTH returned null", enumBoth);
-		assertNotNull("NONE returned null", enumNone);
-	}
+        assertNotNull("UPPER returned null", enumUpper);
+        assertNotNull("LOWER returned null", enumLower);
+        assertNotNull("BOTH returned null", enumBoth);
+        assertNotNull("NONE returned null", enumNone);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "uPPER";
-		try {
-			VentilationMode temp = VentilationMode.valueForString(example);
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "uPPER";
+        try {
+            VentilationMode temp = VentilationMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			VentilationMode temp = VentilationMode.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VentilationMode temp = VentilationMode.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of VentilationMode.
-	 */
-	public void testListEnum() {
- 		List<VentilationMode> enumValueList = Arrays.asList(VentilationMode.values());
+    /**
+     * Verifies the possible enum values of VentilationMode.
+     */
+    public void testListEnum() {
+        List<VentilationMode> enumValueList = Arrays.asList(VentilationMode.values());
 
-		List<VentilationMode> enumTestList = new ArrayList<VentilationMode>();
-		enumTestList.add(VentilationMode.UPPER);
-		enumTestList.add(VentilationMode.LOWER);
-		enumTestList.add(VentilationMode.BOTH);
-		enumTestList.add(VentilationMode.NONE);
+        List<VentilationMode> enumTestList = new ArrayList<VentilationMode>();
+        enumTestList.add(VentilationMode.UPPER);
+        enumTestList.add(VentilationMode.LOWER);
+        enumTestList.add(VentilationMode.BOTH);
+        enumTestList.add(VentilationMode.NONE);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java
index b4aa8fd97..641fc5dd9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingCodecTests.java
@@ -1,4 +1,5 @@
 package com.smartdevicelink.test.rpc.enums;
+
 import com.smartdevicelink.proxy.rpc.enums.VideoStreamingCodec;
 
 import junit.framework.TestCase;
@@ -9,71 +10,69 @@ import java.util.List;
 
 public class VideoStreamingCodecTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "H264";
-		VideoStreamingCodec enumH264 = VideoStreamingCodec.valueForString(example);
-		example = "H265";
-		VideoStreamingCodec enumH265 = VideoStreamingCodec.valueForString(example);
-		example = "Theora";
-		VideoStreamingCodec enumTheora = VideoStreamingCodec.valueForString(example);
-		example = "VP8";
-		VideoStreamingCodec enumVP8 = VideoStreamingCodec.valueForString(example);
-		example = "VP9";
-		VideoStreamingCodec enumVP9 = VideoStreamingCodec.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "H264";
+        VideoStreamingCodec enumH264 = VideoStreamingCodec.valueForString(example);
+        example = "H265";
+        VideoStreamingCodec enumH265 = VideoStreamingCodec.valueForString(example);
+        example = "Theora";
+        VideoStreamingCodec enumTheora = VideoStreamingCodec.valueForString(example);
+        example = "VP8";
+        VideoStreamingCodec enumVP8 = VideoStreamingCodec.valueForString(example);
+        example = "VP9";
+        VideoStreamingCodec enumVP9 = VideoStreamingCodec.valueForString(example);
 
-		assertNotNull("H264 returned null", enumH264);
-		assertNotNull("H265 returned null", enumH265);
-		assertNotNull("Theora returned null", enumTheora);
-		assertNotNull("VP8 returned null", enumVP8);
-		assertNotNull("VP9 returned null", enumVP9);
-	}
+        assertNotNull("H264 returned null", enumH264);
+        assertNotNull("H265 returned null", enumH265);
+        assertNotNull("Theora returned null", enumTheora);
+        assertNotNull("VP8 returned null", enumVP8);
+        assertNotNull("VP9 returned null", enumVP9);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "H234";
-		try {
-			VideoStreamingCodec temp = VideoStreamingCodec.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "H234";
+        try {
+            VideoStreamingCodec temp = VideoStreamingCodec.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			VideoStreamingCodec temp = VideoStreamingCodec.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VideoStreamingCodec temp = VideoStreamingCodec.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
 
-	/**
-	 * Verifies the possible enum values of TouchType.
-	 */
-	public void testListEnum() {
-		List<VideoStreamingCodec> enumValueList = Arrays.asList(VideoStreamingCodec.values());
+    /**
+     * Verifies the possible enum values of TouchType.
+     */
+    public void testListEnum() {
+        List<VideoStreamingCodec> enumValueList = Arrays.asList(VideoStreamingCodec.values());
 
-		List<VideoStreamingCodec> enumTestList = new ArrayList<VideoStreamingCodec>();
-		enumTestList.add(VideoStreamingCodec.H264);
-		enumTestList.add(VideoStreamingCodec.H265);
-		enumTestList.add(VideoStreamingCodec.Theora);
-		enumTestList.add(VideoStreamingCodec.VP8);
-		enumTestList.add(VideoStreamingCodec.VP9);
+        List<VideoStreamingCodec> enumTestList = new ArrayList<VideoStreamingCodec>();
+        enumTestList.add(VideoStreamingCodec.H264);
+        enumTestList.add(VideoStreamingCodec.H265);
+        enumTestList.add(VideoStreamingCodec.Theora);
+        enumTestList.add(VideoStreamingCodec.VP8);
+        enumTestList.add(VideoStreamingCodec.VP9);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java
index 36dba5b6f..090017aca 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingProtocolTests.java
@@ -10,72 +10,70 @@ import java.util.List;
 
 public class VideoStreamingProtocolTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {
-		String example = "RAW";
-		VideoStreamingProtocol enumRAW = VideoStreamingProtocol.valueForString(example);
-		example = "RTP";
-		VideoStreamingProtocol enumRTP = VideoStreamingProtocol.valueForString(example);
-		example = "RTSP";
-		VideoStreamingProtocol enumRTSP = VideoStreamingProtocol.valueForString(example);
-		example = "RTMP";
-		VideoStreamingProtocol enumRTMP = VideoStreamingProtocol.valueForString(example);
-		example = "WEBM";
-		VideoStreamingProtocol enumWEBM = VideoStreamingProtocol.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "RAW";
+        VideoStreamingProtocol enumRAW = VideoStreamingProtocol.valueForString(example);
+        example = "RTP";
+        VideoStreamingProtocol enumRTP = VideoStreamingProtocol.valueForString(example);
+        example = "RTSP";
+        VideoStreamingProtocol enumRTSP = VideoStreamingProtocol.valueForString(example);
+        example = "RTMP";
+        VideoStreamingProtocol enumRTMP = VideoStreamingProtocol.valueForString(example);
+        example = "WEBM";
+        VideoStreamingProtocol enumWEBM = VideoStreamingProtocol.valueForString(example);
 
-		assertNotNull("RAW returned null", enumRAW);
-		assertNotNull("RTP returned null", enumRTP);
-		assertNotNull("RTSP returned null", enumRTSP);
-		assertNotNull("RTMP returned null", enumRTMP);
-		assertNotNull("WEBM returned null", enumWEBM);
-	}
+        assertNotNull("RAW returned null", enumRAW);
+        assertNotNull("RTP returned null", enumRTP);
+        assertNotNull("RTSP returned null", enumRTSP);
+        assertNotNull("RTMP returned null", enumRTMP);
+        assertNotNull("WEBM returned null", enumWEBM);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "RAAW";
-		try {
-			VideoStreamingProtocol temp = VideoStreamingProtocol.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
-			fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "RAAW";
+        try {
+            VideoStreamingProtocol temp = VideoStreamingProtocol.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (IllegalArgumentException exception) {
+            fail("Invalid enum throws IllegalArgumentException.");
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-			VideoStreamingProtocol temp = VideoStreamingProtocol.valueForString(example);
-			assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
-			fail("Null string throws NullPointerException.");
-		}
-	}
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VideoStreamingProtocol temp = VideoStreamingProtocol.valueForString(example);
+            assertNull("Result of valueForString should be null.", temp);
+        } catch (NullPointerException exception) {
+            fail("Null string throws NullPointerException.");
+        }
+    }
 
 
-	/**
-	 * Verifies the possible enum values of TouchType.
-	 */
-	public void testListEnum() {
-		List<VideoStreamingProtocol> enumValueList = Arrays.asList(VideoStreamingProtocol.values());
+    /**
+     * Verifies the possible enum values of TouchType.
+     */
+    public void testListEnum() {
+        List<VideoStreamingProtocol> enumValueList = Arrays.asList(VideoStreamingProtocol.values());
 
-		List<VideoStreamingProtocol> enumTestList = new ArrayList<VideoStreamingProtocol>();
-		enumTestList.add(VideoStreamingProtocol.RAW);
-		enumTestList.add(VideoStreamingProtocol.RTP);
-		enumTestList.add(VideoStreamingProtocol.RTSP);
-		enumTestList.add(VideoStreamingProtocol.RTMP);
-		enumTestList.add(VideoStreamingProtocol.WEBM);
+        List<VideoStreamingProtocol> enumTestList = new ArrayList<VideoStreamingProtocol>();
+        enumTestList.add(VideoStreamingProtocol.RAW);
+        enumTestList.add(VideoStreamingProtocol.RTP);
+        enumTestList.add(VideoStreamingProtocol.RTSP);
+        enumTestList.add(VideoStreamingProtocol.RTMP);
+        enumTestList.add(VideoStreamingProtocol.WEBM);
 
-		assertTrue("Enum value list does not match enum class list",
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}
+        assertTrue("Enum value list does not match enum class list",
+                enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
+    }
 }
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java
index 2074efe47..bf0858464 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VideoStreamingStateTests.java
@@ -9,63 +9,61 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.VideoStreamingState}
  */
 public class VideoStreamingStateTests extends TestCase {
 
-	/**
-	 * Verifies that the enum values are not null upon valid assignment.
-	 */
-	public void testValidEnums () {	
-		String example = "STREAMABLE";
-		VideoStreamingState enumStreamable = VideoStreamingState.valueForString(example);
-		example = "NOT_STREAMABLE";
-		VideoStreamingState enumNotStreamable = VideoStreamingState.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "STREAMABLE";
+        VideoStreamingState enumStreamable = VideoStreamingState.valueForString(example);
+        example = "NOT_STREAMABLE";
+        VideoStreamingState enumNotStreamable = VideoStreamingState.valueForString(example);
 
-		assertNotNull("STREAMABLE returned null", enumStreamable);
-		assertNotNull("NOT_STREAMABLE returned null", enumNotStreamable);
-	}
+        assertNotNull("STREAMABLE returned null", enumStreamable);
+        assertNotNull("NOT_STREAMABLE returned null", enumNotStreamable);
+    }
 
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "StrEAmaBlE";
-		try {
-		    VideoStreamingState temp = VideoStreamingState.valueForString(example);
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "StrEAmaBlE";
+        try {
+            VideoStreamingState temp = VideoStreamingState.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
+        }
+    }
 
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    VideoStreamingState temp = VideoStreamingState.valueForString(example);
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VideoStreamingState temp = VideoStreamingState.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
+        }
+    }
 
-	/**
-	 * Verifies the possible enum values of VideoStreamingState.
-	 */
-	public void testListEnum() {
- 		List<VideoStreamingState> enumValueList = Arrays.asList(VideoStreamingState.values());
+    /**
+     * Verifies the possible enum values of VideoStreamingState.
+     */
+    public void testListEnum() {
+        List<VideoStreamingState> enumValueList = Arrays.asList(VideoStreamingState.values());
 
-		List<VideoStreamingState> enumTestList = new ArrayList<VideoStreamingState>();
-		enumTestList.add(VideoStreamingState.STREAMABLE);
-		enumTestList.add(VideoStreamingState.NOT_STREAMABLE);
+        List<VideoStreamingState> enumTestList = new ArrayList<VideoStreamingState>();
+        enumTestList.add(VideoStreamingState.STREAMABLE);
+        enumTestList.add(VideoStreamingState.NOT_STREAMABLE);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
index 611798683..de8bd5ac3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
@@ -9,60 +9,58 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.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);
-		
-		assertNotNull("Text returned null", enumText);
-	}
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "tExTx";
-		try {
-		    VrCapabilities temp = VrCapabilities.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "Text";
+        VrCapabilities enumText = VrCapabilities.valueForString(example);
+
+        assertNotNull("Text returned null", enumText);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "tExTx";
+        try {
+            VrCapabilities temp = VrCapabilities.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}	
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    VrCapabilities temp = VrCapabilities.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            VrCapabilities temp = VrCapabilities.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of VrCapabilities.
-	 */
-	@SuppressWarnings("deprecation")
-	public void testListEnum() {
- 		List<VrCapabilities> enumValueList = Arrays.asList(VrCapabilities.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of VrCapabilities.
+     */
+    @SuppressWarnings("deprecation")
+    public void testListEnum() {
+        List<VrCapabilities> enumValueList = Arrays.asList(VrCapabilities.values());
 
-		List<VrCapabilities> enumTestList = new ArrayList<VrCapabilities>();
-		enumTestList.add(VrCapabilities.TEXT);
+        List<VrCapabilities> enumTestList = new ArrayList<VrCapabilities>();
+        enumTestList.add(VrCapabilities.TEXT);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
index bf3433f61..278c263df 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
@@ -9,71 +9,69 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.WarningLightStatus}
  */
 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);
-		example = "ON";
-		WarningLightStatus enumOn = WarningLightStatus.valueForString(example);
-		example = "FLASH";
-		WarningLightStatus enumFlash = WarningLightStatus.valueForString(example);
-		example = "NOT_USED";
-		WarningLightStatus enumNotUsed = WarningLightStatus.valueForString(example);
-		
-		assertNotNull("OFF returned null", enumOff);
-		assertNotNull("ON returned null", enumOn);
-		assertNotNull("FLASH returned null", enumFlash);
-		assertNotNull("NOT_USED returned null", enumNotUsed);
-	}
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "OfF";
-		try {
-		    WarningLightStatus temp = WarningLightStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "OFF";
+        WarningLightStatus enumOff = WarningLightStatus.valueForString(example);
+        example = "ON";
+        WarningLightStatus enumOn = WarningLightStatus.valueForString(example);
+        example = "FLASH";
+        WarningLightStatus enumFlash = WarningLightStatus.valueForString(example);
+        example = "NOT_USED";
+        WarningLightStatus enumNotUsed = WarningLightStatus.valueForString(example);
+
+        assertNotNull("OFF returned null", enumOff);
+        assertNotNull("ON returned null", enumOn);
+        assertNotNull("FLASH returned null", enumFlash);
+        assertNotNull("NOT_USED returned null", enumNotUsed);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "OfF";
+        try {
+            WarningLightStatus temp = WarningLightStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    WarningLightStatus temp = WarningLightStatus.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            WarningLightStatus temp = WarningLightStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of WarningLightStatus.
-	 */
-	public void testListEnum() {
- 		List<WarningLightStatus> enumValueList = Arrays.asList(WarningLightStatus.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of WarningLightStatus.
+     */
+    public void testListEnum() {
+        List<WarningLightStatus> enumValueList = Arrays.asList(WarningLightStatus.values());
 
-		List<WarningLightStatus> enumTestList = new ArrayList<WarningLightStatus>();
-		enumTestList.add(WarningLightStatus.OFF);
-		enumTestList.add(WarningLightStatus.ON);
-		enumTestList.add(WarningLightStatus.FLASH);
-		enumTestList.add(WarningLightStatus.NOT_USED);
+        List<WarningLightStatus> enumTestList = new ArrayList<WarningLightStatus>();
+        enumTestList.add(WarningLightStatus.OFF);
+        enumTestList.add(WarningLightStatus.ON);
+        enumTestList.add(WarningLightStatus.FLASH);
+        enumTestList.add(WarningLightStatus.NOT_USED);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
index 918bfa207..b38030ef4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
@@ -9,115 +9,113 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.enums.WiperStatus}
  */
 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);
-		example = "AUTO_OFF";
-		WiperStatus enumAutoOff = WiperStatus.valueForString(example);
-		example = "OFF_MOVING";
-		WiperStatus enumOffMoving = WiperStatus.valueForString(example);
-		example = "MAN_INT_OFF";
-		WiperStatus enumManIntOff = WiperStatus.valueForString(example);
-		example = "MAN_INT_ON";
-		WiperStatus enumManIntOn = WiperStatus.valueForString(example);
-		example = "MAN_LOW";
-		WiperStatus enumManLow = WiperStatus.valueForString(example);
-		example = "MAN_HIGH";
-		WiperStatus enumManHigh = WiperStatus.valueForString(example);
-		example = "MAN_FLICK";
-		WiperStatus enumManFlick = WiperStatus.valueForString(example);
-		example = "WASH";
-		WiperStatus enumWash = WiperStatus.valueForString(example);
-		example = "AUTO_LOW";
-		WiperStatus enumAutoLow = WiperStatus.valueForString(example);
-		example = "AUTO_HIGH";
-		WiperStatus enumAutoHigh = WiperStatus.valueForString(example);
-		example = "COURTESYWIPE";
-		WiperStatus enumCourtesyWipe = WiperStatus.valueForString(example);
-		example = "AUTO_ADJUST";
-		WiperStatus enumAutoAdjust = WiperStatus.valueForString(example);
-		example = "STALLED";
-		WiperStatus enumStalled = WiperStatus.valueForString(example);
-		example = "NO_DATA_EXISTS";
-		WiperStatus enumNoDataExists = WiperStatus.valueForString(example);
-		
-		assertNotNull("OFF returned null", enumOff);
-		assertNotNull("AUTO_OFF returned null", enumAutoOff);
-		assertNotNull("OFF_MOVING returned null", enumOffMoving);
-		assertNotNull("MAN_INT_OFF returned null", enumManIntOff);
-		assertNotNull("MAN_INT_ON returned null", enumManIntOn);
-		assertNotNull("MAN_LOW returned null", enumManLow);
-		assertNotNull("MAN_HIGH returned null", enumManHigh);
-		assertNotNull("MAN_FLICK returned null", enumManFlick);
-		assertNotNull("WASH returned null", enumWash);
-		assertNotNull("AUTO_LOW returned null", enumAutoLow);
-		assertNotNull("AUTO_HIGH returned null", enumAutoHigh);
-		assertNotNull("COURTESYWIPE returned null", enumCourtesyWipe);
-		assertNotNull("AUTO_ADJUST returned null", enumAutoAdjust);
-		assertNotNull("STALLED returned null", enumStalled);
-		assertNotNull("NO_DATA_EXISTS returned null", enumNoDataExists);
-	}
-	
-	/**
-	 * Verifies that an invalid assignment is null.
-	 */
-	public void testInvalidEnum () {
-		String example = "OFf";
-		try {
-		    WiperStatus temp = WiperStatus.valueForString(example);
+    /**
+     * Verifies that the enum values are not null upon valid assignment.
+     */
+    public void testValidEnums() {
+        String example = "OFF";
+        WiperStatus enumOff = WiperStatus.valueForString(example);
+        example = "AUTO_OFF";
+        WiperStatus enumAutoOff = WiperStatus.valueForString(example);
+        example = "OFF_MOVING";
+        WiperStatus enumOffMoving = WiperStatus.valueForString(example);
+        example = "MAN_INT_OFF";
+        WiperStatus enumManIntOff = WiperStatus.valueForString(example);
+        example = "MAN_INT_ON";
+        WiperStatus enumManIntOn = WiperStatus.valueForString(example);
+        example = "MAN_LOW";
+        WiperStatus enumManLow = WiperStatus.valueForString(example);
+        example = "MAN_HIGH";
+        WiperStatus enumManHigh = WiperStatus.valueForString(example);
+        example = "MAN_FLICK";
+        WiperStatus enumManFlick = WiperStatus.valueForString(example);
+        example = "WASH";
+        WiperStatus enumWash = WiperStatus.valueForString(example);
+        example = "AUTO_LOW";
+        WiperStatus enumAutoLow = WiperStatus.valueForString(example);
+        example = "AUTO_HIGH";
+        WiperStatus enumAutoHigh = WiperStatus.valueForString(example);
+        example = "COURTESYWIPE";
+        WiperStatus enumCourtesyWipe = WiperStatus.valueForString(example);
+        example = "AUTO_ADJUST";
+        WiperStatus enumAutoAdjust = WiperStatus.valueForString(example);
+        example = "STALLED";
+        WiperStatus enumStalled = WiperStatus.valueForString(example);
+        example = "NO_DATA_EXISTS";
+        WiperStatus enumNoDataExists = WiperStatus.valueForString(example);
+
+        assertNotNull("OFF returned null", enumOff);
+        assertNotNull("AUTO_OFF returned null", enumAutoOff);
+        assertNotNull("OFF_MOVING returned null", enumOffMoving);
+        assertNotNull("MAN_INT_OFF returned null", enumManIntOff);
+        assertNotNull("MAN_INT_ON returned null", enumManIntOn);
+        assertNotNull("MAN_LOW returned null", enumManLow);
+        assertNotNull("MAN_HIGH returned null", enumManHigh);
+        assertNotNull("MAN_FLICK returned null", enumManFlick);
+        assertNotNull("WASH returned null", enumWash);
+        assertNotNull("AUTO_LOW returned null", enumAutoLow);
+        assertNotNull("AUTO_HIGH returned null", enumAutoHigh);
+        assertNotNull("COURTESYWIPE returned null", enumCourtesyWipe);
+        assertNotNull("AUTO_ADJUST returned null", enumAutoAdjust);
+        assertNotNull("STALLED returned null", enumStalled);
+        assertNotNull("NO_DATA_EXISTS returned null", enumNoDataExists);
+    }
+
+    /**
+     * Verifies that an invalid assignment is null.
+     */
+    public void testInvalidEnum() {
+        String example = "OFf";
+        try {
+            WiperStatus temp = WiperStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             fail("Invalid enum throws IllegalArgumentException.");
-		}
-	}
-	
-	/**
-	 * Verifies that a null assignment is invalid.
-	 */
-	public void testNullEnum () {
-		String example = null;
-		try {
-		    WiperStatus temp = WiperStatus.valueForString(example);
+        }
+    }
+
+    /**
+     * Verifies that a null assignment is invalid.
+     */
+    public void testNullEnum() {
+        String example = null;
+        try {
+            WiperStatus temp = WiperStatus.valueForString(example);
             assertNull("Result of valueForString should be null.", temp);
-		}
-		catch (NullPointerException exception) {
+        } catch (NullPointerException exception) {
             fail("Null string throws NullPointerException.");
-		}
-	}	
-	
-	/**
-	 * Verifies the possible enum values of WiperStatus.
-	 */
-	public void testListEnum() {
- 		List<WiperStatus> enumValueList = Arrays.asList(WiperStatus.values());
+        }
+    }
+
+    /**
+     * Verifies the possible enum values of WiperStatus.
+     */
+    public void testListEnum() {
+        List<WiperStatus> enumValueList = Arrays.asList(WiperStatus.values());
 
-		List<WiperStatus> enumTestList = new ArrayList<WiperStatus>();
-		enumTestList.add(WiperStatus.OFF);
-		enumTestList.add(WiperStatus.AUTO_OFF);
-		enumTestList.add(WiperStatus.OFF_MOVING);
-		enumTestList.add(WiperStatus.MAN_INT_OFF);
-		enumTestList.add(WiperStatus.MAN_INT_ON);
-		enumTestList.add(WiperStatus.MAN_LOW);		
-		enumTestList.add(WiperStatus.MAN_HIGH);
-		enumTestList.add(WiperStatus.MAN_FLICK);	
-		enumTestList.add(WiperStatus.WASH);
-		enumTestList.add(WiperStatus.AUTO_LOW);	
-		enumTestList.add(WiperStatus.AUTO_HIGH);	
-		enumTestList.add(WiperStatus.COURTESYWIPE);
-		enumTestList.add(WiperStatus.AUTO_ADJUST);	
-		enumTestList.add(WiperStatus.STALLED);
-		enumTestList.add(WiperStatus.NO_DATA_EXISTS);	
+        List<WiperStatus> enumTestList = new ArrayList<WiperStatus>();
+        enumTestList.add(WiperStatus.OFF);
+        enumTestList.add(WiperStatus.AUTO_OFF);
+        enumTestList.add(WiperStatus.OFF_MOVING);
+        enumTestList.add(WiperStatus.MAN_INT_OFF);
+        enumTestList.add(WiperStatus.MAN_INT_ON);
+        enumTestList.add(WiperStatus.MAN_LOW);
+        enumTestList.add(WiperStatus.MAN_HIGH);
+        enumTestList.add(WiperStatus.MAN_FLICK);
+        enumTestList.add(WiperStatus.WASH);
+        enumTestList.add(WiperStatus.AUTO_LOW);
+        enumTestList.add(WiperStatus.AUTO_HIGH);
+        enumTestList.add(WiperStatus.COURTESYWIPE);
+        enumTestList.add(WiperStatus.AUTO_ADJUST);
+        enumTestList.add(WiperStatus.STALLED);
+        enumTestList.add(WiperStatus.NO_DATA_EXISTS);
 
-		assertTrue("Enum value list does not match enum class list", 
-				enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));
-	}	
+        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/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java
index 464d67017..84ef75450 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java
@@ -17,13 +17,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnAppInterfaceUnregistered}
  */
-public class OnAppInterfaceUnregisteredTests extends BaseRpcTests{
+public class OnAppInterfaceUnregisteredTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnAppInterfaceUnregistered msg = new OnAppInterfaceUnregistered();
 
         msg.setReason(TestValues.GENERAL_APPINTERFACEUNREGISTEREDREASON);
@@ -32,39 +32,39 @@ public class OnAppInterfaceUnregisteredTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_APP_INTERFACE_UNREGISTERED.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnAppInterfaceUnregistered.KEY_REASON, TestValues.GENERAL_APPINTERFACEUNREGISTEREDREASON);
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        AppInterfaceUnregisteredReason reason = ( (OnAppInterfaceUnregistered) msg ).getReason();
-        
+    public void testRpcValues() {
+        // Test Values
+        AppInterfaceUnregisteredReason reason = ((OnAppInterfaceUnregistered) msg).getReason();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_APPINTERFACEUNREGISTEREDREASON, reason);
-    
+
         // Invalid/Null tests
         OnAppInterfaceUnregistered msg = new OnAppInterfaceUnregistered();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java
index 10affe5f0..9ea416632 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppServiceDataTests.java
@@ -23,59 +23,59 @@ import static junit.framework.TestCase.fail;
  */
 public class OnAppServiceDataTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage(){
-		OnAppServiceData msg = new OnAppServiceData();
-
-		msg.setServiceData(TestValues.GENERAL_APPSERVICEDATA);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_NOTIFICATION;
-	}
-
-	@Override
-	protected String getCommandType(){
-		return FunctionID.ON_APP_SERVICE_DATA.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		JSONObject result = new JSONObject();
-
-		try{
-			result.put(OnAppServiceData.KEY_SERVICE_DATA, TestValues.GENERAL_APPSERVICEDATA.serializeJSON());
-		}catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		AppServiceData cmdId = ( (OnAppServiceData) msg ).getServiceData();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_APPSERVICEDATA, cmdId);
-
-		// Invalid/Null Tests
-		OnAppServiceData msg = new OnAppServiceData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getServiceData());
-
-		// test constructor with param
-		msg = new OnAppServiceData(TestValues.GENERAL_APPSERVICEDATA);
-		AppServiceData serviceData = msg.getServiceData();
-		assertEquals(serviceData, TestValues.GENERAL_APPSERVICEDATA);
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        OnAppServiceData msg = new OnAppServiceData();
+
+        msg.setServiceData(TestValues.GENERAL_APPSERVICEDATA);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_NOTIFICATION;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.ON_APP_SERVICE_DATA.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(OnAppServiceData.KEY_SERVICE_DATA, TestValues.GENERAL_APPSERVICEDATA.serializeJSON());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        AppServiceData cmdId = ((OnAppServiceData) msg).getServiceData();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_APPSERVICEDATA, cmdId);
+
+        // Invalid/Null Tests
+        OnAppServiceData msg = new OnAppServiceData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getServiceData());
+
+        // test constructor with param
+        msg = new OnAppServiceData(TestValues.GENERAL_APPSERVICEDATA);
+        AppServiceData serviceData = msg.getServiceData();
+        assertEquals(serviceData, TestValues.GENERAL_APPSERVICEDATA);
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
index 28b7aaeae..ce5392a48 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
@@ -12,37 +12,37 @@ import org.junit.Test;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnAudioPassThru}
  */
-public class OnAudioPassThruTests extends BaseRpcTests{
+public class OnAudioPassThruTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new OnAudioPassThru();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_AUDIO_PASS_THRU.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         OnAudioPassThru msg = new OnAudioPassThru();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java
index 3570c33e5..dbad77232 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java
@@ -18,13 +18,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnButtonEvent}
  */
-public class OnButtonEventTests extends BaseRpcTests{
+public class OnButtonEventTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnButtonEvent msg = new OnButtonEvent();
 
         msg.setButtonEventMode(TestValues.GENERAL_BUTTONEVENTMODE);
@@ -35,45 +35,45 @@ public class OnButtonEventTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_BUTTON_EVENT.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnButtonEvent.KEY_BUTTON_EVENT_MODE, TestValues.GENERAL_BUTTONEVENTMODE);
             result.put(OnButtonEvent.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME);
             result.put(OnButtonEvent.KEY_CUSTOM_BUTTON_ID, TestValues.GENERAL_INT);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	// Test Values
-        int cmdId = ( (OnButtonEvent) msg ).getCustomButtonID();
-        ButtonEventMode mode = ( (OnButtonEvent) msg ).getButtonEventMode();
-        ButtonName name = ( (OnButtonEvent) msg ).getButtonName();
-        
+    public void testRpcValues() {
+        // Test Values
+        int cmdId = ((OnButtonEvent) msg).getCustomButtonID();
+        ButtonEventMode mode = ((OnButtonEvent) msg).getButtonEventMode();
+        ButtonName name = ((OnButtonEvent) msg).getButtonName();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, cmdId);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONEVENTMODE, mode);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, name);
-        
+
         // Invalid/Null Tests
         OnButtonEvent msg = new OnButtonEvent();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java
index d5ee08486..db7ebdccf 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java
@@ -18,13 +18,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnButtonPress}
  */
-public class OnButtonPressTests extends BaseRpcTests{
+public class OnButtonPressTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnButtonPress msg = new OnButtonPress();
 
         msg.setButtonName(TestValues.GENERAL_BUTTONNAME);
@@ -35,45 +35,45 @@ public class OnButtonPressTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_BUTTON_PRESS.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnButtonPress.KEY_CUSTOM_BUTTON_ID, TestValues.GENERAL_INT);
             result.put(OnButtonPress.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME);
             result.put(OnButtonPress.KEY_BUTTON_PRESS_MODE, TestValues.GENERAL_BUTTONPRESSMODE);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	// Test Values
-        int customName = ( (OnButtonPress) msg ).getCustomButtonID();
-        ButtonName buttonName = ( (OnButtonPress) msg ).getButtonName();
-        ButtonPressMode buttonPressMode = ( (OnButtonPress) msg ).getButtonPressMode();
-        
+    public void testRpcValues() {
+        // Test Values
+        int customName = ((OnButtonPress) msg).getCustomButtonID();
+        ButtonName buttonName = ((OnButtonPress) msg).getButtonName();
+        ButtonPressMode buttonPressMode = ((OnButtonPress) msg).getButtonPressMode();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, customName);
-	    assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, buttonName);
-	    assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONPRESSMODE, buttonPressMode);
-    
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, buttonName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONPRESSMODE, buttonPressMode);
+
         // Invalid/Null Tests
         OnButtonPress msg = new OnButtonPress();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java
index dcc4d8029..e492442d0 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java
@@ -17,13 +17,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnCommand}
  */
-public class OnCommandTests extends BaseRpcTests{
+public class OnCommandTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnCommand msg = new OnCommand();
 
         msg.setCmdID(TestValues.GENERAL_INT);
@@ -33,42 +33,42 @@ public class OnCommandTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_COMMAND.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnCommand.KEY_CMD_ID, TestValues.GENERAL_INT);
             result.put(OnCommand.KEY_TRIGGER_SOURCE, TestValues.GENERAL_TRIGGERSOURCE);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        int cmdId = ( (OnCommand) msg ).getCmdID();
-        TriggerSource triggerSource = ( (OnCommand) msg ).getTriggerSource();
-        
+    public void testRpcValues() {
+        // Test Values
+        int cmdId = ((OnCommand) msg).getCmdID();
+        TriggerSource triggerSource = ((OnCommand) msg).getTriggerSource();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, cmdId);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_TRIGGERSOURCE, triggerSource);
-       
+
         // Invalid/Null Tests
         OnCommand msg = new OnCommand();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java
index 88432d2ba..8f640e3cc 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java
@@ -17,15 +17,15 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnDriverDistraction}
  */
-public class OnDriverDistractionTests extends BaseRpcTests{
+public class OnDriverDistractionTests extends BaseRpcTests {
 
     private static final DriverDistractionState STATUS = DriverDistractionState.DD_ON;
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnDriverDistraction msg = new OnDriverDistraction();
 
         msg.setState(STATUS);
@@ -34,44 +34,44 @@ public class OnDriverDistractionTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_DRIVER_DISTRACTION.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnDriverDistraction.KEY_STATE, STATUS);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        DriverDistractionState cmdId = ( (OnDriverDistraction) msg ).getState();
-        
+    public void testRpcValues() {
+        // Test Values
+        DriverDistractionState cmdId = ((OnDriverDistraction) msg).getState();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, STATUS, cmdId);
-    
+
         // Invalid/Null Tests
         OnDriverDistraction msg = new OnDriverDistraction();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
 
-         assertNull(TestValues.NULL, msg.getState());
+        assertNull(TestValues.NULL, msg.getState());
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
index c0206c960..ea1c8f7dd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
@@ -21,13 +21,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnHMIStatus}
  */
-public class OnHMIStatusTests extends BaseRpcTests{
+public class OnHMIStatusTests extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         OnHMIStatus msg = new OnHMIStatus();
 
         msg.setAudioStreamingState(TestValues.GENERAL_AUDIOSTREAMINGSTATE);
@@ -41,51 +41,51 @@ public class OnHMIStatusTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_HMI_STATUS.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnHMIStatus.KEY_AUDIO_STREAMING_STATE, TestValues.GENERAL_AUDIOSTREAMINGSTATE);
             result.put(OnHMIStatus.KEY_VIDEO_STREAMING_STATE, TestValues.GENERAL_VIDEOSTREAMINGSTATE);
             result.put(OnHMIStatus.KEY_HMI_LEVEL, TestValues.GENERAL_HMILEVEL);
             result.put(OnHMIStatus.KEY_SYSTEM_CONTEXT, TestValues.GENERAL_SYSTEMCONTEXT);
             result.put(OnHMIStatus.KEY_WINDOW_ID, TestValues.GENERAL_INT);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        AudioStreamingState audioStreamingState = ( (OnHMIStatus) msg ).getAudioStreamingState();
-        VideoStreamingState videoStreamingState = ( (OnHMIStatus) msg ).getVideoStreamingState();
-        HMILevel hmiLevel = ( (OnHMIStatus) msg ).getHmiLevel();
-        SystemContext context = ( (OnHMIStatus) msg ).getSystemContext();
-        int testWindowID = ( (OnHMIStatus) msg ).getWindowID();
-        
+    public void testRpcValues() {
+        // Test Values
+        AudioStreamingState audioStreamingState = ((OnHMIStatus) msg).getAudioStreamingState();
+        VideoStreamingState videoStreamingState = ((OnHMIStatus) msg).getVideoStreamingState();
+        HMILevel hmiLevel = ((OnHMIStatus) msg).getHmiLevel();
+        SystemContext context = ((OnHMIStatus) msg).getSystemContext();
+        int testWindowID = ((OnHMIStatus) msg).getWindowID();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIOSTREAMINGSTATE, audioStreamingState);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_VIDEOSTREAMINGSTATE, videoStreamingState);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL, hmiLevel);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMCONTEXT, context);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testWindowID);
-   
+
         // Invalid/Null Tests
         OnHMIStatus msg = new OnHMIStatus();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -94,7 +94,7 @@ public class OnHMIStatusTests extends BaseRpcTests{
         assertNull(TestValues.NULL, msg.getAudioStreamingState());
 
         assertNull(TestValues.NULL, msg.getVideoStreamingState());
-        msg.format(new Version(4,5,0),true);
+        msg.format(new Version(4, 5, 0), true);
         assertEquals(TestValues.MATCH, VideoStreamingState.STREAMABLE, msg.getVideoStreamingState());
         assertNull(TestValues.NULL, msg.getHmiLevel());
         assertNull(TestValues.NULL, msg.getSystemContext());
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java
index 45db05e25..52406f2e1 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java
@@ -16,15 +16,15 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnHashChange}
  */
-public class OnHashChangeTests extends BaseRpcTests{
+public class OnHashChangeTests extends BaseRpcTests {
 
     private static final String HASH_ID = "agh4lg2hb1g9gq3";
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnHashChange msg = new OnHashChange();
 
         msg.setHashID(HASH_ID);
@@ -33,39 +33,39 @@ public class OnHashChangeTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_HASH_CHANGE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnHashChange.KEY_HASH_ID, HASH_ID);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        String hashId = ( (OnHashChange) msg ).getHashID();
-        
+    public void testRpcValues() {
+        // Test Values
+        String hashId = ((OnHashChange) msg).getHashID();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, HASH_ID, hashId);
-   
+
         // Invalid/Null Tests
         OnHashChange msg = new OnHashChange();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java
index c111e740b..31faf7679 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnInteriorVehicleDataTests.java
@@ -19,13 +19,13 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnInteriorVehicleData}
  */
-public class OnInteriorVehicleDataTests extends BaseRpcTests{
+public class OnInteriorVehicleDataTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnInteriorVehicleData msg = new OnInteriorVehicleData();
         msg.setModuleData(TestValues.GENERAL_MODULEDATA);
 
@@ -33,35 +33,35 @@ public class OnInteriorVehicleDataTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_INTERIOR_VEHICLE_DATA.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnInteriorVehicleData.KEY_MODULE_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore()));
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	// Test Values
-        ModuleData moduleData = ( (OnInteriorVehicleData) msg ).getModuleData();
+    public void testRpcValues() {
+        // Test Values
+        ModuleData moduleData = ((OnInteriorVehicleData) msg).getModuleData();
 
         // Valid Tests
         assertTrue(TestValues.TRUE, Validator.validateModuleData(TestValues.GENERAL_MODULEDATA, moduleData));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java
index 0d99c07d9..ee3bb686c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java
@@ -17,13 +17,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnKeyboardInput}
  */
-public class OnKeyboardInputTests extends BaseRpcTests{
+public class OnKeyboardInputTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnKeyboardInput msg = new OnKeyboardInput();
 
         msg.setData(TestValues.GENERAL_STRING);
@@ -33,42 +33,42 @@ public class OnKeyboardInputTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_KEYBOARD_INPUT.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnKeyboardInput.KEY_DATA, TestValues.GENERAL_STRING);
             result.put(OnKeyboardInput.KEY_EVENT, TestValues.GENERAL_KEYBOARDEVENT);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	// Test Values
-        KeyboardEvent event = ( (OnKeyboardInput) msg ).getEvent();
-        String data = ( (OnKeyboardInput) msg ).getData();
-        
+    public void testRpcValues() {
+        // Test Values
+        KeyboardEvent event = ((OnKeyboardInput) msg).getEvent();
+        String data = ((OnKeyboardInput) msg).getData();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_KEYBOARDEVENT, event);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, data);
-    
+
         // Invalid/Null Tests
         OnKeyboardInput msg = new OnKeyboardInput();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java
index ddcdd7201..042d4c4a6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java
@@ -17,13 +17,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnLanguageChange}
  */
-public class OnLanguageChangeTests extends BaseRpcTests{
+public class OnLanguageChangeTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnLanguageChange msg = new OnLanguageChange();
 
         msg.setLanguage(TestValues.GENERAL_LANGUAGE);
@@ -33,42 +33,42 @@ public class OnLanguageChangeTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_LANGUAGE_CHANGE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnLanguageChange.KEY_LANGUAGE, TestValues.GENERAL_LANGUAGE);
             result.put(OnLanguageChange.KEY_HMI_DISPLAY_LANGUAGE, TestValues.GENERAL_LANGUAGE);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        Language lang = ( (OnLanguageChange) msg ).getLanguage();
-        Language hmiLang = ( (OnLanguageChange) msg ).getHmiDisplayLanguage();
-        
+    public void testRpcValues() {
+        // Test Values
+        Language lang = ((OnLanguageChange) msg).getLanguage();
+        Language hmiLang = ((OnLanguageChange) msg).getHmiDisplayLanguage();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, lang);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, hmiLang);
-    
+
         // Invalid/Null Tests
         OnLanguageChange msg = new OnLanguageChange();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
index 97a9e14ec..02b3b2a82 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
@@ -21,60 +21,60 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnPermissionsChange}
  */
-public class OnPermissionsChangeTests extends BaseRpcTests{
+public class OnPermissionsChangeTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnPermissionsChange msg = new OnPermissionsChange();
 
         msg.setPermissionItem(TestValues.GENERAL_PERMISSIONITEM_LIST);
         msg.setRequireEncryption(TestValues.GENERAL_BOOLEAN);
-        
+
         return msg;
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_PERMISSIONS_CHANGE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnPermissionsChange.KEY_PERMISSION_ITEM, TestValues.JSON_PERMISSIONITEMS);
             result.put(OnPermissionsChange.KEY_REQUIRE_ENCRYPTION, TestValues.GENERAL_BOOLEAN);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        List<PermissionItem> data = ( (OnPermissionsChange) msg ).getPermissionItem();
-        boolean isRequired = ((OnPermissionsChange)msg).getRequireEncryption();
+    public void testRpcValues() {
+        // Test Values
+        List<PermissionItem> data = ((OnPermissionsChange) msg).getPermissionItem();
+        boolean isRequired = ((OnPermissionsChange) msg).getRequireEncryption();
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_PERMISSIONITEM_LIST.size(), data.size());
-        for(int i=0; i<data.size(); i++){
+        for (int i = 0; i < data.size(); i++) {
             assertTrue(TestValues.TRUE, Validator.validatePermissionItem(TestValues.GENERAL_PERMISSIONITEM_LIST.get(i), data.get(i)));
         }
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, isRequired);
-    
+
         // Invalid/Null Tests
         OnPermissionsChange msg = new OnPermissionsChange();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java
index c292756e6..2bd2ebc50 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnRCStatusTests.java
@@ -21,78 +21,78 @@ import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.assertNull;
 
 public class OnRCStatusTests extends BaseRpcTests {
-	@Override
-	protected RPCMessage createMessage() {
-		OnRCStatus msg = new OnRCStatus();
-
-		List<ModuleData> listAllocatedModules = TestValues.GENERAL_MODULEDATA_LIST;
-
-		msg.setAllocatedModules(listAllocatedModules);
-
-		List<ModuleData> listFreeModules = new ArrayList<>();
-		listFreeModules.add(TestValues.GENERAL_MODULEDATA);
-		msg.setFreeModules(listFreeModules);
-
-		msg.setAllowed(TestValues.GENERAL_BOOLEAN);
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_NOTIFICATION;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.ON_RC_STATUS.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		JSONArray jsonArrayAllocatedModules = new JSONArray();
-		JSONArray jsonArrayFreeModules = new JSONArray();
-		try {
-			jsonArrayAllocatedModules.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore()));
-			jsonArrayFreeModules.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore()));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-
-		try {
-			result.put(OnRCStatus.KEY_ALLOCATED_MODULES, jsonArrayAllocatedModules);
-			result.put(OnRCStatus.KEY_FREE_MODULES, jsonArrayFreeModules);
-			result.put(OnRCStatus.KEY_ALLOWED, TestValues.GENERAL_BOOLEAN);
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues() {
-		// Test Values
-		List<ModuleData> listAllocatedModules = ((OnRCStatus) msg).getAllocatedModules();
-		List<ModuleData> listFreeModules = ((OnRCStatus) msg).getFreeModules();
-		Boolean allowed = ((OnRCStatus) msg).getAllowed();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULEDATA, listAllocatedModules.get(0));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULEDATA, listFreeModules.get(0));
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, allowed);
-
-		// Invalid/Null Tests
-		OnRCStatus msg = new OnRCStatus();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getAllocatedModules());
-		assertNull(TestValues.NULL, msg.getFreeModules());
-		assertNull(TestValues.NULL, msg.getAllowed());
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        OnRCStatus msg = new OnRCStatus();
+
+        List<ModuleData> listAllocatedModules = TestValues.GENERAL_MODULEDATA_LIST;
+
+        msg.setAllocatedModules(listAllocatedModules);
+
+        List<ModuleData> listFreeModules = new ArrayList<>();
+        listFreeModules.add(TestValues.GENERAL_MODULEDATA);
+        msg.setFreeModules(listFreeModules);
+
+        msg.setAllowed(TestValues.GENERAL_BOOLEAN);
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_NOTIFICATION;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.ON_RC_STATUS.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        JSONArray jsonArrayAllocatedModules = new JSONArray();
+        JSONArray jsonArrayFreeModules = new JSONArray();
+        try {
+            jsonArrayAllocatedModules.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore()));
+            jsonArrayFreeModules.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            result.put(OnRCStatus.KEY_ALLOCATED_MODULES, jsonArrayAllocatedModules);
+            result.put(OnRCStatus.KEY_FREE_MODULES, jsonArrayFreeModules);
+            result.put(OnRCStatus.KEY_ALLOWED, TestValues.GENERAL_BOOLEAN);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        List<ModuleData> listAllocatedModules = ((OnRCStatus) msg).getAllocatedModules();
+        List<ModuleData> listFreeModules = ((OnRCStatus) msg).getFreeModules();
+        Boolean allowed = ((OnRCStatus) msg).getAllowed();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULEDATA, listAllocatedModules.get(0));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULEDATA, listFreeModules.get(0));
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, allowed);
+
+        // Invalid/Null Tests
+        OnRCStatus msg = new OnRCStatus();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getAllocatedModules());
+        assertNull(TestValues.NULL, msg.getFreeModules());
+        assertNull(TestValues.NULL, msg.getAllowed());
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java
index 37fa2e570..a2f4f3c71 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemCapabilityUpdatedTests.java
@@ -22,59 +22,59 @@ import static junit.framework.TestCase.fail;
  */
 public class OnSystemCapabilityUpdatedTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage(){
-		OnSystemCapabilityUpdated msg = new OnSystemCapabilityUpdated();
-
-		msg.setSystemCapability(TestValues.GENERAL_SYSTEMCAPABILITY);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_NOTIFICATION;
-	}
-
-	@Override
-	protected String getCommandType(){
-		return FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		JSONObject result = new JSONObject();
-
-		try{
-			result.put(OnSystemCapabilityUpdated.KEY_SYSTEM_CAPABILITY, TestValues.GENERAL_SYSTEMCAPABILITY.serializeJSON());
-		}catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		SystemCapability cmdId = ( (OnSystemCapabilityUpdated) msg ).getSystemCapability();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMCAPABILITY, cmdId);
-
-		// Invalid/Null Tests
-		OnSystemCapabilityUpdated msg = new OnSystemCapabilityUpdated();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getSystemCapability());
-
-		// test constructor with param
-		msg = new OnSystemCapabilityUpdated(TestValues.GENERAL_SYSTEMCAPABILITY);
-		SystemCapability systemCapability = msg.getSystemCapability();
-		assertEquals(systemCapability, TestValues.GENERAL_SYSTEMCAPABILITY);
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        OnSystemCapabilityUpdated msg = new OnSystemCapabilityUpdated();
+
+        msg.setSystemCapability(TestValues.GENERAL_SYSTEMCAPABILITY);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_NOTIFICATION;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(OnSystemCapabilityUpdated.KEY_SYSTEM_CAPABILITY, TestValues.GENERAL_SYSTEMCAPABILITY.serializeJSON());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        SystemCapability cmdId = ((OnSystemCapabilityUpdated) msg).getSystemCapability();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMCAPABILITY, cmdId);
+
+        // Invalid/Null Tests
+        OnSystemCapabilityUpdated msg = new OnSystemCapabilityUpdated();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getSystemCapability());
+
+        // test constructor with param
+        msg = new OnSystemCapabilityUpdated(TestValues.GENERAL_SYSTEMCAPABILITY);
+        SystemCapability systemCapability = msg.getSystemCapability();
+        assertEquals(systemCapability, TestValues.GENERAL_SYSTEMCAPABILITY);
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
index 580cbd9a7..b481615c8 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
@@ -21,13 +21,13 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnSystemRequest}
  */
-public class OnSystemRequestTests extends BaseRpcTests{
-    
+public class OnSystemRequestTests extends BaseRpcTests {
+
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnSystemRequest msg = new OnSystemRequest();
 
         msg.setFileType(TestValues.GENERAL_FILETYPE);
@@ -42,20 +42,20 @@ public class OnSystemRequestTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_SYSTEM_REQUEST.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnSystemRequest.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE);
             result.put(OnSystemRequest.KEY_LENGTH, TestValues.GENERAL_LONG);
             result.put(OnSystemRequest.KEY_TIMEOUT, TestValues.GENERAL_INT);
@@ -63,28 +63,28 @@ public class OnSystemRequestTests extends BaseRpcTests{
             result.put(OnSystemRequest.KEY_URL, TestValues.GENERAL_STRING);
             result.put(OnSystemRequest.KEY_REQUEST_TYPE, TestValues.GENERAL_REQUESTTYPE);
             result.put(OnSystemRequest.KEY_REQUEST_SUB_TYPE, TestValues.GENERAL_STRING);
-        } catch(JSONException e) {
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        FileType fileType = ( (OnSystemRequest) msg ).getFileType();
-        Long length = ( (OnSystemRequest) msg ).getLength();
-        int timeout = ( (OnSystemRequest) msg ).getTimeout();
-        Long offset = ( (OnSystemRequest) msg ).getOffset();
-        String url = ( (OnSystemRequest) msg ).getUrl();
-        RequestType requestType = ( (OnSystemRequest) msg ).getRequestType();
-        String requestSubType = ( (OnSystemRequest) msg ).getRequestSubType();
-        
-        
+    public void testRpcValues() {
+        // Test Values
+        FileType fileType = ((OnSystemRequest) msg).getFileType();
+        Long length = ((OnSystemRequest) msg).getLength();
+        int timeout = ((OnSystemRequest) msg).getTimeout();
+        Long offset = ((OnSystemRequest) msg).getOffset();
+        String url = ((OnSystemRequest) msg).getUrl();
+        RequestType requestType = ((OnSystemRequest) msg).getRequestType();
+        String requestSubType = ((OnSystemRequest) msg).getRequestSubType();
+
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, fileType);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, length);
@@ -93,22 +93,22 @@ public class OnSystemRequestTests extends BaseRpcTests{
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, url);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_REQUESTTYPE, requestType);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, requestSubType);
-        
+
         // Test Body
         OnSystemRequest osr = (OnSystemRequest) msg;
         String body = osr.getBody();
         assertNull(TestValues.NULL, body);
-        
-        String testBody = "123ABC";        
+
+        String testBody = "123ABC";
         osr.setBody(testBody);
-        
+
         String readBody = osr.getBody();
         assertEquals(TestValues.MATCH, testBody, readBody);
-    
+
         // Test Headers     
         Headers headers = osr.getHeader();
         assertNull(TestValues.NULL, headers);
-        
+
         Headers testHeaders = new Headers();
         testHeaders.setCharset("ASCII");
         testHeaders.setConnectTimeout(1000);
@@ -119,12 +119,12 @@ public class OnSystemRequestTests extends BaseRpcTests{
         testHeaders.setInstanceFollowRedirects(true);
         testHeaders.setReadTimeout(800);
         testHeaders.setRequestMethod("POST");
-        testHeaders.setUseCaches(false);        
+        testHeaders.setUseCaches(false);
         osr.setHeaders(testHeaders);
-        
+
         Headers readHeaders = osr.getHeader();
         assertTrue(TestValues.TRUE, Validator.validateHeaders(testHeaders, readHeaders));
-    
+
         // Invalid/Null Tests
         OnSystemRequest msg = new OnSystemRequest();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -140,7 +140,7 @@ public class OnSystemRequestTests extends BaseRpcTests{
     }
 
     @Test
-    public void testUrlParam(){
+    public void testUrlParam() {
 
         OnSystemRequest msg = new OnSystemRequest();
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java
index 0de7a5745..f21f7f1f3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java
@@ -17,13 +17,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnTBTClientState}
  */
-public class OnTBTClientStateTests extends BaseRpcTests{
+public class OnTBTClientStateTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnTBTClientState msg = new OnTBTClientState();
 
         msg.setState(TestValues.GENERAL_TBTSTATE);
@@ -32,39 +32,39 @@ public class OnTBTClientStateTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_TBT_CLIENT_STATE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnTBTClientState.KEY_STATE, TestValues.GENERAL_TBTSTATE);
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        TBTState data = ( (OnTBTClientState) msg ).getState();
-        
+    public void testRpcValues() {
+        // Test Values
+        TBTState data = ((OnTBTClientState) msg).getState();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_TBTSTATE, data);
-    
+
         // Invalid/Null Tests
         OnTBTClientState msg = new OnTBTClientState();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
index 2c2379550..5ff64b285 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
@@ -22,62 +22,62 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnTouchEvent}
  */
-public class OnTouchEventTests extends BaseRpcTests{
+public class OnTouchEventTests extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         OnTouchEvent msg = new OnTouchEvent();
         msg.setType(TestValues.GENERAL_TOUCHTYPE);
         msg.setEvent(TestValues.GENERAL_TOUCHEVENT_LIST);
 
         return msg;
-    }    
+    }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_TOUCH_EVENT.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{            
+        try {
             result.put(OnTouchEvent.KEY_TYPE, TestValues.GENERAL_TOUCHTYPE);
-            result.put(OnTouchEvent.KEY_EVENT,  TestValues.JSON_TOUCHEVENTS);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+            result.put(OnTouchEvent.KEY_EVENT, TestValues.JSON_TOUCHEVENTS);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        TouchType type = ( (OnTouchEvent) msg ).getType();
-        List<TouchEvent> event = ( (OnTouchEvent) msg ).getEvent();
-        
+    public void testRpcValues() {
+        // Test Values
+        TouchType type = ((OnTouchEvent) msg).getType();
+        List<TouchEvent> event = ((OnTouchEvent) msg).getEvent();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_TOUCHTYPE, type);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_TOUCHEVENT_LIST.size(), event.size());
-        for(int i = 0; i< TestValues.GENERAL_TOUCHEVENT_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_TOUCHEVENT_LIST.size(); i++) {
             TouchEvent referenceEvent = TestValues.GENERAL_TOUCHEVENT_LIST.get(i);
             TouchEvent dataEvent = event.get(i);
             assertTrue(TestValues.TRUE, Validator.validateTouchEvent(referenceEvent, dataEvent));
         }
-        
+
         // Invalid/Null Tests
         OnTouchEvent msg = new OnTouchEvent();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateFileTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateFileTest.java
index 03dc524a1..4a955a3c3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateFileTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateFileTest.java
@@ -43,9 +43,9 @@ public class OnUpdateFileTest extends BaseRpcTests {
     protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnUpdateFile.KEY_FILE_NAME, TestValues.GENERAL_STRING);
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -56,9 +56,9 @@ public class OnUpdateFileTest extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        String fileName = ( (OnUpdateFile) msg).getFileName();
+        String fileName = ((OnUpdateFile) msg).getFileName();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, fileName);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateSubMenuTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateSubMenuTest.java
index afcaf1310..9099d085f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateSubMenuTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnUpdateSubMenuTest.java
@@ -44,10 +44,10 @@ public class OnUpdateSubMenuTest extends BaseRpcTests {
     protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnUpdateSubMenu.KEY_MENU_ID, TestValues.GENERAL_INT);
             result.put(OnUpdateSubMenu.KEY_UPDATE_SUB_CELLS, TestValues.GENERAL_BOOLEAN);
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -58,10 +58,10 @@ public class OnUpdateSubMenuTest extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        int menuId = ( (OnUpdateSubMenu) msg ).getMenuID();
-        boolean updateSubCells = ( (OnUpdateSubMenu) msg ).getUpdateSubCells();
+        int menuId = ((OnUpdateSubMenu) msg).getMenuID();
+        boolean updateSubCells = ((OnUpdateSubMenu) msg).getUpdateSubCells();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, menuId);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
index 409ad1dd1..cb60f7572 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
@@ -49,31 +49,31 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.OnVehicleData}
  */
-public class OnVehicleDataTests extends BaseRpcTests{
-	
+public class OnVehicleDataTests extends BaseRpcTests {
+
     @Override
-    protected RPCMessage createMessage(){
-    	return VehicleDataHelper.VEHICLE_DATA;
+    protected RPCMessage createMessage() {
+        return VehicleDataHelper.VEHICLE_DATA;
     }
 
     @Override
-    protected String getMessageType(){
-    	return RPCMessage.KEY_NOTIFICATION;
+    protected String getMessageType() {
+        return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
-    	return FunctionID.ON_VEHICLE_DATA.toString();
+    protected String getCommandType() {
+        return FunctionID.ON_VEHICLE_DATA.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(OnVehicleData.KEY_SPEED, VehicleDataHelper.SPEED);
             result.put(OnVehicleData.KEY_RPM, VehicleDataHelper.RPM);
             result.put(OnVehicleData.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE);
@@ -101,96 +101,96 @@ public class OnVehicleDataTests extends BaseRpcTests{
             result.put(OnVehicleData.KEY_CLUSTER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS.serializeJSON());
             result.put(OnVehicleData.KEY_MY_KEY, VehicleDataHelper.MY_KEY.serializeJSON());
             result.put(OnVehicleData.KEY_FUEL_RANGE, VehicleDataHelper.JSON_FUEL_RANGE);
-			result.put(OnVehicleData.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL);
-			result.put(OnVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
-			result.put(OnVehicleData.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING);
-			result.put(OnVehicleData.KEY_GEAR_STATUS, VehicleDataHelper.GEAR_STATUS);
-			result.put(OnVehicleData.KEY_WINDOW_STATUS, VehicleDataHelper.WINDOW_STATUS_LIST);
-			result.put(OnVehicleData.KEY_STABILITY_CONTROLS_STATUS, VehicleDataHelper.STABILITY_CONTROLS_STATUS);
-			result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
-        } catch(JSONException e) {
-        	fail(TestValues.JSON_FAIL);
+            result.put(OnVehicleData.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL);
+            result.put(OnVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
+            result.put(OnVehicleData.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING);
+            result.put(OnVehicleData.KEY_GEAR_STATUS, VehicleDataHelper.GEAR_STATUS);
+            result.put(OnVehicleData.KEY_WINDOW_STATUS, VehicleDataHelper.WINDOW_STATUS_LIST);
+            result.put(OnVehicleData.KEY_STABILITY_CONTROLS_STATUS, VehicleDataHelper.STABILITY_CONTROLS_STATUS);
+            result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
-    
+
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {
-    	// Test Values
-    	Double speed = ( (OnVehicleData) msg).getSpeed();
-    	int rpm = ( (OnVehicleData) msg).getRpm();
-    	Double external = ( (OnVehicleData) msg).getExternalTemperature();
-    	Double fuelLevel = ( (OnVehicleData) msg).getFuelLevel();
-    	String vin = ( (OnVehicleData) msg).getVin();
-    	PRNDL prndl = ( (OnVehicleData) msg).getPrndl();
-    	TireStatus pressure = ( (OnVehicleData) msg).getTirePressure();
-    	Double torque = ( (OnVehicleData) msg).getEngineTorque();
-    	Float engineOilLife = ( (OnVehicleData) msg).getEngineOilLife();
-    	int odometer = ( (OnVehicleData) msg).getOdometer();
-    	GPSData gps = ( (OnVehicleData) msg).getGps();
-    	ComponentVolumeStatus state = ( (OnVehicleData) msg).getFuelLevelState();
-    	Double consumption = ( (OnVehicleData) msg).getInstantFuelConsumption();
-    	BeltStatus belt = ( (OnVehicleData) msg).getBeltStatus();
-    	BodyInformation body = ( (OnVehicleData) msg).getBodyInformation();
-    	DeviceStatus device = ( (OnVehicleData) msg).getDeviceStatus();
-    	VehicleDataEventStatus brake = ( (OnVehicleData) msg).getDriverBraking();
-    	WiperStatus wiper = ( (OnVehicleData) msg).getWiperStatus();
-    	HeadLampStatus lamp = ( (OnVehicleData) msg).getHeadLampStatus();
-    	Double pedal = ( (OnVehicleData) msg).getAccPedalPosition();
-    	Double wheel = ( (OnVehicleData) msg).getSteeringWheelAngle();
-    	ECallInfo ecall = ( (OnVehicleData) msg).getECallInfo();
-    	AirbagStatus airbag = ( (OnVehicleData) msg).getAirbagStatus();
-    	EmergencyEvent event = ( (OnVehicleData) msg).getEmergencyEvent();
-    	ClusterModeStatus cluster = ( (OnVehicleData) msg).getClusterModeStatus();
-    	MyKey key = ( (OnVehicleData) msg).getMyKey();
-    	List<FuelRange> fuelRangeList = ( (OnVehicleData) msg).getFuelRange();
-    	List<WindowStatus> windowStatusList = ( (OnVehicleData) msg).getWindowStatus();
-    	TurnSignal turnSignal = ( (OnVehicleData) msg).getTurnSignal();
-    	ElectronicParkBrakeStatus electronicParkBrakeStatus = ( (OnVehicleData) msg).getElectronicParkBrakeStatus();
-    	GearStatus gearStatus = ( (OnVehicleData) msg).getGearStatus();
-    	StabilityControlsStatus stabilityControlsStatus = ( (OnVehicleData) msg).getStabilityControlsStatus();
-    	Object oemCustomVehicleData = ( (OnVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
-    	Boolean handsOffSteering = ( (OnVehicleData) msg).getHandsOffSteering();
-    	// Valid Tests
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.SPEED, speed);
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.RPM, rpm);
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.EXTERNAL_TEMPERATURE, external);
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL, fuelLevel);
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.VIN, vin);
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.PRNDL_FINAL, prndl);
-    	assertTrue(TestValues.MATCH, Validator.validateTireStatus(VehicleDataHelper.TIRE_PRESSURE, pressure));
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_TORQUE, torque);
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_OIL_LIFE, engineOilLife);
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.ODOMETER, odometer);
-    	assertTrue(TestValues.MATCH, Validator.validateGpsData(VehicleDataHelper.GPS, gps));
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL_STATE, state);
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION, consumption);
-    	assertTrue(TestValues.TRUE, Validator.validateBeltStatus(VehicleDataHelper.BELT_STATUS, belt));
-    	assertTrue(TestValues.TRUE, Validator.validateBodyInformation(VehicleDataHelper.BODY_INFORMATION, body));
-    	assertTrue(TestValues.TRUE, Validator.validateDeviceStatus(VehicleDataHelper.DEVICE_STATUS, device));
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.DRIVER_BRAKING, brake);
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.WIPER_STATUS, wiper);
-    	assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus(VehicleDataHelper.HEAD_LAMP_STATUS, lamp));
-		assertEquals(TestValues.MATCH, VehicleDataHelper.ACC_PEDAL_POSITION, pedal);
-    	assertEquals(TestValues.MATCH, VehicleDataHelper.STEERING_WHEEL_ANGLE, wheel);
-    	assertTrue(TestValues.TRUE, Validator.validateECallInfo(VehicleDataHelper.E_CALL_INFO, ecall));
-    	assertTrue(TestValues.TRUE, Validator.validateAirbagStatus(VehicleDataHelper.AIRBAG_STATUS, airbag));
-	    assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent(VehicleDataHelper.EMERGENCY_EVENT, event));
-	    assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus(VehicleDataHelper.CLUSTER_MODE_STATUS, cluster));
-	    assertTrue(TestValues.TRUE, Validator.validateMyKey(VehicleDataHelper.MY_KEY, key));
-	    assertTrue(TestValues.TRUE, Validator.validateFuelRange(VehicleDataHelper.FUEL_RANGE_LIST, fuelRangeList));
-	    assertTrue(TestValues.TRUE, Validator.validateWindowStatuses(VehicleDataHelper.WINDOW_STATUS_LIST, windowStatusList));
-	    assertEquals(TestValues.MATCH, VehicleDataHelper.TURN_SIGNAL, turnSignal);
-	    assertEquals(TestValues.MATCH, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus);
-	    assertEquals(TestValues.MATCH, VehicleDataHelper.GEAR_STATUS, gearStatus);
-	    assertEquals(TestValues.MATCH, VehicleDataHelper.STABILITY_CONTROLS_STATUS, stabilityControlsStatus);
-	    assertEquals(TestValues.MATCH, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE, oemCustomVehicleData);
-	    assertEquals(TestValues.MATCH, VehicleDataHelper.HANDS_OFF_STEERING, handsOffSteering);
-	    // Invalid/Null Tests
+    public void testRpcValues() {
+        // Test Values
+        Double speed = ((OnVehicleData) msg).getSpeed();
+        int rpm = ((OnVehicleData) msg).getRpm();
+        Double external = ((OnVehicleData) msg).getExternalTemperature();
+        Double fuelLevel = ((OnVehicleData) msg).getFuelLevel();
+        String vin = ((OnVehicleData) msg).getVin();
+        PRNDL prndl = ((OnVehicleData) msg).getPrndl();
+        TireStatus pressure = ((OnVehicleData) msg).getTirePressure();
+        Double torque = ((OnVehicleData) msg).getEngineTorque();
+        Float engineOilLife = ((OnVehicleData) msg).getEngineOilLife();
+        int odometer = ((OnVehicleData) msg).getOdometer();
+        GPSData gps = ((OnVehicleData) msg).getGps();
+        ComponentVolumeStatus state = ((OnVehicleData) msg).getFuelLevelState();
+        Double consumption = ((OnVehicleData) msg).getInstantFuelConsumption();
+        BeltStatus belt = ((OnVehicleData) msg).getBeltStatus();
+        BodyInformation body = ((OnVehicleData) msg).getBodyInformation();
+        DeviceStatus device = ((OnVehicleData) msg).getDeviceStatus();
+        VehicleDataEventStatus brake = ((OnVehicleData) msg).getDriverBraking();
+        WiperStatus wiper = ((OnVehicleData) msg).getWiperStatus();
+        HeadLampStatus lamp = ((OnVehicleData) msg).getHeadLampStatus();
+        Double pedal = ((OnVehicleData) msg).getAccPedalPosition();
+        Double wheel = ((OnVehicleData) msg).getSteeringWheelAngle();
+        ECallInfo ecall = ((OnVehicleData) msg).getECallInfo();
+        AirbagStatus airbag = ((OnVehicleData) msg).getAirbagStatus();
+        EmergencyEvent event = ((OnVehicleData) msg).getEmergencyEvent();
+        ClusterModeStatus cluster = ((OnVehicleData) msg).getClusterModeStatus();
+        MyKey key = ((OnVehicleData) msg).getMyKey();
+        List<FuelRange> fuelRangeList = ((OnVehicleData) msg).getFuelRange();
+        List<WindowStatus> windowStatusList = ((OnVehicleData) msg).getWindowStatus();
+        TurnSignal turnSignal = ((OnVehicleData) msg).getTurnSignal();
+        ElectronicParkBrakeStatus electronicParkBrakeStatus = ((OnVehicleData) msg).getElectronicParkBrakeStatus();
+        GearStatus gearStatus = ((OnVehicleData) msg).getGearStatus();
+        StabilityControlsStatus stabilityControlsStatus = ((OnVehicleData) msg).getStabilityControlsStatus();
+        Object oemCustomVehicleData = ((OnVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
+        Boolean handsOffSteering = ((OnVehicleData) msg).getHandsOffSteering();
+        // Valid Tests
+        assertEquals(TestValues.MATCH, VehicleDataHelper.SPEED, speed);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.RPM, rpm);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.EXTERNAL_TEMPERATURE, external);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL, fuelLevel);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.VIN, vin);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.PRNDL_FINAL, prndl);
+        assertTrue(TestValues.MATCH, Validator.validateTireStatus(VehicleDataHelper.TIRE_PRESSURE, pressure));
+        assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_TORQUE, torque);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_OIL_LIFE, engineOilLife);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.ODOMETER, odometer);
+        assertTrue(TestValues.MATCH, Validator.validateGpsData(VehicleDataHelper.GPS, gps));
+        assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL_STATE, state);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION, consumption);
+        assertTrue(TestValues.TRUE, Validator.validateBeltStatus(VehicleDataHelper.BELT_STATUS, belt));
+        assertTrue(TestValues.TRUE, Validator.validateBodyInformation(VehicleDataHelper.BODY_INFORMATION, body));
+        assertTrue(TestValues.TRUE, Validator.validateDeviceStatus(VehicleDataHelper.DEVICE_STATUS, device));
+        assertEquals(TestValues.MATCH, VehicleDataHelper.DRIVER_BRAKING, brake);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.WIPER_STATUS, wiper);
+        assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus(VehicleDataHelper.HEAD_LAMP_STATUS, lamp));
+        assertEquals(TestValues.MATCH, VehicleDataHelper.ACC_PEDAL_POSITION, pedal);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.STEERING_WHEEL_ANGLE, wheel);
+        assertTrue(TestValues.TRUE, Validator.validateECallInfo(VehicleDataHelper.E_CALL_INFO, ecall));
+        assertTrue(TestValues.TRUE, Validator.validateAirbagStatus(VehicleDataHelper.AIRBAG_STATUS, airbag));
+        assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent(VehicleDataHelper.EMERGENCY_EVENT, event));
+        assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus(VehicleDataHelper.CLUSTER_MODE_STATUS, cluster));
+        assertTrue(TestValues.TRUE, Validator.validateMyKey(VehicleDataHelper.MY_KEY, key));
+        assertTrue(TestValues.TRUE, Validator.validateFuelRange(VehicleDataHelper.FUEL_RANGE_LIST, fuelRangeList));
+        assertTrue(TestValues.TRUE, Validator.validateWindowStatuses(VehicleDataHelper.WINDOW_STATUS_LIST, windowStatusList));
+        assertEquals(TestValues.MATCH, VehicleDataHelper.TURN_SIGNAL, turnSignal);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS, electronicParkBrakeStatus);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.GEAR_STATUS, gearStatus);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.STABILITY_CONTROLS_STATUS, stabilityControlsStatus);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE, oemCustomVehicleData);
+        assertEquals(TestValues.MATCH, VehicleDataHelper.HANDS_OFF_STEERING, handsOffSteering);
+        // Invalid/Null Tests
         OnVehicleData msg = new OnVehicleData();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -229,374 +229,365 @@ public class OnVehicleDataTests extends BaseRpcTests{
         assertNull(TestValues.NULL, msg.getGearStatus());
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-	}
+    }
 
-	@Test
+    @Test
     public void testJson() {
-		JSONObject reference = new JSONObject();
-		
-		//Objects needed on the first level.
-		JSONObject tireStatusObj = new JSONObject();
-		JSONObject GPSDataObj = new JSONObject();
-		JSONObject beltStatusObj = new JSONObject();
-		JSONObject bodyInformationObj = new JSONObject();
-		JSONObject deviceStatusObj = new JSONObject();
-		JSONObject headLampStatusObj = new JSONObject();
-		JSONObject ECallInfoObj = new JSONObject();
-		JSONObject airbagStatusObj = new JSONObject();
-		JSONObject emergencyEventObj = new JSONObject();
-		JSONObject clusterModeStatusObj = new JSONObject();
-		JSONObject myKeyObj = new JSONObject();
-		JSONObject fuelRangeObj = new JSONObject();
-		JSONObject windowStatusObj = new JSONObject();
-		JSONObject gearStatusObj = new JSONObject();
-		JSONObject stabilityControlStatusObj = new JSONObject();
-		JSONArray fuelRangeArrayObj = new JSONArray();
-		JSONArray windowStatusArrayObj = new JSONArray();
-
-		try {
-			//Set up the JSONObject to represent OnVehicleData:
-			
-			//TIRE_PRESSURE
-			tireStatusObj.put(TireStatus.KEY_PRESSURE_TELL_TALE, VehicleDataHelper.TIRE_PRESSURE_TELL_TALE);
-			JSONObject tireLeftFront = new JSONObject();
-			tireLeftFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_FRONT);
-			tireStatusObj.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront);
-			JSONObject tireRightFront = new JSONObject();
-			tireRightFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_FRONT);
-			tireStatusObj.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront);
-			JSONObject tireLeftRear = new JSONObject();
-			tireLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_REAR);
-			tireStatusObj.put(TireStatus.KEY_LEFT_REAR, tireLeftRear);
-			JSONObject tireRightRear = new JSONObject();
-			tireRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_REAR);
-			tireStatusObj.put(TireStatus.KEY_RIGHT_REAR, tireRightRear);
-			JSONObject tireInnerLeftRear = new JSONObject();
-			tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_LEFT_REAR);
-			tireStatusObj.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear);
-			JSONObject tireInnerRightRear = new JSONObject();
-			tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_RIGHT_REAR);
-			tireStatusObj.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear);
-			
-			//GPS
-			GPSDataObj.put(GPSData.KEY_LONGITUDE_DEGREES, VehicleDataHelper.GPS_LONGITUDE);
-			GPSDataObj.put(GPSData.KEY_LATITUDE_DEGREES, VehicleDataHelper.GPS_LATITUDE);
-			GPSDataObj.put(GPSData.KEY_UTC_YEAR, VehicleDataHelper.GPS_YEAR);
-			GPSDataObj.put(GPSData.KEY_UTC_MONTH, VehicleDataHelper.GPS_MONTH);
-			GPSDataObj.put(GPSData.KEY_UTC_DAY, VehicleDataHelper.GPS_DAY);
-			GPSDataObj.put(GPSData.KEY_UTC_HOURS, VehicleDataHelper.GPS_HOURS);
-			GPSDataObj.put(GPSData.KEY_UTC_MINUTES, VehicleDataHelper.GPS_MINUTES);
-			GPSDataObj.put(GPSData.KEY_UTC_SECONDS, VehicleDataHelper.GPS_SECONDS);
-			GPSDataObj.put(GPSData.KEY_COMPASS_DIRECTION, VehicleDataHelper.GPS_DIRECTION);
-			GPSDataObj.put(GPSData.KEY_PDOP, VehicleDataHelper.GPS_PDOP);
-			GPSDataObj.put(GPSData.KEY_VDOP, VehicleDataHelper.GPS_VDOP);
-			GPSDataObj.put(GPSData.KEY_HDOP, VehicleDataHelper.GPS_HDOP);
-			GPSDataObj.put(GPSData.KEY_ACTUAL, VehicleDataHelper.GPS_ACTUAL);
-			GPSDataObj.put(GPSData.KEY_SATELLITES, VehicleDataHelper.GPS_SATELLITES);
-			GPSDataObj.put(GPSData.KEY_DIMENSION, VehicleDataHelper.GPS_DIMENSION);
-			GPSDataObj.put(GPSData.KEY_ALTITUDE, VehicleDataHelper.GPS_ALTITUDE);
-			GPSDataObj.put(GPSData.KEY_HEADING, VehicleDataHelper.GPS_HEADING);
-			GPSDataObj.put(GPSData.KEY_SPEED, VehicleDataHelper.GPS_SPEED);
-			GPSDataObj.put(GPSData.KEY_SHIFTED, VehicleDataHelper.GPS_SHIFTED);
-			
-			//BELT_STATUS
-			beltStatusObj.put(BeltStatus.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED);
-			beltStatusObj.put(BeltStatus.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED);
-			beltStatusObj.put(BeltStatus.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD);
-			beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_LEFT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED);
-			beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED);
-			
-			//BODY_INFORMATION
-			bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE);
-			bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS);
-			bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS);
-			bodyInformationObj.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR);
-			bodyInformationObj.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR);
-			bodyInformationObj.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR);
-			bodyInformationObj.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR);
-			
-			//DEVICE_STATUS
-			deviceStatusObj.put(DeviceStatus.KEY_VOICE_REC_ON, VehicleDataHelper.DEVICE_STATUS_VOICE_REC);
-			deviceStatusObj.put(DeviceStatus.KEY_BT_ICON_ON, VehicleDataHelper.DEVICE_STATUS_BT_ICON);
-			deviceStatusObj.put(DeviceStatus.KEY_CALL_ACTIVE, VehicleDataHelper.DEVICE_STATUS_CALL_ACTIVE);
-			deviceStatusObj.put(DeviceStatus.KEY_PHONE_ROAMING, VehicleDataHelper.DEVICE_STATUS_PHONE_ROAMING);
-			deviceStatusObj.put(DeviceStatus.KEY_TEXT_MSG_AVAILABLE, VehicleDataHelper.DEVICE_STATUS_TEXT_MSG_AVAILABLE);
-			deviceStatusObj.put(DeviceStatus.KEY_BATT_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_BATT_LEVEL_STATUS);
-			deviceStatusObj.put(DeviceStatus.KEY_STEREO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_STEREO_MUTED);
-			deviceStatusObj.put(DeviceStatus.KEY_MONO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_MONO_MUTED);
-			deviceStatusObj.put(DeviceStatus.KEY_SIGNAL_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_SIGNAL_LEVEL_STATUS);
-			deviceStatusObj.put(DeviceStatus.KEY_PRIMARY_AUDIO_SOURCE, VehicleDataHelper.DEVICE_STATUS_PRIMARY_AUDIO);
-			deviceStatusObj.put(DeviceStatus.KEY_E_CALL_EVENT_ACTIVE, VehicleDataHelper.DEVICE_STATUS_E_CALL_ACTIVE);
-			
-			//HEAD_LAMP_STATUS
-			headLampStatusObj.put(HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS, VehicleDataHelper.HEAD_LAMP_STATUS_AMBIENT_STATUS);
-			headLampStatusObj.put(HeadLampStatus.KEY_HIGH_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_HIGH_BEAMS);
-			headLampStatusObj.put(HeadLampStatus.KEY_LOW_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_LOW_BEAMS);
-			
-			//E_CALL_INFO
-			ECallInfoObj.put(ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_E_CALL_NOTIFICATION_STATUS);
-			ECallInfoObj.put(ECallInfo.KEY_AUX_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS);
-			ECallInfoObj.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, VehicleDataHelper.E_CALL_INFO_CONFIRMATION_STATUS);
-	    	
-			//AIRBAG_STATUS
-			airbagStatusObj.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED);
-			
-			//EMERGENCY_EVENT
-			emergencyEventObj.put(EmergencyEvent.KEY_EMERGENCY_EVENT_TYPE, VehicleDataHelper.EMERGENCY_EVENT_TYPE);
-			emergencyEventObj.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, VehicleDataHelper.EMERGENCY_EVENT_FUEL_CUTOFF_STATUS);
-			emergencyEventObj.put(EmergencyEvent.KEY_ROLLOVER_EVENT, VehicleDataHelper.EMERGENCY_EVENT_ROLLOVER_EVENT);
-			emergencyEventObj.put(EmergencyEvent.KEY_MAXIMUM_CHANGE_VELOCITY, VehicleDataHelper.EMERGENCY_EVENT_MAX_CHANGE_VELOCITY);
-			emergencyEventObj.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS);
-			
-			//CLUSTER_MODE_STATUS
-			clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE);
-			clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS);
-			clusterModeStatusObj.put(ClusterModeStatus.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS);
-			clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS);
-			
-			//MY_KEY
-			myKeyObj.put(MyKey.KEY_E_911_OVERRIDE, VehicleDataHelper.MY_KEY_E_911_OVERRIDE);
-
-			// FUEL_RANGE
-			fuelRangeObj.put(FuelRange.KEY_TYPE, VehicleDataHelper.FUEL_RANGE_TYPE);
-			fuelRangeObj.put(FuelRange.KEY_RANGE, VehicleDataHelper.FUEL_RANGE_RANGE);
-			fuelRangeObj.put(FuelRange.KEY_CAPACITY, VehicleDataHelper.FUEL_RANGE_CAPACITY);
-			fuelRangeObj.put(FuelRange.KEY_CAPACITY_UNIT, VehicleDataHelper.FUEL_RANGE_CAPACITY_UNIT);
-			fuelRangeObj.put(FuelRange.KEY_LEVEL, VehicleDataHelper.FUEL_RANGE_LEVEL);
-			fuelRangeObj.put(FuelRange.KEY_LEVEL_STATE, VehicleDataHelper.FUEL_RANGE_LEVEL_STATE);
-			fuelRangeArrayObj.put(fuelRangeObj);
-
-			// STABILITY_CONTROLS_STATU
-			stabilityControlStatusObj.put(StabilityControlsStatus.KEY_ESC_SYSTEM, VehicleDataHelper.ESC_SYSTEM);
-			stabilityControlStatusObj.put(StabilityControlsStatus.KEY_TRAILER_SWAY_CONTROL, VehicleDataHelper.S_WAY_TRAILER);
-
-			// WINDOW_STATUS
-			windowStatusObj.put(WindowStatus.KEY_LOCATION, VehicleDataHelper.LOCATION_GRID);
-			windowStatusObj.put(WindowStatus.KEY_STATE, VehicleDataHelper.WINDOW_STATE);
-			windowStatusArrayObj.put(windowStatusObj);
-
-			// GEAR STATUS
-			gearStatusObj.put(GearStatus.KEY_USER_SELECTED_GEAR, VehicleDataHelper.USER_SELECTED_GEAR);
-			gearStatusObj.put(GearStatus.KEY_TRANSMISSION_TYPE, VehicleDataHelper.TRANSMISSION_TYPE);
-			gearStatusObj.put(GearStatus.KEY_ACTUAL_GEAR, VehicleDataHelper.ACTUAL_GEAR);
-
-			reference.put(OnVehicleData.KEY_SPEED, VehicleDataHelper.SPEED);
-			reference.put(OnVehicleData.KEY_RPM, VehicleDataHelper.RPM);
-			reference.put(OnVehicleData.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE);
-			reference.put(OnVehicleData.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL);
-			reference.put(OnVehicleData.KEY_VIN, VehicleDataHelper.VIN);
-			reference.put(OnVehicleData.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL);
-			reference.put(OnVehicleData.KEY_TIRE_PRESSURE, tireStatusObj);
-			reference.put(OnVehicleData.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE);
-			reference.put(OnVehicleData.KEY_ENGINE_OIL_LIFE, VehicleDataHelper.ENGINE_OIL_LIFE);
-			reference.put(OnVehicleData.KEY_ODOMETER, VehicleDataHelper.ODOMETER);
-			reference.put(OnVehicleData.KEY_GPS, GPSDataObj);
-			reference.put(OnVehicleData.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE);
-			reference.put(OnVehicleData.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION);
-			reference.put(OnVehicleData.KEY_BELT_STATUS, beltStatusObj);
-			reference.put(OnVehicleData.KEY_BODY_INFORMATION, bodyInformationObj);
-			reference.put(OnVehicleData.KEY_DEVICE_STATUS, deviceStatusObj);
-			reference.put(OnVehicleData.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING);
-			reference.put(OnVehicleData.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS);
-			reference.put(OnVehicleData.KEY_HEAD_LAMP_STATUS, headLampStatusObj);
-			reference.put(OnVehicleData.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION);
-			reference.put(OnVehicleData.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE);
-			reference.put(OnVehicleData.KEY_E_CALL_INFO, ECallInfoObj);
-			reference.put(OnVehicleData.KEY_AIRBAG_STATUS, airbagStatusObj);
-			reference.put(OnVehicleData.KEY_EMERGENCY_EVENT, emergencyEventObj);
-			reference.put(OnVehicleData.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj);
-			reference.put(OnVehicleData.KEY_MY_KEY, myKeyObj);
-			reference.put(OnVehicleData.KEY_FUEL_RANGE, fuelRangeArrayObj);
-			reference.put(OnVehicleData.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL);
-			reference.put(OnVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
-			reference.put(OnVehicleData.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING);
-			reference.put(OnVehicleData.KEY_WINDOW_STATUS, windowStatusArrayObj);
-			reference.put(OnVehicleData.KEY_GEAR_STATUS, gearStatusObj);
-			reference.put(OnVehicleData.KEY_STABILITY_CONTROLS_STATUS, stabilityControlStatusObj);
-			reference.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
-			
-			JSONObject underTest = msg.serializeJSON();
-			//go inside underTest and only return the JSONObject inside the parameters key inside the notification key
-			underTest = underTest.getJSONObject("notification").getJSONObject("parameters");
-			
-			assertEquals(TestValues.MATCH, reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				
-				if (key.equals(OnVehicleData.KEY_TIRE_PRESSURE)) {
-					JSONObject tirePressureReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject tirePressureTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateTireStatus(
-						new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureReference)),
-						new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureTest))));
-					
-				} else if (key.equals(OnVehicleData.KEY_GPS)) {
-					JSONObject GPSObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject GPSObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateGpsData(
-						new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjReference)),
-						new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjTest))));
-				} else if (key.equals(OnVehicleData.KEY_BELT_STATUS)) {
-					JSONObject beltObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject beltObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateBeltStatus(
-						new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjReference)),
-						new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjTest))));
-				} else if (key.equals(OnVehicleData.KEY_BODY_INFORMATION)) {
-					JSONObject bodyInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject bodyInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateBodyInformation(
-						new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjReference)),
-						new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjTest))));
-				} else if (key.equals(OnVehicleData.KEY_DEVICE_STATUS)) {
-					JSONObject deviceObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject deviceObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateDeviceStatus(
-						new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjReference)),
-						new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjTest))));
-				} else if (key.equals(OnVehicleData.KEY_HEAD_LAMP_STATUS)) {
-					JSONObject headLampObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject headLampObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus(
-						new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjReference)),
-						new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjTest))));
-				} else if (key.equals(OnVehicleData.KEY_E_CALL_INFO)) {
-					JSONObject callInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject callInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateECallInfo(
-						new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjReference)),
-						new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjTest))));
-				} else if (key.equals(OnVehicleData.KEY_AIRBAG_STATUS)) {
-					JSONObject airbagObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject airbagObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateAirbagStatus(
-						new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjReference)),
-						new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjTest))));
-				}
-				else if (key.equals(OnVehicleData.KEY_EMERGENCY_EVENT)) {
-					JSONObject emergencyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject emergencyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent(
-						new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjReference)),
-						new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjTest))));
-				}
-				else if (key.equals(OnVehicleData.KEY_CLUSTER_MODE_STATUS)) {
-					JSONObject clusterModeObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject clusterModeObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus(
-						new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjReference)),
-						new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjTest))));
-				}
-				else if (key.equals(OnVehicleData.KEY_MY_KEY)) {
-					JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue(TestValues.TRUE, Validator.validateMyKey(
-						new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
-						new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
-				}
-				else if (key.equals(OnVehicleData.KEY_GEAR_STATUS)) {
-					JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-
-					assertTrue(TestValues.TRUE, Validator.validateGearStatuses(
-							new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
-							new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
-				}
-				else if (key.equals(OnVehicleData.KEY_ENGINE_OIL_LIFE)) {
-					assertEquals(JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key));
-				}
-				else if (key.equals(OnVehicleData.KEY_HANDS_OFF_STEERING)) {
-					assertEquals(JsonUtils.readBooleanFromJsonObject(reference, key), JsonUtils.readBooleanFromJsonObject(underTest, key));
-				}
-				else if (key.equals(OnVehicleData.KEY_FUEL_RANGE)) {
-					JSONArray fuelRangeArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-					List<FuelRange> fuelRangeRefereceList = new ArrayList<FuelRange>();
-					for (int index = 0; index < fuelRangeArrayObjReference.length(); index++) {
-						FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)fuelRangeArrayObjReference.get(index) ));
-						fuelRangeRefereceList.add(fuelRange);
-					}
-
-					JSONArray fuelRangeArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					List<FuelRange> fuelRangeUnderTestList = new ArrayList<FuelRange>();
-					for (int index = 0; index < fuelRangeArrayObjTest.length(); index++) {
-						FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)fuelRangeArrayObjTest.get(index) ));
-						fuelRangeUnderTestList.add(fuelRange);
-					}
-
-					assertTrue(TestValues.TRUE, Validator.validateFuelRange(
-									fuelRangeRefereceList,
-									fuelRangeUnderTestList));
-				} else if (key.equals(OnVehicleData.KEY_WINDOW_STATUS)) {
-					JSONArray windowStatusArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-					List<WindowStatus> windowStatusReferenceList = new ArrayList<>();
-					for (int index = 0; index < windowStatusArrayObjReference.length(); index++) {
-						WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)windowStatusArrayObjReference.get(index) ));
-						windowStatusReferenceList.add(windowStatus);
-					}
-
-					JSONArray windowStatusArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					List<WindowStatus> windowStatusUnderTestList = new ArrayList<>();
-					for (int index = 0; index < windowStatusArrayObjTest.length(); index++) {
-						WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)windowStatusArrayObjTest.get(index) ));
-						windowStatusUnderTestList.add(windowStatus);
-					}
-
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateWindowStatuses(
-									windowStatusReferenceList,
-									windowStatusUnderTestList));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS)) {
-					JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-
-					StabilityControlsStatus status1 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference));
-					StabilityControlsStatus status2 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest));
-
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateStabilityControlStatus(
-									status1,
-									status2
-							)
-					);
-				}
-				else {
-					assertEquals(TestValues.TRUE, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
-	            }				
-			}			
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
+        JSONObject reference = new JSONObject();
+
+        //Objects needed on the first level.
+        JSONObject tireStatusObj = new JSONObject();
+        JSONObject GPSDataObj = new JSONObject();
+        JSONObject beltStatusObj = new JSONObject();
+        JSONObject bodyInformationObj = new JSONObject();
+        JSONObject deviceStatusObj = new JSONObject();
+        JSONObject headLampStatusObj = new JSONObject();
+        JSONObject ECallInfoObj = new JSONObject();
+        JSONObject airbagStatusObj = new JSONObject();
+        JSONObject emergencyEventObj = new JSONObject();
+        JSONObject clusterModeStatusObj = new JSONObject();
+        JSONObject myKeyObj = new JSONObject();
+        JSONObject fuelRangeObj = new JSONObject();
+        JSONObject windowStatusObj = new JSONObject();
+        JSONObject gearStatusObj = new JSONObject();
+        JSONObject stabilityControlStatusObj = new JSONObject();
+        JSONArray fuelRangeArrayObj = new JSONArray();
+        JSONArray windowStatusArrayObj = new JSONArray();
+
+        try {
+            //Set up the JSONObject to represent OnVehicleData:
+
+            //TIRE_PRESSURE
+            tireStatusObj.put(TireStatus.KEY_PRESSURE_TELL_TALE, VehicleDataHelper.TIRE_PRESSURE_TELL_TALE);
+            JSONObject tireLeftFront = new JSONObject();
+            tireLeftFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_FRONT);
+            tireStatusObj.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront);
+            JSONObject tireRightFront = new JSONObject();
+            tireRightFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_FRONT);
+            tireStatusObj.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront);
+            JSONObject tireLeftRear = new JSONObject();
+            tireLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_REAR);
+            tireStatusObj.put(TireStatus.KEY_LEFT_REAR, tireLeftRear);
+            JSONObject tireRightRear = new JSONObject();
+            tireRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_REAR);
+            tireStatusObj.put(TireStatus.KEY_RIGHT_REAR, tireRightRear);
+            JSONObject tireInnerLeftRear = new JSONObject();
+            tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_LEFT_REAR);
+            tireStatusObj.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear);
+            JSONObject tireInnerRightRear = new JSONObject();
+            tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_RIGHT_REAR);
+            tireStatusObj.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear);
+
+            //GPS
+            GPSDataObj.put(GPSData.KEY_LONGITUDE_DEGREES, VehicleDataHelper.GPS_LONGITUDE);
+            GPSDataObj.put(GPSData.KEY_LATITUDE_DEGREES, VehicleDataHelper.GPS_LATITUDE);
+            GPSDataObj.put(GPSData.KEY_UTC_YEAR, VehicleDataHelper.GPS_YEAR);
+            GPSDataObj.put(GPSData.KEY_UTC_MONTH, VehicleDataHelper.GPS_MONTH);
+            GPSDataObj.put(GPSData.KEY_UTC_DAY, VehicleDataHelper.GPS_DAY);
+            GPSDataObj.put(GPSData.KEY_UTC_HOURS, VehicleDataHelper.GPS_HOURS);
+            GPSDataObj.put(GPSData.KEY_UTC_MINUTES, VehicleDataHelper.GPS_MINUTES);
+            GPSDataObj.put(GPSData.KEY_UTC_SECONDS, VehicleDataHelper.GPS_SECONDS);
+            GPSDataObj.put(GPSData.KEY_COMPASS_DIRECTION, VehicleDataHelper.GPS_DIRECTION);
+            GPSDataObj.put(GPSData.KEY_PDOP, VehicleDataHelper.GPS_PDOP);
+            GPSDataObj.put(GPSData.KEY_VDOP, VehicleDataHelper.GPS_VDOP);
+            GPSDataObj.put(GPSData.KEY_HDOP, VehicleDataHelper.GPS_HDOP);
+            GPSDataObj.put(GPSData.KEY_ACTUAL, VehicleDataHelper.GPS_ACTUAL);
+            GPSDataObj.put(GPSData.KEY_SATELLITES, VehicleDataHelper.GPS_SATELLITES);
+            GPSDataObj.put(GPSData.KEY_DIMENSION, VehicleDataHelper.GPS_DIMENSION);
+            GPSDataObj.put(GPSData.KEY_ALTITUDE, VehicleDataHelper.GPS_ALTITUDE);
+            GPSDataObj.put(GPSData.KEY_HEADING, VehicleDataHelper.GPS_HEADING);
+            GPSDataObj.put(GPSData.KEY_SPEED, VehicleDataHelper.GPS_SPEED);
+            GPSDataObj.put(GPSData.KEY_SHIFTED, VehicleDataHelper.GPS_SHIFTED);
+
+            //BELT_STATUS
+            beltStatusObj.put(BeltStatus.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED);
+            beltStatusObj.put(BeltStatus.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED);
+            beltStatusObj.put(BeltStatus.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD);
+            beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_LEFT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED);
+            beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED);
+
+            //BODY_INFORMATION
+            bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE);
+            bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS);
+            bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS);
+            bodyInformationObj.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR);
+            bodyInformationObj.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR);
+            bodyInformationObj.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR);
+            bodyInformationObj.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR);
+
+            //DEVICE_STATUS
+            deviceStatusObj.put(DeviceStatus.KEY_VOICE_REC_ON, VehicleDataHelper.DEVICE_STATUS_VOICE_REC);
+            deviceStatusObj.put(DeviceStatus.KEY_BT_ICON_ON, VehicleDataHelper.DEVICE_STATUS_BT_ICON);
+            deviceStatusObj.put(DeviceStatus.KEY_CALL_ACTIVE, VehicleDataHelper.DEVICE_STATUS_CALL_ACTIVE);
+            deviceStatusObj.put(DeviceStatus.KEY_PHONE_ROAMING, VehicleDataHelper.DEVICE_STATUS_PHONE_ROAMING);
+            deviceStatusObj.put(DeviceStatus.KEY_TEXT_MSG_AVAILABLE, VehicleDataHelper.DEVICE_STATUS_TEXT_MSG_AVAILABLE);
+            deviceStatusObj.put(DeviceStatus.KEY_BATT_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_BATT_LEVEL_STATUS);
+            deviceStatusObj.put(DeviceStatus.KEY_STEREO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_STEREO_MUTED);
+            deviceStatusObj.put(DeviceStatus.KEY_MONO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_MONO_MUTED);
+            deviceStatusObj.put(DeviceStatus.KEY_SIGNAL_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_SIGNAL_LEVEL_STATUS);
+            deviceStatusObj.put(DeviceStatus.KEY_PRIMARY_AUDIO_SOURCE, VehicleDataHelper.DEVICE_STATUS_PRIMARY_AUDIO);
+            deviceStatusObj.put(DeviceStatus.KEY_E_CALL_EVENT_ACTIVE, VehicleDataHelper.DEVICE_STATUS_E_CALL_ACTIVE);
+
+            //HEAD_LAMP_STATUS
+            headLampStatusObj.put(HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS, VehicleDataHelper.HEAD_LAMP_STATUS_AMBIENT_STATUS);
+            headLampStatusObj.put(HeadLampStatus.KEY_HIGH_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_HIGH_BEAMS);
+            headLampStatusObj.put(HeadLampStatus.KEY_LOW_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_LOW_BEAMS);
+
+            //E_CALL_INFO
+            ECallInfoObj.put(ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_E_CALL_NOTIFICATION_STATUS);
+            ECallInfoObj.put(ECallInfo.KEY_AUX_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS);
+            ECallInfoObj.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, VehicleDataHelper.E_CALL_INFO_CONFIRMATION_STATUS);
+
+            //AIRBAG_STATUS
+            airbagStatusObj.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED);
+
+            //EMERGENCY_EVENT
+            emergencyEventObj.put(EmergencyEvent.KEY_EMERGENCY_EVENT_TYPE, VehicleDataHelper.EMERGENCY_EVENT_TYPE);
+            emergencyEventObj.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, VehicleDataHelper.EMERGENCY_EVENT_FUEL_CUTOFF_STATUS);
+            emergencyEventObj.put(EmergencyEvent.KEY_ROLLOVER_EVENT, VehicleDataHelper.EMERGENCY_EVENT_ROLLOVER_EVENT);
+            emergencyEventObj.put(EmergencyEvent.KEY_MAXIMUM_CHANGE_VELOCITY, VehicleDataHelper.EMERGENCY_EVENT_MAX_CHANGE_VELOCITY);
+            emergencyEventObj.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS);
+
+            //CLUSTER_MODE_STATUS
+            clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE);
+            clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS);
+            clusterModeStatusObj.put(ClusterModeStatus.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS);
+            clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS);
+
+            //MY_KEY
+            myKeyObj.put(MyKey.KEY_E_911_OVERRIDE, VehicleDataHelper.MY_KEY_E_911_OVERRIDE);
+
+            // FUEL_RANGE
+            fuelRangeObj.put(FuelRange.KEY_TYPE, VehicleDataHelper.FUEL_RANGE_TYPE);
+            fuelRangeObj.put(FuelRange.KEY_RANGE, VehicleDataHelper.FUEL_RANGE_RANGE);
+            fuelRangeObj.put(FuelRange.KEY_CAPACITY, VehicleDataHelper.FUEL_RANGE_CAPACITY);
+            fuelRangeObj.put(FuelRange.KEY_CAPACITY_UNIT, VehicleDataHelper.FUEL_RANGE_CAPACITY_UNIT);
+            fuelRangeObj.put(FuelRange.KEY_LEVEL, VehicleDataHelper.FUEL_RANGE_LEVEL);
+            fuelRangeObj.put(FuelRange.KEY_LEVEL_STATE, VehicleDataHelper.FUEL_RANGE_LEVEL_STATE);
+            fuelRangeArrayObj.put(fuelRangeObj);
+
+            // STABILITY_CONTROLS_STATU
+            stabilityControlStatusObj.put(StabilityControlsStatus.KEY_ESC_SYSTEM, VehicleDataHelper.ESC_SYSTEM);
+            stabilityControlStatusObj.put(StabilityControlsStatus.KEY_TRAILER_SWAY_CONTROL, VehicleDataHelper.S_WAY_TRAILER);
+
+            // WINDOW_STATUS
+            windowStatusObj.put(WindowStatus.KEY_LOCATION, VehicleDataHelper.LOCATION_GRID);
+            windowStatusObj.put(WindowStatus.KEY_STATE, VehicleDataHelper.WINDOW_STATE);
+            windowStatusArrayObj.put(windowStatusObj);
+
+            // GEAR STATUS
+            gearStatusObj.put(GearStatus.KEY_USER_SELECTED_GEAR, VehicleDataHelper.USER_SELECTED_GEAR);
+            gearStatusObj.put(GearStatus.KEY_TRANSMISSION_TYPE, VehicleDataHelper.TRANSMISSION_TYPE);
+            gearStatusObj.put(GearStatus.KEY_ACTUAL_GEAR, VehicleDataHelper.ACTUAL_GEAR);
+
+            reference.put(OnVehicleData.KEY_SPEED, VehicleDataHelper.SPEED);
+            reference.put(OnVehicleData.KEY_RPM, VehicleDataHelper.RPM);
+            reference.put(OnVehicleData.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE);
+            reference.put(OnVehicleData.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL);
+            reference.put(OnVehicleData.KEY_VIN, VehicleDataHelper.VIN);
+            reference.put(OnVehicleData.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL);
+            reference.put(OnVehicleData.KEY_TIRE_PRESSURE, tireStatusObj);
+            reference.put(OnVehicleData.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE);
+            reference.put(OnVehicleData.KEY_ENGINE_OIL_LIFE, VehicleDataHelper.ENGINE_OIL_LIFE);
+            reference.put(OnVehicleData.KEY_ODOMETER, VehicleDataHelper.ODOMETER);
+            reference.put(OnVehicleData.KEY_GPS, GPSDataObj);
+            reference.put(OnVehicleData.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE);
+            reference.put(OnVehicleData.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION);
+            reference.put(OnVehicleData.KEY_BELT_STATUS, beltStatusObj);
+            reference.put(OnVehicleData.KEY_BODY_INFORMATION, bodyInformationObj);
+            reference.put(OnVehicleData.KEY_DEVICE_STATUS, deviceStatusObj);
+            reference.put(OnVehicleData.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING);
+            reference.put(OnVehicleData.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS);
+            reference.put(OnVehicleData.KEY_HEAD_LAMP_STATUS, headLampStatusObj);
+            reference.put(OnVehicleData.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION);
+            reference.put(OnVehicleData.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE);
+            reference.put(OnVehicleData.KEY_E_CALL_INFO, ECallInfoObj);
+            reference.put(OnVehicleData.KEY_AIRBAG_STATUS, airbagStatusObj);
+            reference.put(OnVehicleData.KEY_EMERGENCY_EVENT, emergencyEventObj);
+            reference.put(OnVehicleData.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj);
+            reference.put(OnVehicleData.KEY_MY_KEY, myKeyObj);
+            reference.put(OnVehicleData.KEY_FUEL_RANGE, fuelRangeArrayObj);
+            reference.put(OnVehicleData.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL);
+            reference.put(OnVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
+            reference.put(OnVehicleData.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING);
+            reference.put(OnVehicleData.KEY_WINDOW_STATUS, windowStatusArrayObj);
+            reference.put(OnVehicleData.KEY_GEAR_STATUS, gearStatusObj);
+            reference.put(OnVehicleData.KEY_STABILITY_CONTROLS_STATUS, stabilityControlStatusObj);
+            reference.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
+
+            JSONObject underTest = msg.serializeJSON();
+            //go inside underTest and only return the JSONObject inside the parameters key inside the notification key
+            underTest = underTest.getJSONObject("notification").getJSONObject("parameters");
+
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(OnVehicleData.KEY_TIRE_PRESSURE)) {
+                    JSONObject tirePressureReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject tirePressureTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateTireStatus(
+                            new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureReference)),
+                            new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureTest))));
+
+                } else if (key.equals(OnVehicleData.KEY_GPS)) {
+                    JSONObject GPSObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject GPSObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateGpsData(
+                            new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjReference)),
+                            new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_BELT_STATUS)) {
+                    JSONObject beltObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject beltObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateBeltStatus(
+                            new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjReference)),
+                            new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_BODY_INFORMATION)) {
+                    JSONObject bodyInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject bodyInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateBodyInformation(
+                            new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjReference)),
+                            new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_DEVICE_STATUS)) {
+                    JSONObject deviceObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject deviceObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateDeviceStatus(
+                            new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjReference)),
+                            new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_HEAD_LAMP_STATUS)) {
+                    JSONObject headLampObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject headLampObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus(
+                            new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjReference)),
+                            new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_E_CALL_INFO)) {
+                    JSONObject callInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject callInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateECallInfo(
+                            new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjReference)),
+                            new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_AIRBAG_STATUS)) {
+                    JSONObject airbagObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject airbagObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateAirbagStatus(
+                            new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjReference)),
+                            new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_EMERGENCY_EVENT)) {
+                    JSONObject emergencyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject emergencyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent(
+                            new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjReference)),
+                            new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_CLUSTER_MODE_STATUS)) {
+                    JSONObject clusterModeObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject clusterModeObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus(
+                            new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjReference)),
+                            new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_MY_KEY)) {
+                    JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateMyKey(
+                            new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
+                            new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_GEAR_STATUS)) {
+                    JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateGearStatuses(
+                            new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
+                            new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
+                } else if (key.equals(OnVehicleData.KEY_ENGINE_OIL_LIFE)) {
+                    assertEquals(JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key));
+                } else if (key.equals(OnVehicleData.KEY_HANDS_OFF_STEERING)) {
+                    assertEquals(JsonUtils.readBooleanFromJsonObject(reference, key), JsonUtils.readBooleanFromJsonObject(underTest, key));
+                } else if (key.equals(OnVehicleData.KEY_FUEL_RANGE)) {
+                    JSONArray fuelRangeArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                    List<FuelRange> fuelRangeRefereceList = new ArrayList<FuelRange>();
+                    for (int index = 0; index < fuelRangeArrayObjReference.length(); index++) {
+                        FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject((JSONObject) fuelRangeArrayObjReference.get(index)));
+                        fuelRangeRefereceList.add(fuelRange);
+                    }
+
+                    JSONArray fuelRangeArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    List<FuelRange> fuelRangeUnderTestList = new ArrayList<FuelRange>();
+                    for (int index = 0; index < fuelRangeArrayObjTest.length(); index++) {
+                        FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject((JSONObject) fuelRangeArrayObjTest.get(index)));
+                        fuelRangeUnderTestList.add(fuelRange);
+                    }
+
+                    assertTrue(TestValues.TRUE, Validator.validateFuelRange(
+                            fuelRangeRefereceList,
+                            fuelRangeUnderTestList));
+                } else if (key.equals(OnVehicleData.KEY_WINDOW_STATUS)) {
+                    JSONArray windowStatusArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                    List<WindowStatus> windowStatusReferenceList = new ArrayList<>();
+                    for (int index = 0; index < windowStatusArrayObjReference.length(); index++) {
+                        WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject((JSONObject) windowStatusArrayObjReference.get(index)));
+                        windowStatusReferenceList.add(windowStatus);
+                    }
+
+                    JSONArray windowStatusArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    List<WindowStatus> windowStatusUnderTestList = new ArrayList<>();
+                    for (int index = 0; index < windowStatusArrayObjTest.length(); index++) {
+                        WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject((JSONObject) windowStatusArrayObjTest.get(index)));
+                        windowStatusUnderTestList.add(windowStatus);
+                    }
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateWindowStatuses(
+                                    windowStatusReferenceList,
+                                    windowStatusUnderTestList));
+                } else if (key.equals(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS)) {
+                    JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    StabilityControlsStatus status1 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference));
+                    StabilityControlsStatus status2 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest));
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateStabilityControlStatus(
+                                    status1,
+                                    status2
+                            )
+                    );
+                } else {
+                    assertEquals(TestValues.TRUE, JsonUtils.readObjectFromJsonObject(reference, key), JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java
index efdd3eba0..0a263ac56 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnWayPointChangeTests.java
@@ -27,7 +27,7 @@ import static junit.framework.TestCase.assertNull;
 
 public class OnWayPointChangeTests extends BaseRpcTests {
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         OnWayPointChange msg = new OnWayPointChange();
 
         List<LocationDetails> list = new ArrayList<>();
@@ -40,17 +40,17 @@ public class OnWayPointChangeTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_NOTIFICATION;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ON_WAY_POINT_CHANGE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
         JSONArray jsonArray = new JSONArray();
@@ -74,7 +74,7 @@ public class OnWayPointChangeTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
         List<LocationDetails> list = ((OnWayPointChange) msg).getWayPoints();
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
index a1c1de3fc..ebcb09943 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
@@ -27,13 +27,13 @@ import static junit.framework.TestCase.fail;
 import static org.junit.Assert.assertNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.AddCommand}
  */
-public class AddCommandTests extends BaseRpcTests{
+public class AddCommandTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         AddCommand msg = new AddCommand();
 
         msg.setCmdIcon(TestValues.GENERAL_IMAGE);
@@ -45,103 +45,103 @@ public class AddCommandTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ADD_COMMAND.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(AddCommand.KEY_CMD_ICON, TestValues.JSON_IMAGE);
             result.put(AddCommand.KEY_MENU_PARAMS, TestValues.JSON_MENUPARAMS);
             result.put(AddCommand.KEY_VR_COMMANDS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
             result.put(AddCommand.KEY_CMD_ID, TestValues.GENERAL_INT);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
-    
+
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-    	int          testCmdId      = ( (AddCommand) msg ).getCmdID();
-    	Image        testImage      = ( (AddCommand) msg ).getCmdIcon();
-    	MenuParams   testMenuParams = ( (AddCommand) msg ).getMenuParams();
-    	List<String> testVrCommands = ( (AddCommand) msg ).getVrCommands();
-    	
-    	// Valid Tests
-    	assertNotNull(TestValues.NOT_NULL, testMenuParams);
-    	assertNotNull(TestValues.NOT_NULL, testImage);
-    	assertNotNull(TestValues.NOT_NULL, testVrCommands);
-    	
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testCmdId);
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), testVrCommands.size());
-    	
-    	assertTrue(TestValues.TRUE, Validator.validateMenuParams(TestValues.GENERAL_MENUPARAMS, testMenuParams));
-    	assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testImage));
-    	assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testVrCommands));
-    	
-    	// Invalid/Null Tests
-    	AddCommand msg = new AddCommand();
-    	assertNotNull(TestValues.NULL, msg);
-    	testNullBase(msg);
-    	
-    	assertNull(TestValues.NULL, msg.getCmdIcon());
+    public void testRpcValues() {
+        // Test Values
+        int testCmdId = ((AddCommand) msg).getCmdID();
+        Image testImage = ((AddCommand) msg).getCmdIcon();
+        MenuParams testMenuParams = ((AddCommand) msg).getMenuParams();
+        List<String> testVrCommands = ((AddCommand) msg).getVrCommands();
+
+        // Valid Tests
+        assertNotNull(TestValues.NOT_NULL, testMenuParams);
+        assertNotNull(TestValues.NOT_NULL, testImage);
+        assertNotNull(TestValues.NOT_NULL, testVrCommands);
+
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testCmdId);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), testVrCommands.size());
+
+        assertTrue(TestValues.TRUE, Validator.validateMenuParams(TestValues.GENERAL_MENUPARAMS, testMenuParams));
+        assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testImage));
+        assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testVrCommands));
+
+        // Invalid/Null Tests
+        AddCommand msg = new AddCommand();
+        assertNotNull(TestValues.NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getCmdIcon());
         assertNull(TestValues.NULL, msg.getCmdID());
         assertNull(TestValues.NULL, msg.getMenuParams());
         assertNull(TestValues.NULL, msg.getVrCommands());
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			AddCommand cmd = new AddCommand(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			
-			List<String> vrCommandsList = JsonUtils.readStringListFromJsonObject(parameters, AddCommand.KEY_VR_COMMANDS);
-			List<String> testCommandsList = cmd.getVrCommands();
-			assertEquals(TestValues.MATCH, vrCommandsList.size(), testCommandsList.size());
-			assertTrue(TestValues.TRUE, Validator.validateStringList(vrCommandsList, testCommandsList));
-			
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddCommand.KEY_CMD_ID), cmd.getCmdID());
-			
-			JSONObject menuParams = JsonUtils.readJsonObjectFromJsonObject(parameters, AddCommand.KEY_MENU_PARAMS);
-			MenuParams referenceMenuParams = new MenuParams(JsonRPCMarshaller.deserializeJSONObject(menuParams));
-			assertTrue(TestValues.TRUE, Validator.validateMenuParams(referenceMenuParams, cmd.getMenuParams()));
-			
-			JSONObject cmdIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, AddCommand.KEY_CMD_ICON);
-			Image referenceCmdIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(cmdIcon));
-			assertTrue(TestValues.TRUE, Validator.validateImage(referenceCmdIcon, cmd.getCmdIcon()));
-			
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            AddCommand cmd = new AddCommand(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            List<String> vrCommandsList = JsonUtils.readStringListFromJsonObject(parameters, AddCommand.KEY_VR_COMMANDS);
+            List<String> testCommandsList = cmd.getVrCommands();
+            assertEquals(TestValues.MATCH, vrCommandsList.size(), testCommandsList.size());
+            assertTrue(TestValues.TRUE, Validator.validateStringList(vrCommandsList, testCommandsList));
+
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddCommand.KEY_CMD_ID), cmd.getCmdID());
+
+            JSONObject menuParams = JsonUtils.readJsonObjectFromJsonObject(parameters, AddCommand.KEY_MENU_PARAMS);
+            MenuParams referenceMenuParams = new MenuParams(JsonRPCMarshaller.deserializeJSONObject(menuParams));
+            assertTrue(TestValues.TRUE, Validator.validateMenuParams(referenceMenuParams, cmd.getMenuParams()));
+
+            JSONObject cmdIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, AddCommand.KEY_CMD_ICON);
+            Image referenceCmdIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(cmdIcon));
+            assertTrue(TestValues.TRUE, Validator.validateImage(referenceCmdIcon, cmd.getCmdIcon()));
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
index 01ebf5f8c..e135d3217 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
@@ -26,13 +26,13 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.AddSubMenu}
  */
-public class AddSubmenuTests extends BaseRpcTests{
+public class AddSubmenuTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         AddSubMenu msg = new AddSubMenu();
 
         msg.setMenuID(TestValues.GENERAL_INT);
@@ -46,46 +46,46 @@ public class AddSubmenuTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ADD_SUB_MENU.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(AddSubMenu.KEY_MENU_ID, TestValues.GENERAL_INT);
             result.put(AddSubMenu.KEY_MENU_NAME, TestValues.GENERAL_STRING);
             result.put(AddSubMenu.KEY_POSITION, TestValues.GENERAL_INT);
             result.put(AddSubMenu.KEY_MENU_ICON, TestValues.JSON_IMAGE);
             result.put(AddSubMenu.KEY_MENU_LAYOUT, TestValues.GENERAL_MENU_LAYOUT);
             result.put(AddSubMenu.KEY_PARENT_ID, TestValues.GENERAL_MENU_MAX_ID);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {
-    	// Test Values
+    public void testRpcValues() {
+        // Test Values
         int testMenuId = ((AddSubMenu) msg).getMenuID();
         int testPosition = ((AddSubMenu) msg).getPosition();
         String testMenuName = ((AddSubMenu) msg).getMenuName();
         Image testMenuIcon = ((AddSubMenu) msg).getMenuIcon();
         MenuLayout testMenuLayout = ((AddSubMenu) msg).getMenuLayout();
         int testParentID = ((AddSubMenu) msg).getParentID();
-        
+
         // Valid Tests
         assertEquals("Menu ID didn't match input menu ID.", TestValues.GENERAL_INT, testMenuId);
         assertEquals("Menu name didn't match input menu name.", TestValues.GENERAL_STRING, testMenuName);
@@ -107,39 +107,39 @@ public class AddSubmenuTests extends BaseRpcTests{
         assertNull(TestValues.NULL, msg.getMenuLayout());
         assertNull(TestValues.NULL, msg.getParentID());
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			AddSubMenu cmd = new AddSubMenu(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_MENU_ID), cmd.getMenuID());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_POSITION), cmd.getPosition());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, AddSubMenu.KEY_MENU_NAME), cmd.getMenuName());
-			assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, AddSubMenu.KEY_MENU_LAYOUT), cmd.getMenuLayout());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_PARENT_ID), cmd.getParentID());
-
-			JSONObject menuIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, AddSubMenu.KEY_MENU_ICON);
-			Image referenceMenuIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(menuIcon));
-			assertTrue(TestValues.TRUE, Validator.validateImage(referenceMenuIcon, cmd.getMenuIcon()));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            AddSubMenu cmd = new AddSubMenu(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_MENU_ID), cmd.getMenuID());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_POSITION), cmd.getPosition());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, AddSubMenu.KEY_MENU_NAME), cmd.getMenuName());
+            assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, AddSubMenu.KEY_MENU_LAYOUT), cmd.getMenuLayout());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AddSubMenu.KEY_PARENT_ID), cmd.getParentID());
+
+            JSONObject menuIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, AddSubMenu.KEY_MENU_ICON);
+            Image referenceMenuIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(menuIcon));
+            assertTrue(TestValues.TRUE, Validator.validateImage(referenceMenuIcon, cmd.getMenuIcon()));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
index 0a50a3562..c33e4d4eb 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
@@ -29,59 +29,59 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.AlertManeuver}
  */
 public class AlertManeuverTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		AlertManeuver msg = new AlertManeuver();
-				
-		msg.setTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST);
+    @Override
+    protected RPCMessage createMessage() {
+        AlertManeuver msg = new AlertManeuver();
+
+        msg.setTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST);
         msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST);
-        
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.ALERT_MANEUVER.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-        
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.ALERT_MANEUVER.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
         try {
-			result.put(AlertManeuver.KEY_TTS_CHUNKS, TestValues.JSON_TTSCHUNKS);
+            result.put(AlertManeuver.KEY_TTS_CHUNKS, TestValues.JSON_TTSCHUNKS);
             result.put(AlertManeuver.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
-        
+
         return result;
-	}
-	
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {  
-		// Test Values
-		List<TTSChunk> testTtsChunks = ( (AlertManeuver) msg ).getTtsChunks();
-		List<SoftButton> testSoftButtons = ( (AlertManeuver) msg ).getSoftButtons();
-		
-		// Valid Tests
-		assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons));
-		assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTtsChunks));
-		
-		// Invalid/Null Tests
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        List<TTSChunk> testTtsChunks = ((AlertManeuver) msg).getTtsChunks();
+        List<SoftButton> testSoftButtons = ((AlertManeuver) msg).getSoftButtons();
+
+        // Valid Tests
+        assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons));
+        assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTtsChunks));
+
+        // Invalid/Null Tests
         AlertManeuver msg = new AlertManeuver();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -89,45 +89,45 @@ public class AlertManeuverTests extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getTtsChunks());
         assertNull(TestValues.NULL, msg.getSoftButtons());
     }
-	
-	/**
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(),  getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-		
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			AlertManeuver cmd = new AlertManeuver(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-			
-			JSONObject parameters   = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, AlertManeuver.KEY_TTS_CHUNKS);
-			
-			List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>();
-			for (int index = 0; index < ttsChunkArray.length(); index++) {
-	        	TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)));
-	        	ttsChunkList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks()));
-			
-			JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, AlertManeuver.KEY_SOFT_BUTTONS);
-			List<SoftButton> softButtonList = new ArrayList<SoftButton>();
-			for (int index = 0; index < softButtonArray.length(); index++) {
-				SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject)softButtonArray.get(index)));
-				softButtonList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            AlertManeuver cmd = new AlertManeuver(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, AlertManeuver.KEY_TTS_CHUNKS);
+
+            List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>();
+            for (int index = 0; index < ttsChunkArray.length(); index++) {
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsChunkArray.get(index)));
+                ttsChunkList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks()));
+
+            JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, AlertManeuver.KEY_SOFT_BUTTONS);
+            List<SoftButton> softButtonList = new ArrayList<SoftButton>();
+            for (int index = 0; index < softButtonArray.length(); index++) {
+                SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index)));
+                softButtonList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
index 525fae442..bde00db0c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
@@ -30,13 +30,13 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.Alert}
  */
-public class AlertTests extends BaseRpcTests{
+public class AlertTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         Alert msg = new Alert();
 
         msg.setDuration(TestValues.GENERAL_INT);
@@ -49,25 +49,25 @@ public class AlertTests extends BaseRpcTests{
         msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST);
         msg.setCancelID(TestValues.GENERAL_INTEGER);
         msg.setAlertIcon(TestValues.GENERAL_IMAGE);
-        
+
         return msg;
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ALERT.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
-        
-        try{        	
+
+        try {
             result.put(Alert.KEY_DURATION, TestValues.GENERAL_INT);
             result.put(Alert.KEY_ALERT_TEXT_1, TestValues.GENERAL_STRING);
             result.put(Alert.KEY_ALERT_TEXT_2, TestValues.GENERAL_STRING);
@@ -78,43 +78,43 @@ public class AlertTests extends BaseRpcTests{
             result.put(Alert.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
             result.put(Alert.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER);
             result.put(Alert.KEY_ALERT_ICON, TestValues.JSON_IMAGE);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-		// Test Values
-        int testDuration      = ( (Alert) msg ).getDuration();        
-        String testAlertText1 = ( (Alert) msg ).getAlertText1();        
-        String testAlertText2 = ( (Alert) msg ).getAlertText2();        
-        String testAlertText3 = ( (Alert) msg ).getAlertText3();
-        boolean testPlayTone  = ( (Alert) msg ).getPlayTone();
-    	boolean testProgressIndicator    = ( (Alert) msg ).getProgressIndicator();
-		List<TTSChunk> testTtsChunks     = ( (Alert) msg ).getTtsChunks();
-		List<SoftButton> testSoftButtons = ( (Alert) msg ).getSoftButtons();
-		Integer testCancelID = ( (Alert) msg ).getCancelID();
-		Image alertIcon = ( (Alert) msg ).getAlertIcon();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testDuration);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText1);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText2);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText3);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testPlayTone);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testProgressIndicator);
-		assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons));
-		assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTtsChunks));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID);
-		assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, alertIcon));
-	    	
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Test Values
+        int testDuration = ((Alert) msg).getDuration();
+        String testAlertText1 = ((Alert) msg).getAlertText1();
+        String testAlertText2 = ((Alert) msg).getAlertText2();
+        String testAlertText3 = ((Alert) msg).getAlertText3();
+        boolean testPlayTone = ((Alert) msg).getPlayTone();
+        boolean testProgressIndicator = ((Alert) msg).getProgressIndicator();
+        List<TTSChunk> testTtsChunks = ((Alert) msg).getTtsChunks();
+        List<SoftButton> testSoftButtons = ((Alert) msg).getSoftButtons();
+        Integer testCancelID = ((Alert) msg).getCancelID();
+        Image alertIcon = ((Alert) msg).getAlertIcon();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testDuration);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText1);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText2);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testAlertText3);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testPlayTone);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testProgressIndicator);
+        assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons));
+        assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTtsChunks));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID);
+        assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, alertIcon));
+
+        // Invalid/Null Tests
         Alert msg = new Alert();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -130,55 +130,55 @@ public class AlertTests extends BaseRpcTests{
         assertNull(TestValues.NULL, msg.getCancelID());
         assertNull(TestValues.NULL, msg.getAlertIcon());
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			Alert cmd = new Alert(hash);
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Alert.KEY_PLAY_TONE), cmd.getPlayTone());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Alert.KEY_DURATION), cmd.getDuration());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_1), cmd.getAlertText1());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_2), cmd.getAlertText2());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_3), cmd.getAlertText3());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Alert.KEY_PROGRESS_INDICATOR), cmd.getProgressIndicator());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Alert.KEY_CANCEL_ID), cmd.getCancelID());
-			
-			JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Alert.KEY_TTS_CHUNKS);
-			List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>();
-			for (int index = 0; index < ttsChunkArray.length(); index++) {
-	        	TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)) );
-	        	ttsChunkList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks()));
-			
-			JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Alert.KEY_SOFT_BUTTONS);
-			List<SoftButton> softButtonList = new ArrayList<SoftButton>();
-			for (int index = 0; index < softButtonArray.length(); index++) {
-				SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) );
-				softButtonList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
-
-			JSONObject alertIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, Alert.KEY_ALERT_ICON);
-			Image referenceAlertIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(alertIcon));
-			assertTrue(TestValues.TRUE, Validator.validateImage(referenceAlertIcon, cmd.getAlertIcon()));
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            Alert cmd = new Alert(hash);
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Alert.KEY_PLAY_TONE), cmd.getPlayTone());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Alert.KEY_DURATION), cmd.getDuration());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_1), cmd.getAlertText1());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_2), cmd.getAlertText2());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Alert.KEY_ALERT_TEXT_3), cmd.getAlertText3());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, Alert.KEY_PROGRESS_INDICATOR), cmd.getProgressIndicator());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Alert.KEY_CANCEL_ID), cmd.getCancelID());
+
+            JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Alert.KEY_TTS_CHUNKS);
+            List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>();
+            for (int index = 0; index < ttsChunkArray.length(); index++) {
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsChunkArray.get(index)));
+                ttsChunkList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks()));
+
+            JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Alert.KEY_SOFT_BUTTONS);
+            List<SoftButton> softButtonList = new ArrayList<SoftButton>();
+            for (int index = 0; index < softButtonArray.length(); index++) {
+                SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index)));
+                softButtonList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
+
+            JSONObject alertIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, Alert.KEY_ALERT_ICON);
+            Image referenceAlertIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(alertIcon));
+            assertTrue(TestValues.TRUE, Validator.validateImage(referenceAlertIcon, cmd.getAlertIcon()));
         } catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java
index 6ac0a3663..f235e32e2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ButtonPressTests.java
@@ -31,7 +31,7 @@ import static junit.framework.TestCase.fail;
 public class ButtonPressTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         ButtonPress msg = new ButtonPress();
 
         msg.setModuleType(TestValues.GENERAL_MODULETYPE);
@@ -43,25 +43,25 @@ public class ButtonPressTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.BUTTON_PRESS.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(ButtonPress.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE);
             result.put(ButtonPress.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME);
             result.put(ButtonPress.KEY_BUTTON_PRESS_MODE, TestValues.GENERAL_BUTTONPRESSMODE);
             result.put(ButtonPress.KEY_MODULE_ID, TestValues.GENERAL_STRING);
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -72,11 +72,11 @@ public class ButtonPressTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        ModuleType testModuleType = ( (ButtonPress) msg ).getModuleType();
-        ButtonName testButtonName = ( (ButtonPress) msg ).getButtonName();
-        ButtonPressMode testButtonPressMode = ( (ButtonPress) msg ).getButtonPressMode();
+        ModuleType testModuleType = ((ButtonPress) msg).getModuleType();
+        ButtonName testButtonName = ((ButtonPress) msg).getButtonName();
+        ButtonPressMode testButtonPressMode = ((ButtonPress) msg).getButtonPressMode();
         String testButtonId = ((ButtonPress) msg).getModuleId();
 
         // Valid Tests
@@ -100,7 +100,7 @@ public class ButtonPressTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
@@ -121,7 +121,7 @@ public class ButtonPressTests extends BaseRpcTests {
             assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, ButtonPress.KEY_BUTTON_NAME).toString(), cmd.getButtonName().toString());
             assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, ButtonPress.KEY_BUTTON_PRESS_MODE).toString(), cmd.getButtonPressMode().toString());
             assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, ButtonPress.KEY_MODULE_ID), cmd.getModuleId());
-        }catch (JSONException e) {
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java
index 26ddbf7b5..cf5d3bda6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CancelInteractionTests.java
@@ -70,12 +70,12 @@ public class CancelInteractionTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.CANCEL_INTERACTION.toString();
     }
 
@@ -97,10 +97,10 @@ public class CancelInteractionTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        Integer testFunctionID  = ((CancelInteraction) msg).getInteractionFunctionID();
-        Integer testCancelID    = ((CancelInteraction) msg).getCancelID();
+        Integer testFunctionID = ((CancelInteraction) msg).getInteractionFunctionID();
+        Integer testCancelID = ((CancelInteraction) msg).getCancelID();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testFunctionID);
@@ -119,7 +119,7 @@ public class CancelInteractionTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
@@ -136,8 +136,7 @@ public class CancelInteractionTests extends BaseRpcTests {
 
             assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, CancelInteraction.KEY_FUNCTION_ID), cmd.getInteractionFunctionID());
             assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, CancelInteraction.KEY_CANCEL_ID), cmd.getCancelID());
-        }
-        catch (JSONException e) {
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
index 34375ee39..d3a711f07 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
@@ -23,13 +23,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ChangeRegistration}
  */
-public class ChangeRegistrationTests extends BaseRpcTests{
-    
+public class ChangeRegistrationTests extends BaseRpcTests {
+
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         ChangeRegistration msg = new ChangeRegistration();
 
         msg.setLanguage(TestValues.GENERAL_LANGUAGE);
@@ -39,43 +39,43 @@ public class ChangeRegistrationTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.CHANGE_REGISTRATION.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(ChangeRegistration.KEY_LANGUAGE, TestValues.GENERAL_LANGUAGE);
             result.put(ChangeRegistration.KEY_HMI_DISPLAY_LANGUAGE, TestValues.GENERAL_LANGUAGE);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	// Test Values
-        Language testLanguage    = ( (ChangeRegistration) msg ).getLanguage();
-        Language testHmiLanguage = ( (ChangeRegistration) msg ).getHmiDisplayLanguage();
-        
+    public void testRpcValues() {
+        // Test Values
+        Language testLanguage = ((ChangeRegistration) msg).getLanguage();
+        Language testHmiLanguage = ((ChangeRegistration) msg).getHmiDisplayLanguage();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testLanguage);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testHmiLanguage);
-   
-    	// Invalid/Null Tests
+
+        // Invalid/Null Tests
         ChangeRegistration msg = new ChangeRegistration();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -83,31 +83,31 @@ public class ChangeRegistrationTests extends BaseRpcTests{
         assertNull(TestValues.NULL, msg.getLanguage());
         assertNull(TestValues.NULL, msg.getHmiDisplayLanguage());
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ChangeRegistration cmd = new ChangeRegistration(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ChangeRegistration.KEY_LANGUAGE), cmd.getLanguage().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ChangeRegistration.KEY_HMI_DISPLAY_LANGUAGE), cmd.getHmiDisplayLanguage().toString());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ChangeRegistration cmd = new ChangeRegistration(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ChangeRegistration.KEY_LANGUAGE), cmd.getLanguage().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ChangeRegistration.KEY_HMI_DISPLAY_LANGUAGE), cmd.getHmiDisplayLanguage().toString());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java
index 02cc2d718..35c1d363e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CloseApplicationTests.java
@@ -61,22 +61,22 @@ import static junit.framework.TestCase.fail;
 public class CloseApplicationTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new CloseApplication();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.CLOSE_APPLICATION.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
@@ -84,7 +84,7 @@ public class CloseApplicationTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Invalid/Null Tests
         CloseApplication msg = new CloseApplication();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -95,7 +95,7 @@ public class CloseApplicationTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
@@ -109,8 +109,7 @@ public class CloseApplicationTests extends BaseRpcTests {
             // Test everything in the json body.
             assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
             assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-        }
-        catch (JSONException e) {
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
index f5ae2fbd3..d0b470e71 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
@@ -27,13 +27,13 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSet}
  */
-public class CreateInteractionChoiceSetTests extends BaseRpcTests{
-    
+public class CreateInteractionChoiceSetTests extends BaseRpcTests {
+
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         CreateInteractionChoiceSet msg = new CreateInteractionChoiceSet();
 
         msg.setInteractionChoiceSetID(TestValues.GENERAL_INT);
@@ -43,45 +43,45 @@ public class CreateInteractionChoiceSetTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.CREATE_INTERACTION_CHOICE_SET.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(CreateInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID, TestValues.GENERAL_INT);
             result.put(CreateInteractionChoiceSet.KEY_CHOICE_SET, TestValues.JSON_CHOICES);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {    	
-    	// Test Values
-        int testCmdId = ( (CreateInteractionChoiceSet) msg ).getInteractionChoiceSetID(); 
-        List<Choice> testChoices = ( (CreateInteractionChoiceSet) msg ).getChoiceSet();
-       
+    public void testRpcValues() {
+        // Test Values
+        int testCmdId = ((CreateInteractionChoiceSet) msg).getInteractionChoiceSetID();
+        List<Choice> testChoices = ((CreateInteractionChoiceSet) msg).getChoiceSet();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testCmdId);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_CHOICE_LIST.size(), testChoices.size());
-        for(int i = 0; i < testChoices.size(); i++){
+        for (int i = 0; i < testChoices.size(); i++) {
             assertTrue(TestValues.TRUE, Validator.validateChoice(TestValues.GENERAL_CHOICE_LIST.get(i), testChoices.get(i)));
         }
-   
+
         // Invalid/Null Tests
         CreateInteractionChoiceSet msg = new CreateInteractionChoiceSet();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -95,31 +95,31 @@ public class CreateInteractionChoiceSetTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			CreateInteractionChoiceSet cmd = new CreateInteractionChoiceSet(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, CreateInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID), cmd.getInteractionChoiceSetID());
-			
-			JSONArray choiceSetArray = JsonUtils.readJsonArrayFromJsonObject(parameters, CreateInteractionChoiceSet.KEY_CHOICE_SET);
-			for (int index = 0; index < choiceSetArray.length(); index++) {
-				Choice chunk = new Choice(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)choiceSetArray.get(index)) );
-				assertTrue(TestValues.TRUE,  Validator.validateChoice(chunk, cmd.getChoiceSet().get(index)) );
-			}			
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            CreateInteractionChoiceSet cmd = new CreateInteractionChoiceSet(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, CreateInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID), cmd.getInteractionChoiceSetID());
+
+            JSONArray choiceSetArray = JsonUtils.readJsonArrayFromJsonObject(parameters, CreateInteractionChoiceSet.KEY_CHOICE_SET);
+            for (int index = 0; index < choiceSetArray.length(); index++) {
+                Choice chunk = new Choice(JsonRPCMarshaller.deserializeJSONObject((JSONObject) choiceSetArray.get(index)));
+                assertTrue(TestValues.TRUE, Validator.validateChoice(chunk, cmd.getChoiceSet().get(index)));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
index 72401b9b1..74cfa67ae 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
@@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DeleteCommand}
  */
-public class DeleteCommandTests extends BaseRpcTests{
+public class DeleteCommandTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         DeleteCommand msg = new DeleteCommand();
 
         msg.setCmdID(TestValues.GENERAL_INT);
@@ -37,39 +37,39 @@ public class DeleteCommandTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DELETE_COMMAND.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(DeleteCommand.KEY_CMD_ID, TestValues.GENERAL_INT);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {  
-    	// Test Values
-    	int cmdId = ( (DeleteCommand) msg ).getCmdID();
-    	
-    	// Valid Tests
+    public void testRpcValues() {
+        // Test Values
+        int cmdId = ((DeleteCommand) msg).getCmdID();
+
+        // Valid Tests
         assertEquals("Command ID didn't match input command ID.", TestValues.GENERAL_INT, cmdId);
-        
+
         // Invalid/Null Tests
         DeleteCommand msg = new DeleteCommand();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -77,31 +77,30 @@ public class DeleteCommandTests extends BaseRpcTests{
 
         assertNull(TestValues.MATCH, msg.getCmdID());
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			DeleteCommand cmd = new DeleteCommand(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteCommand.KEY_CMD_ID), cmd.getCmdID());
-		} 
-		catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            DeleteCommand cmd = new DeleteCommand(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteCommand.KEY_CMD_ID), cmd.getCmdID());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
index d4af2d0da..54d806e08 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
@@ -22,85 +22,85 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DeleteFile}
  */
-public class DeleteFileTests extends BaseRpcTests{
-    
+public class DeleteFileTests extends BaseRpcTests {
+
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         DeleteFile msg = new DeleteFile();
 
-         msg.setSdlFileName(TestValues.GENERAL_STRING);
+        msg.setSdlFileName(TestValues.GENERAL_STRING);
 
         return msg;
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DELETE_FILE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
-             result.put(DeleteFile.KEY_SDL_FILE_NAME, TestValues.GENERAL_STRING);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        try {
+            result.put(DeleteFile.KEY_SDL_FILE_NAME, TestValues.GENERAL_STRING);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	 // Test Values
-         String testFilename = ( (DeleteFile) msg ).getSdlFileName();
-         
-         // Valid Tests
-         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testFilename);
-         
-         // Invalid/Null Tests
-         DeleteFile msg = new DeleteFile();
-         assertNotNull(TestValues.NOT_NULL, msg);
-         testNullBase(msg);
-
-         assertNull(TestValues.NULL, msg.getSdlFileName());
+    public void testRpcValues() {
+        // Test Values
+        String testFilename = ((DeleteFile) msg).getSdlFileName();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testFilename);
+
+        // Invalid/Null Tests
+        DeleteFile msg = new DeleteFile();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getSdlFileName());
     }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			DeleteFile cmd = new DeleteFile(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, DeleteFile.KEY_SDL_FILE_NAME), cmd.getSdlFileName());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            DeleteFile cmd = new DeleteFile(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, DeleteFile.KEY_SDL_FILE_NAME), cmd.getSdlFileName());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
index 7aea9c784..7f6aebbfc 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
@@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSet}
  */
-public class DeleteInteractionChoiceSetTests extends BaseRpcTests{
+public class DeleteInteractionChoiceSetTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         DeleteInteractionChoiceSet msg = new DeleteInteractionChoiceSet();
 
         msg.setInteractionChoiceSetID(TestValues.GENERAL_INT);
@@ -37,40 +37,40 @@ public class DeleteInteractionChoiceSetTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DELETE_INTERACTION_CHOICE_SET.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(DeleteInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID, TestValues.GENERAL_INT);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	// Test Values
-        int testChoiceSetId = ( (DeleteInteractionChoiceSet) msg ).getInteractionChoiceSetID();
-        
+    public void testRpcValues() {
+        // Test Values
+        int testChoiceSetId = ((DeleteInteractionChoiceSet) msg).getInteractionChoiceSetID();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testChoiceSetId);
-        	
-    	// Invalid/Null Tests
+
+        // Invalid/Null Tests
         DeleteInteractionChoiceSet msg = new DeleteInteractionChoiceSet();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -82,25 +82,25 @@ public class DeleteInteractionChoiceSetTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			DeleteInteractionChoiceSet cmd = new DeleteInteractionChoiceSet(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID), cmd.getInteractionChoiceSetID());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            DeleteInteractionChoiceSet cmd = new DeleteInteractionChoiceSet(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteInteractionChoiceSet.KEY_INTERACTION_CHOICE_SET_ID), cmd.getInteractionChoiceSetID());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
index 326bb2175..a2d5391f3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
@@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DeleteSubMenu}
  */
-public class DeleteSubMenuTests extends BaseRpcTests{
+public class DeleteSubMenuTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         DeleteSubMenu msg = new DeleteSubMenu();
 
         msg.setMenuID(TestValues.GENERAL_INT);
@@ -37,39 +37,39 @@ public class DeleteSubMenuTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DELETE_SUB_MENU.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(DeleteSubMenu.KEY_MENU_ID, TestValues.GENERAL_INT);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {
-    	// Test Values
-        int testMenuId = ( (DeleteSubMenu) msg ).getMenuID();
-        
+    public void testRpcValues() {
+        // Test Values
+        int testMenuId = ((DeleteSubMenu) msg).getMenuID();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testMenuId);
-        
+
         // Invalid/Null Tests
         DeleteSubMenu msg = new DeleteSubMenu();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -82,25 +82,25 @@ public class DeleteSubMenuTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			DeleteSubMenu cmd = new DeleteSubMenu(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteSubMenu.KEY_MENU_ID), cmd.getMenuID());
-		}  catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            DeleteSubMenu cmd = new DeleteSubMenu(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteSubMenu.KEY_MENU_ID), cmd.getMenuID());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
index 755a3dfb0..a075b887d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
@@ -25,13 +25,13 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DiagnosticMessage}
  */
-public class DiagnosticMessageTests extends BaseRpcTests{
+public class DiagnosticMessageTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         DiagnosticMessage msg = new DiagnosticMessage();
 
         msg.setMessageLength(TestValues.GENERAL_INT);
@@ -42,49 +42,49 @@ public class DiagnosticMessageTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DIAGNOSTIC_MESSAGE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(DiagnosticMessage.KEY_TARGET_ID, TestValues.GENERAL_INT);
             result.put(DiagnosticMessage.KEY_MESSAGE_LENGTH, TestValues.GENERAL_INT);
             result.put(DiagnosticMessage.KEY_MESSAGE_DATA, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST));
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {  
-    	// Test Values
-        int testTargetId = ( (DiagnosticMessage) msg ).getTargetID();
-        int testMessageLength = ( (DiagnosticMessage) msg ).getMessageLength();
-        List<Integer> testMessageData = ( (DiagnosticMessage) msg ).getMessageData();
+    public void testRpcValues() {
+        // Test Values
+        int testTargetId = ((DiagnosticMessage) msg).getTargetID();
+        int testMessageLength = ((DiagnosticMessage) msg).getMessageLength();
+        List<Integer> testMessageData = ((DiagnosticMessage) msg).getMessageData();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testTargetId);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testMessageLength);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST.size(), testMessageData.size());
 
-        for(int i = 0; i < testMessageData.size(); i++){
+        for (int i = 0; i < testMessageData.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST.get(i), testMessageData.get(i));
         }
-    
+
         // Invalid/Null Tests
         DiagnosticMessage msg = new DiagnosticMessage();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -99,31 +99,31 @@ public class DiagnosticMessageTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			DiagnosticMessage cmd = new DiagnosticMessage(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DiagnosticMessage.KEY_TARGET_ID), cmd.getTargetID());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DiagnosticMessage.KEY_MESSAGE_LENGTH), cmd.getMessageLength());
-			
-			List<Integer> messageDataList = JsonUtils.readIntegerListFromJsonObject(parameters, DiagnosticMessage.KEY_MESSAGE_DATA);
-			List<Integer> testDataList = cmd.getMessageData();
-			assertEquals(TestValues.MATCH, messageDataList.size(), testDataList.size());
-			assertTrue(TestValues.TRUE, Validator.validateIntegerList(messageDataList, testDataList));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            DiagnosticMessage cmd = new DiagnosticMessage(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DiagnosticMessage.KEY_TARGET_ID), cmd.getTargetID());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DiagnosticMessage.KEY_MESSAGE_LENGTH), cmd.getMessageLength());
+
+            List<Integer> messageDataList = JsonUtils.readIntegerListFromJsonObject(parameters, DiagnosticMessage.KEY_MESSAGE_DATA);
+            List<Integer> testDataList = cmd.getMessageData();
+            assertEquals(TestValues.MATCH, messageDataList.size(), testDataList.size());
+            assertTrue(TestValues.TRUE, Validator.validateIntegerList(messageDataList, testDataList));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java
index 7e6cd3991..b22dd002d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DialNumberTests.java
@@ -30,7 +30,7 @@ public class DialNumberTests extends BaseRpcTests {
     private final String TEST_NUMBER = "5558675309";
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         DialNumber msg = new DialNumber();
 
         msg.setNumber(TEST_NUMBER);
@@ -39,22 +39,22 @@ public class DialNumberTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DIAL_NUMBER.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(DialNumber.KEY_NUMBER, TEST_NUMBER);
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -65,7 +65,7 @@ public class DialNumberTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
         String testNumber = ((DialNumber) msg).getNumber();
 
@@ -83,7 +83,7 @@ public class DialNumberTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
index f226c0630..398a23b0e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
@@ -21,37 +21,37 @@ import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.EndAudioPassThru}
  */
-public class EndAudioPassThruTests extends BaseRpcTests{
+public class EndAudioPassThruTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new EndAudioPassThru();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.END_AUDIO_PASS_THRU.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {     	
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         EndAudioPassThru msg = new EndAudioPassThru();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -61,22 +61,22 @@ public class EndAudioPassThruTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			EndAudioPassThru cmd = new EndAudioPassThru(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            EndAudioPassThru cmd = new EndAudioPassThru(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java
index 02e7fb5ff..53acb1c28 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetAppServiceDataTests.java
@@ -23,95 +23,95 @@ import static junit.framework.TestCase.fail;
 
 public class GetAppServiceDataTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		GetAppServiceData msg = new GetAppServiceData();
-		msg.setServiceType(TestValues.GENERAL_STRING);
-		msg.setSubscribe(TestValues.GENERAL_BOOLEAN);
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.GET_APP_SERVICE_DATA.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(GetAppServiceData.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING);
-			result.put(GetAppServiceData.KEY_SUBSCRIBE, TestValues.GENERAL_BOOLEAN);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		String serviceType = ( (GetAppServiceData) msg ).getServiceType();
-		boolean subscribe = ( (GetAppServiceData) msg ).getSubscribe();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceType);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, subscribe);
-
-		// Invalid/Null Tests
-		GetAppServiceData msg = new GetAppServiceData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(msg.getServiceType());
-		assertNull(msg.getSubscribe());
-	}
-
-	/**
-	 * Tests constructor with required params
-	 */
-	@Test
-	public void testRequiredParamsConstructor () {
-
-		GetAppServiceData msg = new GetAppServiceData(TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, msg);
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getServiceType());
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			GetAppServiceData cmd = new GetAppServiceData(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetAppServiceData.KEY_SUBSCRIBE), cmd.getSubscribe());
-			assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetAppServiceData.KEY_SERVICE_TYPE).toString(), cmd.getServiceType().toString());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        GetAppServiceData msg = new GetAppServiceData();
+        msg.setServiceType(TestValues.GENERAL_STRING);
+        msg.setSubscribe(TestValues.GENERAL_BOOLEAN);
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.GET_APP_SERVICE_DATA.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(GetAppServiceData.KEY_SERVICE_TYPE, TestValues.GENERAL_STRING);
+            result.put(GetAppServiceData.KEY_SUBSCRIBE, TestValues.GENERAL_BOOLEAN);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        String serviceType = ((GetAppServiceData) msg).getServiceType();
+        boolean subscribe = ((GetAppServiceData) msg).getSubscribe();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceType);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, subscribe);
+
+        // Invalid/Null Tests
+        GetAppServiceData msg = new GetAppServiceData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(msg.getServiceType());
+        assertNull(msg.getSubscribe());
+    }
+
+    /**
+     * Tests constructor with required params
+     */
+    @Test
+    public void testRequiredParamsConstructor() {
+
+        GetAppServiceData msg = new GetAppServiceData(TestValues.GENERAL_STRING);
+        assertNotNull(TestValues.NOT_NULL, msg);
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getServiceType());
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            GetAppServiceData cmd = new GetAppServiceData(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetAppServiceData.KEY_SUBSCRIBE), cmd.getSubscribe());
+            assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetAppServiceData.KEY_SERVICE_TYPE).toString(), cmd.getServiceType().toString());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java
index ad8238056..0def46997 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetCloudAppPropertiesTests.java
@@ -13,36 +13,36 @@ import static junit.framework.TestCase.fail;
 
 public class GetCloudAppPropertiesTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage(){
-		GetCloudAppProperties msg = new GetCloudAppProperties();
+    @Override
+    protected RPCMessage createMessage() {
+        GetCloudAppProperties msg = new GetCloudAppProperties();
 
-		msg.setAppID(TestValues.GENERAL_STRING);
+        msg.setAppID(TestValues.GENERAL_STRING);
 
-		return msg;
-	}
+        return msg;
+    }
 
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_REQUEST;
-	}
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
 
-	@Override
-	protected String getCommandType(){
-		return FunctionID.GET_CLOUD_APP_PROPERTIES.toString();
-	}
+    @Override
+    protected String getCommandType() {
+        return FunctionID.GET_CLOUD_APP_PROPERTIES.toString();
+    }
 
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		JSONObject result = new JSONObject();
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
 
-		try{
-			result.put(GetCloudAppProperties.KEY_APP_ID, TestValues.GENERAL_STRING);
-		}catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
+        try {
+            result.put(GetCloudAppProperties.KEY_APP_ID, TestValues.GENERAL_STRING);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
 
-		return result;
-	}
+        return result;
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
index 05b8c1994..cf9cf6527 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
@@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.GetDTCs}
  */
-public class GetDTCsTests extends BaseRpcTests{
+public class GetDTCsTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         GetDTCs msg = new GetDTCs();
 
         msg.setEcuName(TestValues.GENERAL_INT);
@@ -38,43 +38,43 @@ public class GetDTCsTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.GET_DTCS.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(GetDTCs.KEY_ECU_NAME, TestValues.GENERAL_INT);
             result.put(GetDTCs.KEY_DTC_MASK, TestValues.GENERAL_INT);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	// Test Values
-    	int testDtcMask = ( (GetDTCs) msg ).getDtcMask();
-    	int testEcuName = ( (GetDTCs) msg ).getEcuName();
-    	
-    	// Valid Tests
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testDtcMask);
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testEcuName);
-    	
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Test Values
+        int testDtcMask = ((GetDTCs) msg).getDtcMask();
+        int testEcuName = ((GetDTCs) msg).getEcuName();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testDtcMask);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testEcuName);
+
+        // Invalid/Null Tests
         GetDTCs msg = new GetDTCs();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -82,33 +82,32 @@ public class GetDTCsTests extends BaseRpcTests{
         assertNull(TestValues.NULL, msg.getEcuName());
         assertNull(TestValues.NULL, msg.getDtcMask());
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			GetDTCs cmd = new GetDTCs(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetDTCs.KEY_DTC_MASK), cmd.getDtcMask());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetDTCs.KEY_ECU_NAME), cmd.getEcuName());
-		} 
-		catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            GetDTCs cmd = new GetDTCs(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetDTCs.KEY_DTC_MASK), cmd.getDtcMask());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetDTCs.KEY_ECU_NAME), cmd.getEcuName());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java
index 9d358cc8a..55e620950 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetFileTests.java
@@ -25,118 +25,118 @@ import static junit.framework.TestCase.fail;
 
 public class GetFileTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		GetFile msg = new GetFile();
-
-		msg.setFileName(TestValues.GENERAL_STRING);
-		msg.setAppServiceId(TestValues.GENERAL_STRING);
-		msg.setFileType(TestValues.GENERAL_FILETYPE);
-		msg.setOffset(TestValues.GENERAL_INT);
-		msg.setLength(TestValues.GENERAL_INT);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.GET_FILE.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(GetFile.KEY_FILE_NAME, TestValues.GENERAL_STRING);
-			result.put(GetFile.KEY_APP_SERVICE_ID, TestValues.GENERAL_STRING);
-			result.put(GetFile.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE);
-			result.put(GetFile.KEY_OFFSET, TestValues.GENERAL_INTEGER);
-			result.put(GetFile.KEY_LENGTH, TestValues.GENERAL_INTEGER);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		String fileName = ( (GetFile) msg ).getFileName();
-		String appServiceId = ( (GetFile) msg ).getAppServiceId();
-		FileType fileType = ( (GetFile) msg ).getFileType();
-		Integer offset = ( (GetFile) msg ).getOffset();
-		Integer length = ( (GetFile) msg ).getLength();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, fileName);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, fileType);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, offset);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, length);
-
-		// Invalid/Null Tests
-		GetFile msg = new GetFile();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getFileName());
-		assertNull(TestValues.NULL, msg.getAppServiceId());
-		assertNull(TestValues.NULL, msg.getFileType());
-		assertNull(TestValues.NULL, msg.getOffset());
-		assertNull(TestValues.NULL, msg.getLength());
-	}
-
-	/**
-	 * Tests constructor with required params
-	 */
-	@Test
-	public void testRequiredParamsConstructor () {
-
-		GetFile msg = new GetFile(TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, msg);
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getFileName());
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			GetFile cmd = new GetFile(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetFile.KEY_APP_SERVICE_ID), cmd.getAppServiceId());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetFile.KEY_FILE_NAME), cmd.getFileName());
-			assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetFile.KEY_FILE_TYPE).toString(), cmd.getFileType().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFile.KEY_LENGTH), cmd.getLength());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFile.KEY_OFFSET), cmd.getOffset());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        GetFile msg = new GetFile();
+
+        msg.setFileName(TestValues.GENERAL_STRING);
+        msg.setAppServiceId(TestValues.GENERAL_STRING);
+        msg.setFileType(TestValues.GENERAL_FILETYPE);
+        msg.setOffset(TestValues.GENERAL_INT);
+        msg.setLength(TestValues.GENERAL_INT);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.GET_FILE.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(GetFile.KEY_FILE_NAME, TestValues.GENERAL_STRING);
+            result.put(GetFile.KEY_APP_SERVICE_ID, TestValues.GENERAL_STRING);
+            result.put(GetFile.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE);
+            result.put(GetFile.KEY_OFFSET, TestValues.GENERAL_INTEGER);
+            result.put(GetFile.KEY_LENGTH, TestValues.GENERAL_INTEGER);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        String fileName = ((GetFile) msg).getFileName();
+        String appServiceId = ((GetFile) msg).getAppServiceId();
+        FileType fileType = ((GetFile) msg).getFileType();
+        Integer offset = ((GetFile) msg).getOffset();
+        Integer length = ((GetFile) msg).getLength();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, fileName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, fileType);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, offset);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, length);
+
+        // Invalid/Null Tests
+        GetFile msg = new GetFile();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getFileName());
+        assertNull(TestValues.NULL, msg.getAppServiceId());
+        assertNull(TestValues.NULL, msg.getFileType());
+        assertNull(TestValues.NULL, msg.getOffset());
+        assertNull(TestValues.NULL, msg.getLength());
+    }
+
+    /**
+     * Tests constructor with required params
+     */
+    @Test
+    public void testRequiredParamsConstructor() {
+
+        GetFile msg = new GetFile(TestValues.GENERAL_STRING);
+        assertNotNull(TestValues.NOT_NULL, msg);
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getFileName());
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            GetFile cmd = new GetFile(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetFile.KEY_APP_SERVICE_ID), cmd.getAppServiceId());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetFile.KEY_FILE_NAME), cmd.getFileName());
+            assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetFile.KEY_FILE_TYPE).toString(), cmd.getFileType().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFile.KEY_LENGTH), cmd.getLength());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFile.KEY_OFFSET), cmd.getOffset());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java
index 6d9bc2283..f1f96a701 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataConsentTests.java
@@ -25,79 +25,79 @@ import static junit.framework.TestCase.fail;
 
 public class GetInteriorVehicleDataConsentTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		GetInteriorVehicleDataConsent msg = new GetInteriorVehicleDataConsent();
-		msg.setModuleType(TestValues.GENERAL_MODULETYPE);
-		msg.setModuleIds(TestValues.GENERAL_STRING_LIST);
-		return msg;
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-		try {
-			result.put(GetInteriorVehicleDataConsent.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE);
-			result.put(GetInteriorVehicleDataConsent.KEY_MODULE_ID, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-		return result;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.GET_INTERIOR_VEHICLE_DATA_CONSENT.toString();
-	}
-
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Test
-	public void testRpcValues() {
-		ModuleType type = ((GetInteriorVehicleDataConsent) msg).getModuleType();
-		List<String> ids = ((GetInteriorVehicleDataConsent) msg).getModuleIds();
-
-		//valid tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, type);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, ids);
-
-		//null tests
-		GetInteriorVehicleDataConsent msg = new GetInteriorVehicleDataConsent();
-		assertNull(TestValues.NULL, msg.getModuleType());
-		assertNull(TestValues.NULL, msg.getModuleIds());
-
-		//test require param constructor
-		GetInteriorVehicleDataConsent msg2 = new GetInteriorVehicleDataConsent(TestValues.GENERAL_MODULETYPE, TestValues.GENERAL_STRING_LIST);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, msg2.getModuleType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, msg2.getModuleIds());
-
-	}
-
-	@Test
-	public void testJsonConstructor() {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			GetInteriorVehicleDataConsent cmd = new GetInteriorVehicleDataConsent(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleDataConsent.KEY_MODULE_TYPE).toString(), cmd.getModuleType().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(parameters, GetInteriorVehicleDataConsent.KEY_MODULE_ID), cmd.getModuleIds());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        GetInteriorVehicleDataConsent msg = new GetInteriorVehicleDataConsent();
+        msg.setModuleType(TestValues.GENERAL_MODULETYPE);
+        msg.setModuleIds(TestValues.GENERAL_STRING_LIST);
+        return msg;
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+        try {
+            result.put(GetInteriorVehicleDataConsent.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE);
+            result.put(GetInteriorVehicleDataConsent.KEY_MODULE_ID, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+        return result;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.GET_INTERIOR_VEHICLE_DATA_CONSENT.toString();
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Test
+    public void testRpcValues() {
+        ModuleType type = ((GetInteriorVehicleDataConsent) msg).getModuleType();
+        List<String> ids = ((GetInteriorVehicleDataConsent) msg).getModuleIds();
+
+        //valid tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, type);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, ids);
+
+        //null tests
+        GetInteriorVehicleDataConsent msg = new GetInteriorVehicleDataConsent();
+        assertNull(TestValues.NULL, msg.getModuleType());
+        assertNull(TestValues.NULL, msg.getModuleIds());
+
+        //test require param constructor
+        GetInteriorVehicleDataConsent msg2 = new GetInteriorVehicleDataConsent(TestValues.GENERAL_MODULETYPE, TestValues.GENERAL_STRING_LIST);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, msg2.getModuleType());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, msg2.getModuleIds());
+
+    }
+
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            GetInteriorVehicleDataConsent cmd = new GetInteriorVehicleDataConsent(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleDataConsent.KEY_MODULE_TYPE).toString(), cmd.getModuleType().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(parameters, GetInteriorVehicleDataConsent.KEY_MODULE_ID), cmd.getModuleIds());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java
index 615851917..9ae36b479 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetInteriorVehicleDataTests.java
@@ -29,7 +29,7 @@ import static junit.framework.TestCase.fail;
 public class GetInteriorVehicleDataTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         GetInteriorVehicleData msg = new GetInteriorVehicleData();
 
         msg.setModuleType(TestValues.GENERAL_MODULETYPE);
@@ -40,24 +40,24 @@ public class GetInteriorVehicleDataTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.GET_INTERIOR_VEHICLE_DATA.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(GetInteriorVehicleData.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE);
             result.put(GetInteriorVehicleData.KEY_SUBSCRIBE, TestValues.GENERAL_BOOLEAN);
             result.put(GetInteriorVehicleData.KEY_MODULE_ID, TestValues.GENERAL_STRING);
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -68,10 +68,10 @@ public class GetInteriorVehicleDataTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        ModuleType testModuleType = ( (GetInteriorVehicleData) msg ).getModuleType();
-        boolean testSubscribed = ( (GetInteriorVehicleData) msg ).getSubscribe();
+        ModuleType testModuleType = ((GetInteriorVehicleData) msg).getModuleType();
+        boolean testSubscribed = ((GetInteriorVehicleData) msg).getSubscribe();
         String testModuleId = ((GetInteriorVehicleData) msg).getModuleId();
 
         // Valid Tests
@@ -93,7 +93,7 @@ public class GetInteriorVehicleDataTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
@@ -113,7 +113,7 @@ public class GetInteriorVehicleDataTests extends BaseRpcTests {
             assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleData.KEY_MODULE_TYPE).toString(), cmd.getModuleType().toString());
             assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleData.KEY_SUBSCRIBE), cmd.getSubscribe());
             assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleData.KEY_MODULE_ID), cmd.getModuleId());
-        }catch (JSONException e) {
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java
index 6eb55d90f..0fc757ccb 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetSystemCapabilityTests.java
@@ -25,7 +25,7 @@ import static junit.framework.TestCase.fail;
 public class GetSystemCapabilityTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         GetSystemCapability msg = new GetSystemCapability();
 
         msg.setSystemCapabilityType(TestValues.GENERAL_SYSTEMCAPABILITYTYPE);
@@ -35,23 +35,23 @@ public class GetSystemCapabilityTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.GET_SYSTEM_CAPABILITY.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(GetSystemCapability.KEY_SYSTEM_CAPABILITY_TYPE, TestValues.GENERAL_SYSTEMCAPABILITYTYPE);
             result.put(GetSystemCapability.KEY_SUBSCRIBE, TestValues.GENERAL_BOOLEAN);
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -62,10 +62,10 @@ public class GetSystemCapabilityTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        SystemCapabilityType testType = ( (GetSystemCapability) msg ).getSystemCapabilityType();
-        boolean testSubscribe = ( (GetSystemCapability) msg ).getSubscribe();
+        SystemCapabilityType testType = ((GetSystemCapability) msg).getSystemCapabilityType();
+        boolean testSubscribe = ((GetSystemCapability) msg).getSubscribe();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMCAPABILITYTYPE, testType);
@@ -84,7 +84,7 @@ public class GetSystemCapabilityTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
@@ -103,7 +103,7 @@ public class GetSystemCapabilityTests extends BaseRpcTests {
 
             assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetSystemCapability.KEY_SYSTEM_CAPABILITY_TYPE).toString(), cmd.getSystemCapabilityType().toString());
             assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetSystemCapability.KEY_SUBSCRIBE), cmd.getSubscribe());
-        }catch (JSONException e) {
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
index 637445ac7..fe726018f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
@@ -23,68 +23,68 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.GetVehicleData}
  */
 public class GetVehicleDataTests extends BaseRpcTests {
-        
-	@Override
-    protected RPCMessage createMessage(){
+
+    @Override
+    protected RPCMessage createMessage() {
         GetVehicleData msg = new GetVehicleData();
 
-		msg.setSpeed(TestValues.GENERAL_BOOLEAN);
-		msg.setRpm(TestValues.GENERAL_BOOLEAN);
-		msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN);
-		msg.setFuelLevel(TestValues.GENERAL_BOOLEAN);
-		msg.setPrndl(TestValues.GENERAL_BOOLEAN);
-		msg.setTirePressure(TestValues.GENERAL_BOOLEAN);
-		msg.setEngineTorque(TestValues.GENERAL_BOOLEAN);
-		msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN);
-		msg.setOdometer(TestValues.GENERAL_BOOLEAN);
-		msg.setGps(TestValues.GENERAL_BOOLEAN);
-		msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN);
-		msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN);
-		msg.setVin(TestValues.GENERAL_BOOLEAN);
-		msg.setBeltStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setBodyInformation(TestValues.GENERAL_BOOLEAN);
-		msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setDriverBraking(TestValues.GENERAL_BOOLEAN);
-		msg.setWiperStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN);
-		msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN);
-		msg.setECallInfo(TestValues.GENERAL_BOOLEAN);
-		msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN);
-		msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setMyKey(TestValues.GENERAL_BOOLEAN);
-		msg.setFuelRange(TestValues.GENERAL_BOOLEAN);
-		msg.setTurnSignal(TestValues.GENERAL_BOOLEAN);
-		msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN);
-		msg.setWindowStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setGearStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
+        msg.setSpeed(TestValues.GENERAL_BOOLEAN);
+        msg.setRpm(TestValues.GENERAL_BOOLEAN);
+        msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN);
+        msg.setFuelLevel(TestValues.GENERAL_BOOLEAN);
+        msg.setPrndl(TestValues.GENERAL_BOOLEAN);
+        msg.setTirePressure(TestValues.GENERAL_BOOLEAN);
+        msg.setEngineTorque(TestValues.GENERAL_BOOLEAN);
+        msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN);
+        msg.setOdometer(TestValues.GENERAL_BOOLEAN);
+        msg.setGps(TestValues.GENERAL_BOOLEAN);
+        msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN);
+        msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN);
+        msg.setVin(TestValues.GENERAL_BOOLEAN);
+        msg.setBeltStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setBodyInformation(TestValues.GENERAL_BOOLEAN);
+        msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setDriverBraking(TestValues.GENERAL_BOOLEAN);
+        msg.setWiperStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN);
+        msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN);
+        msg.setECallInfo(TestValues.GENERAL_BOOLEAN);
+        msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN);
+        msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setMyKey(TestValues.GENERAL_BOOLEAN);
+        msg.setFuelRange(TestValues.GENERAL_BOOLEAN);
+        msg.setTurnSignal(TestValues.GENERAL_BOOLEAN);
+        msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN);
+        msg.setWindowStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setGearStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
 
         return msg;
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.GET_VEHICLE_DATA.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(GetVehicleData.KEY_SPEED, TestValues.GENERAL_BOOLEAN);
             result.put(GetVehicleData.KEY_RPM, TestValues.GENERAL_BOOLEAN);
             result.put(GetVehicleData.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_BOOLEAN);
@@ -119,56 +119,56 @@ public class GetVehicleDataTests extends BaseRpcTests {
             result.put(GetVehicleData.KEY_WINDOW_STATUS, TestValues.GENERAL_BOOLEAN);
             result.put(GetVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN);
             result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
-    
+
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {
-    	// Valid Tests	
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getSpeed());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getRpm());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getExternalTemperature());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getFuelLevel());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getPrndl());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getTirePressure());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getEngineTorque());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getEngineOilLife());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getOdometer());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getGps());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getFuelLevelState());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getInstantFuelConsumption());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getVin());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getBeltStatus());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getBodyInformation());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getVin());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getDeviceStatus());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getDriverBraking());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getWiperStatus());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getHeadLampStatus());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getAccPedalPosition());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getSteeringWheelAngle());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getECallInfo());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getAirbagStatus());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getEmergencyEvent());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getClusterModeStatus());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getMyKey());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getFuelRange());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getTurnSignal());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getElectronicParkBrakeStatus());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getHandsOffSteering());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getWindowStatus());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getGearStatus());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getStabilityControlsStatus());
-		assertTrue(TestValues.TRUE, ( (GetVehicleData) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-    
-		// Invalid/Null Tests
+    public void testRpcValues() {
+        // Valid Tests
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getSpeed());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getRpm());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getExternalTemperature());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getFuelLevel());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getPrndl());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getTirePressure());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getEngineTorque());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getEngineOilLife());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getOdometer());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getGps());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getFuelLevelState());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getInstantFuelConsumption());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getVin());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getBeltStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getBodyInformation());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getVin());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getDeviceStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getDriverBraking());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getWiperStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getHeadLampStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getAccPedalPosition());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getSteeringWheelAngle());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getECallInfo());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getAirbagStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getEmergencyEvent());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getClusterModeStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getMyKey());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getFuelRange());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getTurnSignal());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getElectronicParkBrakeStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getHandsOffSteering());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getWindowStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getGearStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getStabilityControlsStatus());
+        assertTrue(TestValues.TRUE, ((GetVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
+
+        // Invalid/Null Tests
         GetVehicleData msg = new GetVehicleData();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -208,63 +208,63 @@ public class GetVehicleDataTests extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			GetVehicleData cmd = new GetVehicleData(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals("Command name doesn't match input name", JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals("Correlation ID doesn't match input ID", JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            GetVehicleData cmd = new GetVehicleData(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
 
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_SPEED), cmd.getSpeed());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_RPM), cmd.getRpm());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_VIN), cmd.getVin());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_PRNDL), cmd.getPrndl());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ODOMETER), cmd.getOdometer());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_GPS), cmd.getGps());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_MY_KEY), cmd.getMyKey());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_GEAR_STATUS), cmd.getGearStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+            // Test everything in the json body.
+            assertEquals("Command name doesn't match input name", JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals("Correlation ID doesn't match input ID", JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_SPEED), cmd.getSpeed());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_RPM), cmd.getRpm());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_VIN), cmd.getVin());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_PRNDL), cmd.getPrndl());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ODOMETER), cmd.getOdometer());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_GPS), cmd.getGps());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_MY_KEY), cmd.getMyKey());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_GEAR_STATUS), cmd.getGearStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java
index 8a9586a93..1e27cbdec 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetWayPointsTests.java
@@ -28,7 +28,7 @@ import static junit.framework.TestCase.fail;
 
 public class GetWayPointsTests extends BaseRpcTests {
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         GetWayPoints msg = new GetWayPoints();
 
         msg.setWayPointType(WayPointType.DESTINATION);
@@ -37,22 +37,22 @@ public class GetWayPointsTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.GET_WAY_POINTS.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(GetWayPoints.KEY_WAY_POINT_TYPE, WayPointType.DESTINATION);
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -63,9 +63,9 @@ public class GetWayPointsTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        WayPointType testType      = ( (GetWayPoints) msg ).getWayPointType();
+        WayPointType testType = ((GetWayPoints) msg).getWayPointType();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, WayPointType.DESTINATION, testType);
@@ -82,7 +82,7 @@ public class GetWayPointsTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
index 60d2394b8..c7dd46b65 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
@@ -21,37 +21,37 @@ import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ListFiles}
  */
-public class ListFilesTests extends BaseRpcTests{
+public class ListFilesTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new ListFiles();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.LIST_FILES.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         ListFiles msg = new ListFiles();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -61,22 +61,22 @@ public class ListFilesTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ListFiles cmd = new ListFiles(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ListFiles cmd = new ListFiles(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java
index bdc8bb9ac..e49999176 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAppServiceInteractionTests.java
@@ -24,115 +24,115 @@ import static junit.framework.TestCase.fail;
 
 public class PerformAppServiceInteractionTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		PerformAppServiceInteraction msg = new PerformAppServiceInteraction();
-
-		msg.setServiceUri(TestValues.GENERAL_STRING);
-		msg.setServiceID(TestValues.GENERAL_STRING);
-		msg.setOriginApp(TestValues.GENERAL_STRING);
-		msg.setRequestServiceActive(TestValues.GENERAL_BOOLEAN);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.PERFORM_APP_SERVICES_INTERACTION.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(PerformAppServiceInteraction.KEY_SERVICE_URI, TestValues.GENERAL_STRING);
-			result.put(PerformAppServiceInteraction.KEY_SERVICE_ID, TestValues.GENERAL_STRING);
-			result.put(PerformAppServiceInteraction.KEY_ORIGIN_APP, TestValues.GENERAL_STRING);
-			result.put(PerformAppServiceInteraction.KEY_REQUEST_SERVICE_ACTIVE, TestValues.GENERAL_BOOLEAN);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		String serviceUri = ( (PerformAppServiceInteraction) msg ).getServiceUri();
-		String appServiceId = ( (PerformAppServiceInteraction) msg ).getServiceID();
-		String originApp = ( (PerformAppServiceInteraction) msg ).getOriginApp();
-		boolean requestServiceActive = ( (PerformAppServiceInteraction) msg ).getRequestServiceActive();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceUri);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, originApp);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, requestServiceActive);
-
-		// Invalid/Null Tests
-		PerformAppServiceInteraction msg = new PerformAppServiceInteraction();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getServiceUri());
-		assertNull(TestValues.NULL, msg.getServiceID());
-		assertNull(TestValues.NULL, msg.getOriginApp());
-		assertNull(TestValues.NULL, msg.getRequestServiceActive());
-	}
-
-	/**
-	 * Tests constructor with required params
-	 */
-	@Test
-	public void testRequiredParamsConstructor () {
-		// test with param in constructor
-		PerformAppServiceInteraction msg = new PerformAppServiceInteraction(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_STRING);
-		String serviceUri = msg.getServiceUri();
-		String appServiceId = msg.getServiceID();
-		String originApp = msg.getOriginApp();
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceUri);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, originApp);
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			PerformAppServiceInteraction cmd = new PerformAppServiceInteraction(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_ID), cmd.getServiceID());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_URI), cmd.getServiceUri());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_ORIGIN_APP), cmd.getOriginApp());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PerformAppServiceInteraction.KEY_REQUEST_SERVICE_ACTIVE), cmd.getRequestServiceActive());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        PerformAppServiceInteraction msg = new PerformAppServiceInteraction();
+
+        msg.setServiceUri(TestValues.GENERAL_STRING);
+        msg.setServiceID(TestValues.GENERAL_STRING);
+        msg.setOriginApp(TestValues.GENERAL_STRING);
+        msg.setRequestServiceActive(TestValues.GENERAL_BOOLEAN);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.PERFORM_APP_SERVICES_INTERACTION.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(PerformAppServiceInteraction.KEY_SERVICE_URI, TestValues.GENERAL_STRING);
+            result.put(PerformAppServiceInteraction.KEY_SERVICE_ID, TestValues.GENERAL_STRING);
+            result.put(PerformAppServiceInteraction.KEY_ORIGIN_APP, TestValues.GENERAL_STRING);
+            result.put(PerformAppServiceInteraction.KEY_REQUEST_SERVICE_ACTIVE, TestValues.GENERAL_BOOLEAN);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        String serviceUri = ((PerformAppServiceInteraction) msg).getServiceUri();
+        String appServiceId = ((PerformAppServiceInteraction) msg).getServiceID();
+        String originApp = ((PerformAppServiceInteraction) msg).getOriginApp();
+        boolean requestServiceActive = ((PerformAppServiceInteraction) msg).getRequestServiceActive();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceUri);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, originApp);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, requestServiceActive);
+
+        // Invalid/Null Tests
+        PerformAppServiceInteraction msg = new PerformAppServiceInteraction();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getServiceUri());
+        assertNull(TestValues.NULL, msg.getServiceID());
+        assertNull(TestValues.NULL, msg.getOriginApp());
+        assertNull(TestValues.NULL, msg.getRequestServiceActive());
+    }
+
+    /**
+     * Tests constructor with required params
+     */
+    @Test
+    public void testRequiredParamsConstructor() {
+        // test with param in constructor
+        PerformAppServiceInteraction msg = new PerformAppServiceInteraction(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, TestValues.GENERAL_STRING);
+        String serviceUri = msg.getServiceUri();
+        String appServiceId = msg.getServiceID();
+        String originApp = msg.getOriginApp();
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceUri);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, appServiceId);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, originApp);
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            PerformAppServiceInteraction cmd = new PerformAppServiceInteraction(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_ID), cmd.getServiceID());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_SERVICE_URI), cmd.getServiceUri());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteraction.KEY_ORIGIN_APP), cmd.getOriginApp());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PerformAppServiceInteraction.KEY_REQUEST_SERVICE_ACTIVE), cmd.getRequestServiceActive());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
index d1bc966c5..bee27cb47 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
@@ -31,137 +31,137 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.PerformAudioPassThru}
  */
 public class PerformAudioPassThruTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		PerformAudioPassThru msg = new PerformAudioPassThru();
-				
-		msg.setInitialPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
-		msg.setAudioPassThruDisplayText1(TestValues.GENERAL_STRING);
-		msg.setAudioPassThruDisplayText2(TestValues.GENERAL_STRING);
-		msg.setSamplingRate(TestValues.GENERAL_SAMPLINGRATE);
-		msg.setAudioType(TestValues.GENERAL_AUDIOTYPE);
-		msg.setBitsPerSample(TestValues.GENERAL_BITSPERSAMPLE);
-		msg.setMaxDuration(TestValues.GENERAL_INT);
-		msg.setMuteAudio(TestValues.GENERAL_BOOLEAN);
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.PERFORM_AUDIO_PASS_THRU.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1, TestValues.GENERAL_STRING);
-			result.put(PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2, TestValues.GENERAL_STRING);
-			result.put(PerformAudioPassThru.KEY_MUTE_AUDIO, TestValues.GENERAL_BOOLEAN);
-			result.put(PerformAudioPassThru.KEY_MAX_DURATION, TestValues.GENERAL_INT);
-			result.put(PerformAudioPassThru.KEY_AUDIO_TYPE, TestValues.GENERAL_AUDIOTYPE);
-			result.put(PerformAudioPassThru.KEY_SAMPLING_RATE, TestValues.GENERAL_SAMPLINGRATE);
-			result.put(PerformAudioPassThru.KEY_BITS_PER_SAMPLE, TestValues.GENERAL_BITSPERSAMPLE);
-			result.put(PerformAudioPassThru.KEY_INITIAL_PROMPT,  TestValues.JSON_TTSCHUNKS);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {
-    	// Test Values
-    	boolean testMuteAudio = ( (PerformAudioPassThru) msg ).getMuteAudio();
-    	int testMaxDuration = ( (PerformAudioPassThru) msg ).getMaxDuration();
-    	String testText2 = ( (PerformAudioPassThru) msg ).getAudioPassThruDisplayText2();
-    	String testText1 = ( (PerformAudioPassThru) msg ).getAudioPassThruDisplayText1();
-    	SamplingRate testSamplingRate = ( (PerformAudioPassThru) msg ).getSamplingRate();
-    	AudioType testAudioType = ( (PerformAudioPassThru) msg ).getAudioType();
-    	BitsPerSample testBitsPerSample = ( (PerformAudioPassThru) msg ).getBitsPerSample();
-		List<TTSChunk> testInitialPrompt = ( (PerformAudioPassThru) msg ).getInitialPrompt();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_TTSCHUNK_LIST.size(), testInitialPrompt.size());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText1);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText2);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SAMPLINGRATE, testSamplingRate);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BITSPERSAMPLE, testBitsPerSample);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIOTYPE, testAudioType);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testMaxDuration);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testMuteAudio);
-		for (int i = 0; i < TestValues.GENERAL_TTSCHUNK_LIST.size(); i++) {
-			assertEquals(TestValues.MATCH, TestValues.GENERAL_TTSCHUNK_LIST.get(i), testInitialPrompt.get(i));
-		}
-	
-		// Invalid/Null Tests
-		PerformAudioPassThru msg = new PerformAudioPassThru();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getInitialPrompt());
-		assertNull(TestValues.NULL, msg.getAudioPassThruDisplayText1());
-		assertNull(TestValues.NULL, msg.getAudioPassThruDisplayText2());
-		assertNull(TestValues.NULL, msg.getSamplingRate());
-		assertNull(TestValues.NULL, msg.getBitsPerSample());
-		assertNull(TestValues.NULL, msg.getAudioType());
-		assertNull(TestValues.NULL, msg.getMaxDuration());
-		assertNull(TestValues.NULL, msg.getMuteAudio());
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        PerformAudioPassThru msg = new PerformAudioPassThru();
+
+        msg.setInitialPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
+        msg.setAudioPassThruDisplayText1(TestValues.GENERAL_STRING);
+        msg.setAudioPassThruDisplayText2(TestValues.GENERAL_STRING);
+        msg.setSamplingRate(TestValues.GENERAL_SAMPLINGRATE);
+        msg.setAudioType(TestValues.GENERAL_AUDIOTYPE);
+        msg.setBitsPerSample(TestValues.GENERAL_BITSPERSAMPLE);
+        msg.setMaxDuration(TestValues.GENERAL_INT);
+        msg.setMuteAudio(TestValues.GENERAL_BOOLEAN);
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.PERFORM_AUDIO_PASS_THRU.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1, TestValues.GENERAL_STRING);
+            result.put(PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2, TestValues.GENERAL_STRING);
+            result.put(PerformAudioPassThru.KEY_MUTE_AUDIO, TestValues.GENERAL_BOOLEAN);
+            result.put(PerformAudioPassThru.KEY_MAX_DURATION, TestValues.GENERAL_INT);
+            result.put(PerformAudioPassThru.KEY_AUDIO_TYPE, TestValues.GENERAL_AUDIOTYPE);
+            result.put(PerformAudioPassThru.KEY_SAMPLING_RATE, TestValues.GENERAL_SAMPLINGRATE);
+            result.put(PerformAudioPassThru.KEY_BITS_PER_SAMPLE, TestValues.GENERAL_BITSPERSAMPLE);
+            result.put(PerformAudioPassThru.KEY_INITIAL_PROMPT, TestValues.JSON_TTSCHUNKS);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        boolean testMuteAudio = ((PerformAudioPassThru) msg).getMuteAudio();
+        int testMaxDuration = ((PerformAudioPassThru) msg).getMaxDuration();
+        String testText2 = ((PerformAudioPassThru) msg).getAudioPassThruDisplayText2();
+        String testText1 = ((PerformAudioPassThru) msg).getAudioPassThruDisplayText1();
+        SamplingRate testSamplingRate = ((PerformAudioPassThru) msg).getSamplingRate();
+        AudioType testAudioType = ((PerformAudioPassThru) msg).getAudioType();
+        BitsPerSample testBitsPerSample = ((PerformAudioPassThru) msg).getBitsPerSample();
+        List<TTSChunk> testInitialPrompt = ((PerformAudioPassThru) msg).getInitialPrompt();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_TTSCHUNK_LIST.size(), testInitialPrompt.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText1);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText2);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SAMPLINGRATE, testSamplingRate);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BITSPERSAMPLE, testBitsPerSample);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIOTYPE, testAudioType);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, testMaxDuration);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testMuteAudio);
+        for (int i = 0; i < TestValues.GENERAL_TTSCHUNK_LIST.size(); i++) {
+            assertEquals(TestValues.MATCH, TestValues.GENERAL_TTSCHUNK_LIST.get(i), testInitialPrompt.get(i));
+        }
+
+        // Invalid/Null Tests
+        PerformAudioPassThru msg = new PerformAudioPassThru();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getInitialPrompt());
+        assertNull(TestValues.NULL, msg.getAudioPassThruDisplayText1());
+        assertNull(TestValues.NULL, msg.getAudioPassThruDisplayText2());
+        assertNull(TestValues.NULL, msg.getSamplingRate());
+        assertNull(TestValues.NULL, msg.getBitsPerSample());
+        assertNull(TestValues.NULL, msg.getAudioType());
+        assertNull(TestValues.NULL, msg.getMaxDuration());
+        assertNull(TestValues.NULL, msg.getMuteAudio());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			PerformAudioPassThru cmd = new PerformAudioPassThru(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformAudioPassThru.KEY_MAX_DURATION), (Integer)cmd.getMaxDuration());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1), cmd.getAudioPassThruDisplayText1());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2), cmd.getAudioPassThruDisplayText2());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PerformAudioPassThru.KEY_MUTE_AUDIO), cmd.getMuteAudio());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_SAMPLING_RATE), cmd.getSamplingRate().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_TYPE), cmd.getAudioType().toString());
-
-			JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformAudioPassThru.KEY_INITIAL_PROMPT);
-			List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>();
-			for (int index = 0; index < ttsChunkArray.length(); index++) {
-	        	TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)) );
-	        	ttsChunkList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateTtsChunks(ttsChunkList, cmd.getInitialPrompt()));
-			
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_BITS_PER_SAMPLE), cmd.getBitsPerSample().toString());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            PerformAudioPassThru cmd = new PerformAudioPassThru(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformAudioPassThru.KEY_MAX_DURATION), (Integer) cmd.getMaxDuration());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_1), cmd.getAudioPassThruDisplayText1());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_PASS_THRU_DISPLAY_TEXT_2), cmd.getAudioPassThruDisplayText2());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PerformAudioPassThru.KEY_MUTE_AUDIO), cmd.getMuteAudio());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_SAMPLING_RATE), cmd.getSamplingRate().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_AUDIO_TYPE), cmd.getAudioType().toString());
+
+            JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformAudioPassThru.KEY_INITIAL_PROMPT);
+            List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>();
+            for (int index = 0; index < ttsChunkArray.length(); index++) {
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsChunkArray.get(index)));
+                ttsChunkList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getInitialPrompt()));
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAudioPassThru.KEY_BITS_PER_SAMPLE), cmd.getBitsPerSample().toString());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
index 89afaa843..6ed75c104 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
@@ -31,173 +31,173 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.PerformInteraction}
  */
 public class PerformInteractionTests extends BaseRpcTests {
-	
-	@Override
-	protected RPCMessage createMessage() {
-		PerformInteraction msg = new PerformInteraction();
-
-		msg.setInitialPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
-		msg.setHelpPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
-		msg.setTimeoutPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
-		msg.setVrHelp(TestValues.GENERAL_VRHELPITEM_LIST);
-		msg.setInteractionChoiceSetIDList(TestValues.GENERAL_INTEGER_LIST);
-		msg.setInteractionLayout(TestValues.GENERAL_LAYOUTMODE);
-		msg.setInitialText(TestValues.GENERAL_STRING);
-		msg.setInteractionMode(TestValues.GENERAL_INTERACTIONMODE);
-		msg.setTimeout(TestValues.GENERAL_INT);
-		msg.setCancelID(TestValues.GENERAL_INTEGER);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.PERFORM_INTERACTION.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {			
-			result.put(PerformInteraction.KEY_INITIAL_PROMPT, TestValues.JSON_TTSCHUNKS);
-			result.put(PerformInteraction.KEY_HELP_PROMPT, TestValues.JSON_TTSCHUNKS);
-			result.put(PerformInteraction.KEY_TIMEOUT_PROMPT, TestValues.JSON_TTSCHUNKS);
-			result.put(PerformInteraction.KEY_VR_HELP, TestValues.JSON_VRHELPITEMS);
-			result.put(PerformInteraction.KEY_INTERACTION_CHOICE_SET_ID_LIST, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST));
-			result.put(PerformInteraction.KEY_INTERACTION_LAYOUT, TestValues.GENERAL_LAYOUTMODE);
-			result.put(PerformInteraction.KEY_INITIAL_TEXT, TestValues.GENERAL_STRING);
-			result.put(PerformInteraction.KEY_INTERACTION_MODE, TestValues.GENERAL_INTERACTIONMODE);
-			result.put(PerformInteraction.KEY_TIMEOUT, TestValues.GENERAL_INT);
-			result.put(PerformInteraction.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
+
+    @Override
+    protected RPCMessage createMessage() {
+        PerformInteraction msg = new PerformInteraction();
+
+        msg.setInitialPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
+        msg.setHelpPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
+        msg.setTimeoutPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
+        msg.setVrHelp(TestValues.GENERAL_VRHELPITEM_LIST);
+        msg.setInteractionChoiceSetIDList(TestValues.GENERAL_INTEGER_LIST);
+        msg.setInteractionLayout(TestValues.GENERAL_LAYOUTMODE);
+        msg.setInitialText(TestValues.GENERAL_STRING);
+        msg.setInteractionMode(TestValues.GENERAL_INTERACTIONMODE);
+        msg.setTimeout(TestValues.GENERAL_INT);
+        msg.setCancelID(TestValues.GENERAL_INTEGER);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.PERFORM_INTERACTION.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(PerformInteraction.KEY_INITIAL_PROMPT, TestValues.JSON_TTSCHUNKS);
+            result.put(PerformInteraction.KEY_HELP_PROMPT, TestValues.JSON_TTSCHUNKS);
+            result.put(PerformInteraction.KEY_TIMEOUT_PROMPT, TestValues.JSON_TTSCHUNKS);
+            result.put(PerformInteraction.KEY_VR_HELP, TestValues.JSON_VRHELPITEMS);
+            result.put(PerformInteraction.KEY_INTERACTION_CHOICE_SET_ID_LIST, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST));
+            result.put(PerformInteraction.KEY_INTERACTION_LAYOUT, TestValues.GENERAL_LAYOUTMODE);
+            result.put(PerformInteraction.KEY_INITIAL_TEXT, TestValues.GENERAL_STRING);
+            result.put(PerformInteraction.KEY_INTERACTION_MODE, TestValues.GENERAL_INTERACTIONMODE);
+            result.put(PerformInteraction.KEY_TIMEOUT, TestValues.GENERAL_INT);
+            result.put(PerformInteraction.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {    	
-    	// Test Values
-		List<TTSChunk> testInitialPrompt = ( (PerformInteraction) msg).getInitialPrompt();
-		List<TTSChunk> testHelpPrompt    = ( (PerformInteraction) msg).getHelpPrompt();
-		List<TTSChunk> testTimeoutPrompt = ( (PerformInteraction) msg).getTimeoutPrompt();
-		List<VrHelpItem> testVrHelpItems = ( (PerformInteraction) msg).getVrHelp();
-		List<Integer> testChoiceSetIds   = ( (PerformInteraction) msg).getInteractionChoiceSetIDList();
-		LayoutMode testLayout    = ( (PerformInteraction) msg).getInteractionLayout();
-		String testInitialText   = ( (PerformInteraction) msg).getInitialText();
-		InteractionMode testMode = ( (PerformInteraction) msg).getInteractionMode();
-		Integer testTimeout      = ( (PerformInteraction) msg).getTimeout();
-		Integer testCancelID = ( (PerformInteraction) msg ).getCancelID();
-		
-		// Valid Tests
-		assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testInitialPrompt));
-		assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testHelpPrompt));
-		assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTimeoutPrompt));
-		assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(TestValues.GENERAL_VRHELPITEM_LIST, testVrHelpItems));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testChoiceSetIds);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LAYOUTMODE, testLayout);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testInitialText);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTERACTIONMODE, testMode);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID);
-	
-		// Invald/Null Tests
-		PerformInteraction msg = new PerformInteraction();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getInitialPrompt());
-		assertNull(TestValues.NULL, msg.getHelpPrompt());
-		assertNull(TestValues.NULL, msg.getTimeoutPrompt());
-		assertNull(TestValues.NULL, msg.getVrHelp());
-		assertNull(TestValues.NULL, msg.getInteractionChoiceSetIDList());
-		assertNull(TestValues.NULL, msg.getInteractionLayout());
-		assertNull(TestValues.NULL, msg.getInitialText());
-		assertNull(TestValues.NULL, msg.getInteractionMode());
-		assertNull(TestValues.NULL, msg.getTimeout());
-		assertNull(TestValues.NULL, msg.getCancelID());
-	}
+    public void testRpcValues() {
+        // Test Values
+        List<TTSChunk> testInitialPrompt = ((PerformInteraction) msg).getInitialPrompt();
+        List<TTSChunk> testHelpPrompt = ((PerformInteraction) msg).getHelpPrompt();
+        List<TTSChunk> testTimeoutPrompt = ((PerformInteraction) msg).getTimeoutPrompt();
+        List<VrHelpItem> testVrHelpItems = ((PerformInteraction) msg).getVrHelp();
+        List<Integer> testChoiceSetIds = ((PerformInteraction) msg).getInteractionChoiceSetIDList();
+        LayoutMode testLayout = ((PerformInteraction) msg).getInteractionLayout();
+        String testInitialText = ((PerformInteraction) msg).getInitialText();
+        InteractionMode testMode = ((PerformInteraction) msg).getInteractionMode();
+        Integer testTimeout = ((PerformInteraction) msg).getTimeout();
+        Integer testCancelID = ((PerformInteraction) msg).getCancelID();
+
+        // Valid Tests
+        assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testInitialPrompt));
+        assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testHelpPrompt));
+        assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTimeoutPrompt));
+        assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(TestValues.GENERAL_VRHELPITEM_LIST, testVrHelpItems));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testChoiceSetIds);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LAYOUTMODE, testLayout);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testInitialText);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTERACTIONMODE, testMode);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID);
+
+        // Invald/Null Tests
+        PerformInteraction msg = new PerformInteraction();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getInitialPrompt());
+        assertNull(TestValues.NULL, msg.getHelpPrompt());
+        assertNull(TestValues.NULL, msg.getTimeoutPrompt());
+        assertNull(TestValues.NULL, msg.getVrHelp());
+        assertNull(TestValues.NULL, msg.getInteractionChoiceSetIDList());
+        assertNull(TestValues.NULL, msg.getInteractionLayout());
+        assertNull(TestValues.NULL, msg.getInitialText());
+        assertNull(TestValues.NULL, msg.getInteractionMode());
+        assertNull(TestValues.NULL, msg.getTimeout());
+        assertNull(TestValues.NULL, msg.getCancelID());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			PerformInteraction cmd = new PerformInteraction(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INITIAL_TEXT), cmd.getInitialText());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_MODE), cmd.getInteractionMode().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteraction.KEY_CANCEL_ID), cmd.getCancelID());
-
-			List<Integer> interactionIDList = JsonUtils.readIntegerListFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_CHOICE_SET_ID_LIST);
-			List<Integer> testIDList = cmd.getInteractionChoiceSetIDList();
-			assertEquals(TestValues.MATCH, interactionIDList.size(), testIDList.size());
-			assertTrue(TestValues.TRUE, Validator.validateIntegerList(interactionIDList, testIDList));
-			
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_LAYOUT), cmd.getInteractionLayout().toString());
-			
-			JSONArray initalPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_INITIAL_PROMPT);
-			List<TTSChunk> initalPromptList = new ArrayList<TTSChunk>();
-			for (int index = 0; index < initalPromptArray.length(); index++) {
-	        	TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)initalPromptArray.get(index)) );
-	        	initalPromptList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateTtsChunks(initalPromptList, cmd.getInitialPrompt()));
-			
-			JSONArray helpPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_HELP_PROMPT);
-			List<TTSChunk> helpPromptList = new ArrayList<TTSChunk>();
-			for (int index = 0; index < helpPromptArray.length(); index++) {
-	        	TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)helpPromptArray.get(index)) );
-	        	helpPromptList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateTtsChunks(helpPromptList, cmd.getHelpPrompt()));
-			
-			JSONArray timeoutPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_TIMEOUT_PROMPT);
-			List<TTSChunk> timeoutPromptList = new ArrayList<TTSChunk>();
-			for (int index = 0; index < timeoutPromptArray.length(); index++) {
-	        	TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)timeoutPromptArray.get(index)) );
-	        	timeoutPromptList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateTtsChunks(timeoutPromptList, cmd.getTimeoutPrompt()));
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteraction.KEY_TIMEOUT), cmd.getTimeout());
-			
-			JSONArray vrHelpArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_VR_HELP);
-			List<VrHelpItem> vrHelpList= new ArrayList<VrHelpItem>();
-			for (int index = 0; index < vrHelpArray.length(); index++) {
-				VrHelpItem vrHelpItem = new VrHelpItem(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)vrHelpArray.get(index)) );
-				vrHelpList.add(vrHelpItem);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateVrHelpItems(vrHelpList, cmd.getVrHelp()) );
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            PerformInteraction cmd = new PerformInteraction(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INITIAL_TEXT), cmd.getInitialText());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_MODE), cmd.getInteractionMode().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteraction.KEY_CANCEL_ID), cmd.getCancelID());
+
+            List<Integer> interactionIDList = JsonUtils.readIntegerListFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_CHOICE_SET_ID_LIST);
+            List<Integer> testIDList = cmd.getInteractionChoiceSetIDList();
+            assertEquals(TestValues.MATCH, interactionIDList.size(), testIDList.size());
+            assertTrue(TestValues.TRUE, Validator.validateIntegerList(interactionIDList, testIDList));
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteraction.KEY_INTERACTION_LAYOUT), cmd.getInteractionLayout().toString());
+
+            JSONArray initalPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_INITIAL_PROMPT);
+            List<TTSChunk> initalPromptList = new ArrayList<TTSChunk>();
+            for (int index = 0; index < initalPromptArray.length(); index++) {
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) initalPromptArray.get(index)));
+                initalPromptList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(initalPromptList, cmd.getInitialPrompt()));
+
+            JSONArray helpPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_HELP_PROMPT);
+            List<TTSChunk> helpPromptList = new ArrayList<TTSChunk>();
+            for (int index = 0; index < helpPromptArray.length(); index++) {
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) helpPromptArray.get(index)));
+                helpPromptList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(helpPromptList, cmd.getHelpPrompt()));
+
+            JSONArray timeoutPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_TIMEOUT_PROMPT);
+            List<TTSChunk> timeoutPromptList = new ArrayList<TTSChunk>();
+            for (int index = 0; index < timeoutPromptArray.length(); index++) {
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) timeoutPromptArray.get(index)));
+                timeoutPromptList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(timeoutPromptList, cmd.getTimeoutPrompt()));
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteraction.KEY_TIMEOUT), cmd.getTimeout());
+
+            JSONArray vrHelpArray = JsonUtils.readJsonArrayFromJsonObject(parameters, PerformInteraction.KEY_VR_HELP);
+            List<VrHelpItem> vrHelpList = new ArrayList<VrHelpItem>();
+            for (int index = 0; index < vrHelpArray.length(); index++) {
+                VrHelpItem vrHelpItem = new VrHelpItem(JsonRPCMarshaller.deserializeJSONObject((JSONObject) vrHelpArray.get(index)));
+                vrHelpList.add(vrHelpItem);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(vrHelpList, cmd.getVrHelp()));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java
index e999cb6d1..2bdd7d613 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PublishAppServiceTests.java
@@ -26,93 +26,93 @@ import static junit.framework.TestCase.fail;
 
 public class PublishAppServiceTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		PublishAppService msg = new PublishAppService();
-		msg.setAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST);
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.PUBLISH_APP_SERVICE.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(PublishAppService.KEY_APP_SERVICE_MANIFEST, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_APPSERVICEMANIFEST.getStore()));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		AppServiceManifest copy = ( (PublishAppService) msg ).getAppServiceManifest();
-
-		// Valid Tests
-		assertTrue(Validator.validateAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST, copy));
-
-		// Invalid/Null Tests
-		PublishAppService msg = new PublishAppService();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.MATCH, msg.getAppServiceManifest());
-	}
-
-	/**
-	 * Tests constructor with required params
-	 */
-	@Test
-	public void testRequiredParamsConstructor () {
-
-		PublishAppService msg = new PublishAppService(TestValues.GENERAL_APPSERVICEMANIFEST);
-		assertNotNull(TestValues.NOT_NULL, msg);
-		// Valid Tests
-		assertTrue(Validator.validateAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST, msg.getAppServiceManifest()));
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			PublishAppService cmd = new PublishAppService(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			JSONObject appServiceManifestObject = JsonUtils.readJsonObjectFromJsonObject(parameters, PublishAppService.KEY_APP_SERVICE_MANIFEST);
-			AppServiceManifest manifestTest = new AppServiceManifest(JsonRPCMarshaller.deserializeJSONObject(appServiceManifestObject));
-			assertTrue(TestValues.TRUE,  Validator.validateAppServiceManifest(manifestTest, cmd.getAppServiceManifest()));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        PublishAppService msg = new PublishAppService();
+        msg.setAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST);
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.PUBLISH_APP_SERVICE.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(PublishAppService.KEY_APP_SERVICE_MANIFEST, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_APPSERVICEMANIFEST.getStore()));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        AppServiceManifest copy = ((PublishAppService) msg).getAppServiceManifest();
+
+        // Valid Tests
+        assertTrue(Validator.validateAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST, copy));
+
+        // Invalid/Null Tests
+        PublishAppService msg = new PublishAppService();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.MATCH, msg.getAppServiceManifest());
+    }
+
+    /**
+     * Tests constructor with required params
+     */
+    @Test
+    public void testRequiredParamsConstructor() {
+
+        PublishAppService msg = new PublishAppService(TestValues.GENERAL_APPSERVICEMANIFEST);
+        assertNotNull(TestValues.NOT_NULL, msg);
+        // Valid Tests
+        assertTrue(Validator.validateAppServiceManifest(TestValues.GENERAL_APPSERVICEMANIFEST, msg.getAppServiceManifest()));
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            PublishAppService cmd = new PublishAppService(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            JSONObject appServiceManifestObject = JsonUtils.readJsonObjectFromJsonObject(parameters, PublishAppService.KEY_APP_SERVICE_MANIFEST);
+            AppServiceManifest manifestTest = new AppServiceManifest(JsonRPCMarshaller.deserializeJSONObject(appServiceManifestObject));
+            assertTrue(TestValues.TRUE, Validator.validateAppServiceManifest(manifestTest, cmd.getAppServiceManifest()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java
index 0e3b39aab..9ca62481e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java
@@ -24,136 +24,135 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.PutFile}
  */
 public class PutFileTests extends BaseRpcTests {
-	
-	@Override
-	protected RPCMessage createMessage() {
-		PutFile msg = new PutFile();
-
-		msg.setFileType(TestValues.GENERAL_FILETYPE);
-		msg.setPersistentFile(TestValues.GENERAL_BOOLEAN);
-		msg.setSystemFile(TestValues.GENERAL_BOOLEAN);
-		msg.setOffset(TestValues.GENERAL_LONG);
-		msg.setLength(TestValues.GENERAL_LONG);
-		msg.setCRC(TestValues.GENERAL_BYTE_ARRAY);
-		msg.setCRC(TestValues.GENERAL_LONG);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.PUT_FILE.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(PutFile.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE);
-			result.put(PutFile.KEY_PERSISTENT_FILE, TestValues.GENERAL_BOOLEAN);
-			result.put(PutFile.KEY_SYSTEM_FILE, TestValues.GENERAL_BOOLEAN);
-			result.put(PutFile.KEY_OFFSET, TestValues.GENERAL_LONG);
-			result.put(PutFile.KEY_LENGTH, TestValues.GENERAL_LONG);
-			result.put(PutFile.KEY_CRC, TestValues.GENERAL_LONG);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-	
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {    	
-    	// Test Values
-		FileType testFileType = ( (PutFile) msg ).getFileType();
-		boolean  testPersistentFile = ( (PutFile) msg ).getPersistentFile();
-		boolean  testSystemFile = ( (PutFile) msg ).getSystemFile();
-		Long     testOffset = ( (PutFile) msg ).getOffset();
-		Long     testLength = ( (PutFile) msg ).getLength();
-		Long     testCRC = ( (PutFile) msg ).getCRC();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, testFileType);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testPersistentFile);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testSystemFile);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testOffset);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testLength);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testCRC);
-
-		// Invalid/Null Tests
-		PutFile msg = new PutFile();
-		assertNotNull("Null object creation failed.", msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getFileType());
-		assertNull(TestValues.NULL, msg.getPersistentFile());
-		assertNull(TestValues.NULL, msg.getSystemFile());
-		assertNull(TestValues.NULL, msg.getOffset());
-		assertNull(TestValues.NULL, msg.getLength());
-		assertNull(TestValues.NULL, msg.getCRC());
-	}
-
-	/**
-	 * Tests the expected values of the CRC checksum.
-	 */
-	@Test
-	public void testByteArrayCheckSum () {
-		// Test Values
-		PutFile msgCRC = new PutFile();
-		msgCRC.setCRC(TestValues.GENERAL_BYTE_ARRAY);
-		Long testCRCByteArray = msgCRC.getCRC();
-
-		CRC32 crc = new CRC32();
-		crc.update(TestValues.GENERAL_BYTE_ARRAY);
-		Long crcValue = crc.getValue();
-
-		assertEquals(TestValues.MATCH, crcValue, testCRCByteArray);
-	}
 
+    @Override
+    protected RPCMessage createMessage() {
+        PutFile msg = new PutFile();
+
+        msg.setFileType(TestValues.GENERAL_FILETYPE);
+        msg.setPersistentFile(TestValues.GENERAL_BOOLEAN);
+        msg.setSystemFile(TestValues.GENERAL_BOOLEAN);
+        msg.setOffset(TestValues.GENERAL_LONG);
+        msg.setLength(TestValues.GENERAL_LONG);
+        msg.setCRC(TestValues.GENERAL_BYTE_ARRAY);
+        msg.setCRC(TestValues.GENERAL_LONG);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.PUT_FILE.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(PutFile.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE);
+            result.put(PutFile.KEY_PERSISTENT_FILE, TestValues.GENERAL_BOOLEAN);
+            result.put(PutFile.KEY_SYSTEM_FILE, TestValues.GENERAL_BOOLEAN);
+            result.put(PutFile.KEY_OFFSET, TestValues.GENERAL_LONG);
+            result.put(PutFile.KEY_LENGTH, TestValues.GENERAL_LONG);
+            result.put(PutFile.KEY_CRC, TestValues.GENERAL_LONG);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        FileType testFileType = ((PutFile) msg).getFileType();
+        boolean testPersistentFile = ((PutFile) msg).getPersistentFile();
+        boolean testSystemFile = ((PutFile) msg).getSystemFile();
+        Long testOffset = ((PutFile) msg).getOffset();
+        Long testLength = ((PutFile) msg).getLength();
+        Long testCRC = ((PutFile) msg).getCRC();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, testFileType);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testPersistentFile);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testSystemFile);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testOffset);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testLength);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LONG, testCRC);
+
+        // Invalid/Null Tests
+        PutFile msg = new PutFile();
+        assertNotNull("Null object creation failed.", msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getFileType());
+        assertNull(TestValues.NULL, msg.getPersistentFile());
+        assertNull(TestValues.NULL, msg.getSystemFile());
+        assertNull(TestValues.NULL, msg.getOffset());
+        assertNull(TestValues.NULL, msg.getLength());
+        assertNull(TestValues.NULL, msg.getCRC());
+    }
+
+    /**
+     * Tests the expected values of the CRC checksum.
+     */
+    @Test
+    public void testByteArrayCheckSum() {
+        // Test Values
+        PutFile msgCRC = new PutFile();
+        msgCRC.setCRC(TestValues.GENERAL_BYTE_ARRAY);
+        Long testCRCByteArray = msgCRC.getCRC();
+
+        CRC32 crc = new CRC32();
+        crc.update(TestValues.GENERAL_BYTE_ARRAY);
+        Long crcValue = crc.getValue();
+
+        assertEquals(TestValues.MATCH, crcValue, testCRCByteArray);
+    }
 
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			PutFile cmd = new PutFile(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PutFile.KEY_PERSISTENT_FILE), cmd.getPersistentFile());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PutFile.KEY_SYSTEM_FILE), cmd.getSystemFile());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PutFile.KEY_FILE_TYPE), cmd.getFileType().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PutFile.KEY_SDL_FILE_NAME), cmd.getSdlFileName());
-			assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_OFFSET).longValue(), cmd.getOffset());
-			assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_LENGTH).longValue(), cmd.getLength());
-			assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_CRC).longValue(), cmd.getCRC());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            PutFile cmd = new PutFile(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PutFile.KEY_PERSISTENT_FILE), cmd.getPersistentFile());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, PutFile.KEY_SYSTEM_FILE), cmd.getSystemFile());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PutFile.KEY_FILE_TYPE), cmd.getFileType().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PutFile.KEY_SDL_FILE_NAME), cmd.getSdlFileName());
+            assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_OFFSET).longValue(), cmd.getOffset());
+            assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_LENGTH).longValue(), cmd.getLength());
+            assertEquals(TestValues.MATCH, (Long) JsonUtils.readIntegerFromJsonObject(parameters, PutFile.KEY_CRC).longValue(), cmd.getCRC());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java
index 7045f7434..761cfc304 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java
@@ -25,95 +25,95 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ReadDID}
  */
 public class ReadDidTests extends BaseRpcTests {
-	
-	@Override
-	protected RPCMessage createMessage() {
-		ReadDID msg = new ReadDID();
-
-		msg.setEcuName(TestValues.GENERAL_INT);
-		msg.setDidLocation(TestValues.GENERAL_INTEGER_LIST);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.READ_DID.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(ReadDID.KEY_ECU_NAME, TestValues.GENERAL_INT);
-			result.put(ReadDID.KEY_DID_LOCATION, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () { 
-    	// Test Values
-		Integer testEcuName = ( (ReadDID) msg ).getEcuName();
-		List<Integer> testDidLocation = ( (ReadDID) msg ).getDidLocation();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testEcuName);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testDidLocation);
-		
-		// Invalid/Null Tests
-		ReadDID msg = new ReadDID();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getEcuName());
-		assertNull(TestValues.NULL, msg.getDidLocation());
-	}
-
-	/**
+
+    @Override
+    protected RPCMessage createMessage() {
+        ReadDID msg = new ReadDID();
+
+        msg.setEcuName(TestValues.GENERAL_INT);
+        msg.setDidLocation(TestValues.GENERAL_INTEGER_LIST);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.READ_DID.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(ReadDID.KEY_ECU_NAME, TestValues.GENERAL_INT);
+            result.put(ReadDID.KEY_DID_LOCATION, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        Integer testEcuName = ((ReadDID) msg).getEcuName();
+        List<Integer> testDidLocation = ((ReadDID) msg).getDidLocation();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testEcuName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testDidLocation);
+
+        // Invalid/Null Tests
+        ReadDID msg = new ReadDID();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getEcuName());
+        assertNull(TestValues.NULL, msg.getDidLocation());
+    }
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ReadDID cmd = new ReadDID(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ReadDID.KEY_ECU_NAME), cmd.getEcuName());
-
-			List<Integer> didLocationList = JsonUtils.readIntegerListFromJsonObject(parameters, ReadDID.KEY_DID_LOCATION);
-			List<Integer> testLocationList = cmd.getDidLocation();
-			assertEquals(TestValues.MATCH, didLocationList.size(), testLocationList.size());
-			assertTrue(TestValues.TRUE, Validator.validateIntegerList(didLocationList, testLocationList));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }	
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ReadDID cmd = new ReadDID(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ReadDID.KEY_ECU_NAME), cmd.getEcuName());
+
+            List<Integer> didLocationList = JsonUtils.readIntegerListFromJsonObject(parameters, ReadDID.KEY_DID_LOCATION);
+            List<Integer> testLocationList = cmd.getDidLocation();
+            assertEquals(TestValues.MATCH, didLocationList.size(), testLocationList.size());
+            assertTrue(TestValues.TRUE, Validator.validateIntegerList(didLocationList, testLocationList));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
index b61687bd7..a4957183b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
@@ -34,205 +34,205 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.RegisterAppInterface}
  */
 public class RegisterAppInterfaceTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		RegisterAppInterface msg = new RegisterAppInterface();
-
-		msg.setSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION);
-		msg.setAppName(TestValues.GENERAL_STRING);
-		msg.setNgnMediaScreenAppName(TestValues.GENERAL_STRING);
-		msg.setFullAppID(TestValues.GENERAL_FULL_APP_ID);
-		msg.setLanguageDesired(TestValues.GENERAL_LANGUAGE);
-		msg.setHmiDisplayLanguageDesired(TestValues.GENERAL_LANGUAGE);
-		msg.setHashID(TestValues.GENERAL_STRING);
-		msg.setTtsName(TestValues.GENERAL_TTSCHUNK_LIST);
-		msg.setVrSynonyms(TestValues.GENERAL_STRING_LIST);
-		msg.setAppHMIType(TestValues.GENERAL_APPHMITYPE_LIST);
-		msg.setIsMediaApplication(TestValues.GENERAL_BOOLEAN);
-		msg.setDeviceInfo(TestValues.GENERAL_DEVICEINFO);
-		msg.setAppInfo(TestValues.GENERAL_APPINFO);
-		msg.setDayColorScheme(TestValues.GENERAL_DAYCOLORSCHEME);
-		msg.setNightColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME);
-
-		return msg;
-	}
-	
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.REGISTER_APP_INTERFACE.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(RegisterAppInterface.KEY_SDL_MSG_VERSION, TestValues.JSON_SDLMSGVERSION);
-			result.put(RegisterAppInterface.KEY_APP_NAME, TestValues.GENERAL_STRING);
-			result.put(RegisterAppInterface.KEY_NGN_MEDIA_SCREEN_APP_NAME, TestValues.GENERAL_STRING);
-			result.put(RegisterAppInterface.KEY_APP_ID, TestValues.GENERAL_APP_ID);
-			result.put(RegisterAppInterface.KEY_FULL_APP_ID, TestValues.GENERAL_FULL_APP_ID);
-			result.put(RegisterAppInterface.KEY_LANGUAGE_DESIRED, TestValues.GENERAL_LANGUAGE);
-			result.put(RegisterAppInterface.KEY_HMI_DISPLAY_LANGUAGE_DESIRED, TestValues.GENERAL_LANGUAGE);
-			result.put(RegisterAppInterface.KEY_HASH_ID, TestValues.GENERAL_STRING);
-			result.put(RegisterAppInterface.KEY_TTS_NAME, TestValues.JSON_TTSCHUNKS);
-			result.put(RegisterAppInterface.KEY_VR_SYNONYMS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
-			result.put(RegisterAppInterface.KEY_APP_HMI_TYPE, JsonUtils.createJsonArrayOfJsonNames(TestValues.GENERAL_APPHMITYPE_LIST, SDL_VERSION_UNDER_TEST));
-			result.put(RegisterAppInterface.KEY_IS_MEDIA_APPLICATION, TestValues.GENERAL_BOOLEAN);
-			result.put(RegisterAppInterface.KEY_DEVICE_INFO, TestValues.JSON_DEVICEINFO);
-			result.put(RegisterAppInterface.KEY_APP_INFO, TestValues.JSON_APPINFO);
-			result.put(RegisterAppInterface.KEY_DAY_COLOR_SCHEME, TestValues.JSON_DAYCOLORSCHEME);
-			result.put(RegisterAppInterface.KEY_NIGHT_COLOR_SCHEME, TestValues.JSON_NIGHTCOLORSCHEME);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {
-    	// Test Values
-		SdlMsgVersion testVersion = ( (RegisterAppInterface) msg).getSdlMsgVersion();
-		String testName = ( (RegisterAppInterface) msg).getAppName();
-		String testNgnName = ( (RegisterAppInterface) msg).getNgnMediaScreenAppName();
-		String testAppId = ( (RegisterAppInterface) msg).getAppID();
-		String testFullAppId = ( (RegisterAppInterface) msg).getFullAppID();
-		Language testLang = ( (RegisterAppInterface) msg).getLanguageDesired();
-		Language testHmiLang = ( (RegisterAppInterface) msg).getHmiDisplayLanguageDesired();
-		String testHashId = ( (RegisterAppInterface) msg).getHashID();
-		List<TTSChunk> testTts = ( (RegisterAppInterface) msg).getTtsName();
-		List<String> testSynonyms = ( (RegisterAppInterface) msg).getVrSynonyms();
-		List<AppHMIType> testApps = ( (RegisterAppInterface) msg).getAppHMIType();
-		Boolean testMedia = ( (RegisterAppInterface) msg).getIsMediaApplication();
-		DeviceInfo testDeviceInfo = ( (RegisterAppInterface) msg).getDeviceInfo();
-		AppInfo testAppInfo = ( (RegisterAppInterface) msg).getAppInfo();
-		TemplateColorScheme testDayColorScheme = ( (RegisterAppInterface) msg).getDayColorScheme();
-		TemplateColorScheme testNightColorScheme = ( (RegisterAppInterface) msg).getNightColorScheme();
-
-		// Valid Tests
-		assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION, testVersion));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testName);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNgnName);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_APP_ID, testAppId);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FULL_APP_ID, testFullAppId);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testLang);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testHmiLang);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testHashId);
-		assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTts));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, testSynonyms);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_APPHMITYPE_LIST, testApps);
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, testMedia);
-		assertTrue(TestValues.TRUE, Validator.validateDeviceInfo(TestValues.GENERAL_DEVICEINFO, testDeviceInfo));
-		assertTrue(TestValues.TRUE, Validator.validateAppInfo(TestValues.GENERAL_APPINFO, testAppInfo));
-		assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_DAYCOLORSCHEME, testDayColorScheme));
-		assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME, testNightColorScheme));
-
-		// Invalid/Null Tests
-		RegisterAppInterface msg = new RegisterAppInterface();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getSdlMsgVersion());
-		assertNull(TestValues.NULL, msg.getAppName());
-		assertNull(TestValues.NULL, msg.getNgnMediaScreenAppName());
-		assertNull(TestValues.NULL, msg.getAppID());
-		assertNull(TestValues.NULL, msg.getFullAppID());
-		assertNull(TestValues.NULL, msg.getLanguageDesired());
-		assertNull(TestValues.NULL, msg.getHmiDisplayLanguageDesired());
-		assertNull(TestValues.NULL, msg.getHashID());
-		assertNull(TestValues.NULL, msg.getTtsName());
-		assertNull(TestValues.NULL, msg.getVrSynonyms());
-		assertNull(TestValues.NULL, msg.getAppHMIType());
-		assertNull(TestValues.NULL, msg.getIsMediaApplication());
-		assertNull(TestValues.NULL, msg.getDeviceInfo());
-		assertNull(TestValues.NULL, msg.getAppInfo());
-		assertNull(TestValues.NULL, msg.getDayColorScheme());
-		assertNull(TestValues.NULL, msg.getNightColorScheme());
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        RegisterAppInterface msg = new RegisterAppInterface();
+
+        msg.setSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION);
+        msg.setAppName(TestValues.GENERAL_STRING);
+        msg.setNgnMediaScreenAppName(TestValues.GENERAL_STRING);
+        msg.setFullAppID(TestValues.GENERAL_FULL_APP_ID);
+        msg.setLanguageDesired(TestValues.GENERAL_LANGUAGE);
+        msg.setHmiDisplayLanguageDesired(TestValues.GENERAL_LANGUAGE);
+        msg.setHashID(TestValues.GENERAL_STRING);
+        msg.setTtsName(TestValues.GENERAL_TTSCHUNK_LIST);
+        msg.setVrSynonyms(TestValues.GENERAL_STRING_LIST);
+        msg.setAppHMIType(TestValues.GENERAL_APPHMITYPE_LIST);
+        msg.setIsMediaApplication(TestValues.GENERAL_BOOLEAN);
+        msg.setDeviceInfo(TestValues.GENERAL_DEVICEINFO);
+        msg.setAppInfo(TestValues.GENERAL_APPINFO);
+        msg.setDayColorScheme(TestValues.GENERAL_DAYCOLORSCHEME);
+        msg.setNightColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.REGISTER_APP_INTERFACE.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(RegisterAppInterface.KEY_SDL_MSG_VERSION, TestValues.JSON_SDLMSGVERSION);
+            result.put(RegisterAppInterface.KEY_APP_NAME, TestValues.GENERAL_STRING);
+            result.put(RegisterAppInterface.KEY_NGN_MEDIA_SCREEN_APP_NAME, TestValues.GENERAL_STRING);
+            result.put(RegisterAppInterface.KEY_APP_ID, TestValues.GENERAL_APP_ID);
+            result.put(RegisterAppInterface.KEY_FULL_APP_ID, TestValues.GENERAL_FULL_APP_ID);
+            result.put(RegisterAppInterface.KEY_LANGUAGE_DESIRED, TestValues.GENERAL_LANGUAGE);
+            result.put(RegisterAppInterface.KEY_HMI_DISPLAY_LANGUAGE_DESIRED, TestValues.GENERAL_LANGUAGE);
+            result.put(RegisterAppInterface.KEY_HASH_ID, TestValues.GENERAL_STRING);
+            result.put(RegisterAppInterface.KEY_TTS_NAME, TestValues.JSON_TTSCHUNKS);
+            result.put(RegisterAppInterface.KEY_VR_SYNONYMS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
+            result.put(RegisterAppInterface.KEY_APP_HMI_TYPE, JsonUtils.createJsonArrayOfJsonNames(TestValues.GENERAL_APPHMITYPE_LIST, SDL_VERSION_UNDER_TEST));
+            result.put(RegisterAppInterface.KEY_IS_MEDIA_APPLICATION, TestValues.GENERAL_BOOLEAN);
+            result.put(RegisterAppInterface.KEY_DEVICE_INFO, TestValues.JSON_DEVICEINFO);
+            result.put(RegisterAppInterface.KEY_APP_INFO, TestValues.JSON_APPINFO);
+            result.put(RegisterAppInterface.KEY_DAY_COLOR_SCHEME, TestValues.JSON_DAYCOLORSCHEME);
+            result.put(RegisterAppInterface.KEY_NIGHT_COLOR_SCHEME, TestValues.JSON_NIGHTCOLORSCHEME);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        SdlMsgVersion testVersion = ((RegisterAppInterface) msg).getSdlMsgVersion();
+        String testName = ((RegisterAppInterface) msg).getAppName();
+        String testNgnName = ((RegisterAppInterface) msg).getNgnMediaScreenAppName();
+        String testAppId = ((RegisterAppInterface) msg).getAppID();
+        String testFullAppId = ((RegisterAppInterface) msg).getFullAppID();
+        Language testLang = ((RegisterAppInterface) msg).getLanguageDesired();
+        Language testHmiLang = ((RegisterAppInterface) msg).getHmiDisplayLanguageDesired();
+        String testHashId = ((RegisterAppInterface) msg).getHashID();
+        List<TTSChunk> testTts = ((RegisterAppInterface) msg).getTtsName();
+        List<String> testSynonyms = ((RegisterAppInterface) msg).getVrSynonyms();
+        List<AppHMIType> testApps = ((RegisterAppInterface) msg).getAppHMIType();
+        Boolean testMedia = ((RegisterAppInterface) msg).getIsMediaApplication();
+        DeviceInfo testDeviceInfo = ((RegisterAppInterface) msg).getDeviceInfo();
+        AppInfo testAppInfo = ((RegisterAppInterface) msg).getAppInfo();
+        TemplateColorScheme testDayColorScheme = ((RegisterAppInterface) msg).getDayColorScheme();
+        TemplateColorScheme testNightColorScheme = ((RegisterAppInterface) msg).getNightColorScheme();
+
+        // Valid Tests
+        assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION, testVersion));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNgnName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_APP_ID, testAppId);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FULL_APP_ID, testFullAppId);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testLang);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testHmiLang);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testHashId);
+        assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTts));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST, testSynonyms);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_APPHMITYPE_LIST, testApps);
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, testMedia);
+        assertTrue(TestValues.TRUE, Validator.validateDeviceInfo(TestValues.GENERAL_DEVICEINFO, testDeviceInfo));
+        assertTrue(TestValues.TRUE, Validator.validateAppInfo(TestValues.GENERAL_APPINFO, testAppInfo));
+        assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_DAYCOLORSCHEME, testDayColorScheme));
+        assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME, testNightColorScheme));
+
+        // Invalid/Null Tests
+        RegisterAppInterface msg = new RegisterAppInterface();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getSdlMsgVersion());
+        assertNull(TestValues.NULL, msg.getAppName());
+        assertNull(TestValues.NULL, msg.getNgnMediaScreenAppName());
+        assertNull(TestValues.NULL, msg.getAppID());
+        assertNull(TestValues.NULL, msg.getFullAppID());
+        assertNull(TestValues.NULL, msg.getLanguageDesired());
+        assertNull(TestValues.NULL, msg.getHmiDisplayLanguageDesired());
+        assertNull(TestValues.NULL, msg.getHashID());
+        assertNull(TestValues.NULL, msg.getTtsName());
+        assertNull(TestValues.NULL, msg.getVrSynonyms());
+        assertNull(TestValues.NULL, msg.getAppHMIType());
+        assertNull(TestValues.NULL, msg.getIsMediaApplication());
+        assertNull(TestValues.NULL, msg.getDeviceInfo());
+        assertNull(TestValues.NULL, msg.getAppInfo());
+        assertNull(TestValues.NULL, msg.getDayColorScheme());
+        assertNull(TestValues.NULL, msg.getNightColorScheme());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			RegisterAppInterface cmd = new RegisterAppInterface(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			JSONArray ttsNameArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterface.KEY_TTS_NAME);
-			List<TTSChunk> ttsNameList = new ArrayList<TTSChunk>();
-			for (int index = 0; index < ttsNameArray.length(); index++) {
-	        	TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsNameArray.get(index)) );
-	        	ttsNameList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateTtsChunks(ttsNameList, cmd.getTtsName()));
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_HMI_DISPLAY_LANGUAGE_DESIRED), cmd.getHmiDisplayLanguageDesired().toString());
-
-			JSONArray appHmiTypeArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterface.KEY_APP_HMI_TYPE);
-			for (int index = 0; index < appHmiTypeArray.length(); index++) {
-				AppHMIType appHmiTypeItem = AppHMIType.valueForString( appHmiTypeArray.get(index).toString() );
-				assertEquals(TestValues.MATCH, appHmiTypeItem, cmd.getAppHMIType().get(index) );
-			}
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_APP_ID), cmd.getAppID());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_FULL_APP_ID), cmd.getFullAppID());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_LANGUAGE_DESIRED), cmd.getLanguageDesired().toString());
-
-			JSONObject deviceInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DEVICE_INFO);
-			DeviceInfo deviceInfo = new DeviceInfo(JsonRPCMarshaller.deserializeJSONObject(deviceInfoObj));
-			assertTrue(TestValues.TRUE,  Validator.validateDeviceInfo(deviceInfo, cmd.getDeviceInfo()) );
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_APP_NAME), cmd.getAppName());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_NGN_MEDIA_SCREEN_APP_NAME), cmd.getNgnMediaScreenAppName());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, RegisterAppInterface.KEY_IS_MEDIA_APPLICATION), cmd.getIsMediaApplication());
-
-			JSONObject appInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_APP_INFO);
-			AppInfo appInfo = new AppInfo(JsonRPCMarshaller.deserializeJSONObject(appInfoObj));
-			assertTrue(TestValues.TRUE,  Validator.validateAppInfo(appInfo, cmd.getAppInfo()));
-
-			List<String> vrSynonymsList = JsonUtils.readStringListFromJsonObject(parameters, RegisterAppInterface.KEY_VR_SYNONYMS);
-			List<String> testSynonymsList = cmd.getVrSynonyms();
-			assertEquals(TestValues.MATCH, vrSynonymsList.size(), testSynonymsList.size());
-			assertTrue(TestValues.TRUE, Validator.validateStringList(vrSynonymsList, testSynonymsList));
-
-			JSONObject sdlMsgVersionObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_SDL_MSG_VERSION);
-			SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(JsonRPCMarshaller.deserializeJSONObject(sdlMsgVersionObj));
-			assertTrue(TestValues.TRUE,  Validator.validateSdlMsgVersion(sdlMsgVersion, cmd.getSdlMsgVersion()) );
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_HASH_ID), cmd.getHashID());
-
-			JSONObject dayColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DAY_COLOR_SCHEME);
-			TemplateColorScheme dayColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(dayColorSchemeObj));
-			assertTrue(TestValues.TRUE,  Validator.validateTemplateColorScheme(dayColorScheme, cmd.getDayColorScheme()) );
-
-			JSONObject nightColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DAY_COLOR_SCHEME);
-			TemplateColorScheme nightColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(nightColorSchemeObj));
-			assertTrue(TestValues.TRUE,  Validator.validateTemplateColorScheme(nightColorScheme, cmd.getDayColorScheme()) );
-
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            RegisterAppInterface cmd = new RegisterAppInterface(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            JSONArray ttsNameArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterface.KEY_TTS_NAME);
+            List<TTSChunk> ttsNameList = new ArrayList<TTSChunk>();
+            for (int index = 0; index < ttsNameArray.length(); index++) {
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsNameArray.get(index)));
+                ttsNameList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsNameList, cmd.getTtsName()));
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_HMI_DISPLAY_LANGUAGE_DESIRED), cmd.getHmiDisplayLanguageDesired().toString());
+
+            JSONArray appHmiTypeArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterface.KEY_APP_HMI_TYPE);
+            for (int index = 0; index < appHmiTypeArray.length(); index++) {
+                AppHMIType appHmiTypeItem = AppHMIType.valueForString(appHmiTypeArray.get(index).toString());
+                assertEquals(TestValues.MATCH, appHmiTypeItem, cmd.getAppHMIType().get(index));
+            }
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_APP_ID), cmd.getAppID());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_FULL_APP_ID), cmd.getFullAppID());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_LANGUAGE_DESIRED), cmd.getLanguageDesired().toString());
+
+            JSONObject deviceInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DEVICE_INFO);
+            DeviceInfo deviceInfo = new DeviceInfo(JsonRPCMarshaller.deserializeJSONObject(deviceInfoObj));
+            assertTrue(TestValues.TRUE, Validator.validateDeviceInfo(deviceInfo, cmd.getDeviceInfo()));
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_APP_NAME), cmd.getAppName());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_NGN_MEDIA_SCREEN_APP_NAME), cmd.getNgnMediaScreenAppName());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, RegisterAppInterface.KEY_IS_MEDIA_APPLICATION), cmd.getIsMediaApplication());
+
+            JSONObject appInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_APP_INFO);
+            AppInfo appInfo = new AppInfo(JsonRPCMarshaller.deserializeJSONObject(appInfoObj));
+            assertTrue(TestValues.TRUE, Validator.validateAppInfo(appInfo, cmd.getAppInfo()));
+
+            List<String> vrSynonymsList = JsonUtils.readStringListFromJsonObject(parameters, RegisterAppInterface.KEY_VR_SYNONYMS);
+            List<String> testSynonymsList = cmd.getVrSynonyms();
+            assertEquals(TestValues.MATCH, vrSynonymsList.size(), testSynonymsList.size());
+            assertTrue(TestValues.TRUE, Validator.validateStringList(vrSynonymsList, testSynonymsList));
+
+            JSONObject sdlMsgVersionObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_SDL_MSG_VERSION);
+            SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(JsonRPCMarshaller.deserializeJSONObject(sdlMsgVersionObj));
+            assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(sdlMsgVersion, cmd.getSdlMsgVersion()));
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterface.KEY_HASH_ID), cmd.getHashID());
+
+            JSONObject dayColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DAY_COLOR_SCHEME);
+            TemplateColorScheme dayColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(dayColorSchemeObj));
+            assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(dayColorScheme, cmd.getDayColorScheme()));
+
+            JSONObject nightColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterface.KEY_DAY_COLOR_SCHEME);
+            TemplateColorScheme nightColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(nightColorSchemeObj));
+            assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(nightColorScheme, cmd.getDayColorScheme()));
+
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java
index 840eb246d..0514fa8cf 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReleaseInteriorVehicleDataModuleTests.java
@@ -24,75 +24,75 @@ import static junit.framework.TestCase.fail;
 
 public class ReleaseInteriorVehicleDataModuleTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		ReleaseInteriorVehicleDataModule msg = new ReleaseInteriorVehicleDataModule();
-		msg.setModuleType(TestValues.GENERAL_MODULETYPE);
-		msg.setModuleId(TestValues.GENERAL_STRING);
-		return msg;
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-		try {
-			result.put(ReleaseInteriorVehicleDataModule.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE);
-			result.put(ReleaseInteriorVehicleDataModule.KEY_MODULE_ID, TestValues.GENERAL_STRING);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-		return result;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.RELEASE_INTERIOR_VEHICLE_MODULE.toString();
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Test
-	public void testRpcValues() {
-		ModuleType type = ((ReleaseInteriorVehicleDataModule) msg).getModuleType();
-		String id = ((ReleaseInteriorVehicleDataModule) msg).getModuleId();
-
-		//valid tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, type);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, id);
-
-		//null tests
-		ReleaseInteriorVehicleDataModule msg = new ReleaseInteriorVehicleDataModule();
-		assertNull(TestValues.NULL, msg.getModuleType());
-		assertNull(TestValues.NULL, msg.getModuleId());
-
-		// required param tests
-		ReleaseInteriorVehicleDataModule msg2 = new ReleaseInteriorVehicleDataModule(TestValues.GENERAL_MODULETYPE);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, msg2.getModuleType());
-	}
-
-	@Test
-	public void testJsonConstructor() {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ReleaseInteriorVehicleDataModule cmd = new ReleaseInteriorVehicleDataModule(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, ReleaseInteriorVehicleDataModule.KEY_MODULE_TYPE).toString(), cmd.getModuleType().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(parameters, ReleaseInteriorVehicleDataModule.KEY_MODULE_ID), cmd.getModuleId());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        ReleaseInteriorVehicleDataModule msg = new ReleaseInteriorVehicleDataModule();
+        msg.setModuleType(TestValues.GENERAL_MODULETYPE);
+        msg.setModuleId(TestValues.GENERAL_STRING);
+        return msg;
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+        try {
+            result.put(ReleaseInteriorVehicleDataModule.KEY_MODULE_TYPE, TestValues.GENERAL_MODULETYPE);
+            result.put(ReleaseInteriorVehicleDataModule.KEY_MODULE_ID, TestValues.GENERAL_STRING);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+        return result;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.RELEASE_INTERIOR_VEHICLE_MODULE.toString();
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Test
+    public void testRpcValues() {
+        ModuleType type = ((ReleaseInteriorVehicleDataModule) msg).getModuleType();
+        String id = ((ReleaseInteriorVehicleDataModule) msg).getModuleId();
+
+        //valid tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, type);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, id);
+
+        //null tests
+        ReleaseInteriorVehicleDataModule msg = new ReleaseInteriorVehicleDataModule();
+        assertNull(TestValues.NULL, msg.getModuleType());
+        assertNull(TestValues.NULL, msg.getModuleId());
+
+        // required param tests
+        ReleaseInteriorVehicleDataModule msg2 = new ReleaseInteriorVehicleDataModule(TestValues.GENERAL_MODULETYPE);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MODULETYPE, msg2.getModuleType());
+    }
+
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ReleaseInteriorVehicleDataModule cmd = new ReleaseInteriorVehicleDataModule(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, ReleaseInteriorVehicleDataModule.KEY_MODULE_TYPE).toString(), cmd.getModuleType().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringListFromJsonObject(parameters, ReleaseInteriorVehicleDataModule.KEY_MODULE_ID), cmd.getModuleId());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java
index 3a2f6eeb4..71351c611 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java
@@ -25,93 +25,93 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ResetGlobalProperties}
  */
 public class ResetGlobalPropertiesTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		ResetGlobalProperties msg = new ResetGlobalProperties();
-
-		msg.setProperties(TestValues.GENERAL_GLOBALPROPERTY_LIST);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.RESET_GLOBAL_PROPERTIES.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(ResetGlobalProperties.KEY_PROPERTIES, JsonUtils.createJsonArray(TestValues.GENERAL_GLOBALPROPERTY_LIST));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {    	
-    	// Test Values
-		List<GlobalProperty> copy = ( (ResetGlobalProperties) msg ).getProperties();
-		
-		// Valid Tests
+    @Override
+    protected RPCMessage createMessage() {
+        ResetGlobalProperties msg = new ResetGlobalProperties();
+
+        msg.setProperties(TestValues.GENERAL_GLOBALPROPERTY_LIST);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.RESET_GLOBAL_PROPERTIES.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(ResetGlobalProperties.KEY_PROPERTIES, JsonUtils.createJsonArray(TestValues.GENERAL_GLOBALPROPERTY_LIST));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        List<GlobalProperty> copy = ((ResetGlobalProperties) msg).getProperties();
+
+        // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_GLOBALPROPERTY_LIST.size(), copy.size());
-        for(int i = 0; i < TestValues.GENERAL_GLOBALPROPERTY_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_GLOBALPROPERTY_LIST.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_GLOBALPROPERTY_LIST.get(i), copy.get(i));
         }
-	
+
         // Invalid/Null Tests
-		ResetGlobalProperties msg = new ResetGlobalProperties();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
+        ResetGlobalProperties msg = new ResetGlobalProperties();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
 
-		assertNull(TestValues.NULL, msg.getProperties());
-	}
+        assertNull(TestValues.NULL, msg.getProperties());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ResetGlobalProperties cmd = new ResetGlobalProperties(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			
-			JSONArray propertiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ResetGlobalProperties.KEY_PROPERTIES);
-			for (int index = 0; index < propertiesArray.length(); index++) {
-				GlobalProperty property = GlobalProperty.valueOf(propertiesArray.get(index).toString());
-				assertEquals(TestValues.MATCH,  property, cmd.getProperties().get(index));
-			}			
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ResetGlobalProperties cmd = new ResetGlobalProperties(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            JSONArray propertiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ResetGlobalProperties.KEY_PROPERTIES);
+            for (int index = 0; index < propertiesArray.length(); index++) {
+                GlobalProperty property = GlobalProperty.valueOf(propertiesArray.get(index).toString());
+                assertEquals(TestValues.MATCH, property, cmd.getProperties().get(index));
+            }
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java
index 40d4eb33e..e18fb5896 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java
@@ -28,114 +28,114 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ScrollableMessage}
  */
 public class ScrollableMessageTests extends BaseRpcTests {
-    
-	@Override
-	protected RPCMessage createMessage() {
-		ScrollableMessage msg = new ScrollableMessage();
-		
-		msg.setTimeout(TestValues.GENERAL_INT);
-		msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST);
-		msg.setScrollableMessageBody(TestValues.GENERAL_STRING);
-		msg.setCancelID(TestValues.GENERAL_INTEGER);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SCROLLABLE_MESSAGE.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(ScrollableMessage.KEY_SCROLLABLE_MESSAGE_BODY, TestValues.GENERAL_STRING);
-			result.put(ScrollableMessage.KEY_TIMEOUT, TestValues.GENERAL_INT);
-			result.put(ScrollableMessage.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
-			result.put(ScrollableMessage.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {    	
-    	// Test Values
-		String  testBody    = ( (ScrollableMessage) msg ).getScrollableMessageBody();
-		Integer testTimeout = ( (ScrollableMessage) msg ).getTimeout();
-		List<SoftButton> testSoftButtons = ( (ScrollableMessage) msg ).getSoftButtons();
-		Integer testCancelID = ( (ScrollableMessage) msg ).getCancelID();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testBody);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTON_LIST.size(), testSoftButtons.size());
-		for (int i = 0; i < TestValues.GENERAL_SOFTBUTTON_LIST.size(); i++) {
-			assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTON_LIST.get(i), testSoftButtons.get(i));
-		}
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID);
-
-		// Invalid/Null Tests
-		ScrollableMessage msg = new ScrollableMessage();
-		assertNotNull(TestValues.NOT_NULL, msg);
-
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getScrollableMessageBody());
-		assertNull(TestValues.NULL, msg.getTimeout());
-		assertNull(TestValues.NULL, msg.getSoftButtons());
-		assertNull(TestValues.NULL, msg.getCancelID());
-	}
+
+    @Override
+    protected RPCMessage createMessage() {
+        ScrollableMessage msg = new ScrollableMessage();
+
+        msg.setTimeout(TestValues.GENERAL_INT);
+        msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST);
+        msg.setScrollableMessageBody(TestValues.GENERAL_STRING);
+        msg.setCancelID(TestValues.GENERAL_INTEGER);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SCROLLABLE_MESSAGE.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(ScrollableMessage.KEY_SCROLLABLE_MESSAGE_BODY, TestValues.GENERAL_STRING);
+            result.put(ScrollableMessage.KEY_TIMEOUT, TestValues.GENERAL_INT);
+            result.put(ScrollableMessage.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
+            result.put(ScrollableMessage.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        String testBody = ((ScrollableMessage) msg).getScrollableMessageBody();
+        Integer testTimeout = ((ScrollableMessage) msg).getTimeout();
+        List<SoftButton> testSoftButtons = ((ScrollableMessage) msg).getSoftButtons();
+        Integer testCancelID = ((ScrollableMessage) msg).getCancelID();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testBody);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTON_LIST.size(), testSoftButtons.size());
+        for (int i = 0; i < TestValues.GENERAL_SOFTBUTTON_LIST.size(); i++) {
+            assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTON_LIST.get(i), testSoftButtons.get(i));
+        }
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID);
+
+        // Invalid/Null Tests
+        ScrollableMessage msg = new ScrollableMessage();
+        assertNotNull(TestValues.NOT_NULL, msg);
+
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getScrollableMessageBody());
+        assertNull(TestValues.NULL, msg.getTimeout());
+        assertNull(TestValues.NULL, msg.getSoftButtons());
+        assertNull(TestValues.NULL, msg.getCancelID());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ScrollableMessage cmd = new ScrollableMessage(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ScrollableMessage.KEY_SCROLLABLE_MESSAGE_BODY), cmd.getScrollableMessageBody());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ScrollableMessage.KEY_TIMEOUT), cmd.getTimeout());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ScrollableMessage.KEY_CANCEL_ID), cmd.getCancelID());
-
-			JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ScrollableMessage.KEY_SOFT_BUTTONS);
-			List<SoftButton> softButtonList = new ArrayList<SoftButton>();
-			for (int index = 0; index < softButtonArray.length(); index++) {
-				SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) );
-				softButtonList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ScrollableMessage cmd = new ScrollableMessage(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ScrollableMessage.KEY_SCROLLABLE_MESSAGE_BODY), cmd.getScrollableMessageBody());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ScrollableMessage.KEY_TIMEOUT), cmd.getTimeout());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ScrollableMessage.KEY_CANCEL_ID), cmd.getCancelID());
+
+            JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ScrollableMessage.KEY_SOFT_BUTTONS);
+            List<SoftButton> softButtonList = new ArrayList<SoftButton>();
+            for (int index = 0; index < softButtonArray.length(); index++) {
+                SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index)));
+                softButtonList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java
index 090818308..e31ab22bf 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendHapticDataTests.java
@@ -26,67 +26,67 @@ import static junit.framework.TestCase.assertNull;
 
 public class SendHapticDataTests extends BaseRpcTests {
 
-	private SendHapticData msg;
-
-	@Override
-	protected RPCMessage createMessage(){
-		msg = new SendHapticData();
-
-		List<HapticRect> list = new ArrayList<>();
-		list.add(TestValues.GENERAL_HAPTIC_RECT);
-
-		msg.setHapticRectData(list);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType(){
-		return FunctionID.SEND_HAPTIC_DATA.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		JSONObject result = new JSONObject();
-
-		JSONArray jsonArray = new JSONArray();
-		try {
-			jsonArray.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HAPTIC_RECT.getStore()));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-
-		try {
-			result.put(SendHapticData.KEY_HAPTIC_RECT_DATA, jsonArray);
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		List<HapticRect> list = msg.getHapticRectData();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_HAPTIC_RECT, list.get(0));
-
-		// Invalid/Null Tests
-		SendHapticData msg = new SendHapticData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getHapticRectData());
-	}
+    private SendHapticData msg;
+
+    @Override
+    protected RPCMessage createMessage() {
+        msg = new SendHapticData();
+
+        List<HapticRect> list = new ArrayList<>();
+        list.add(TestValues.GENERAL_HAPTIC_RECT);
+
+        msg.setHapticRectData(list);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SEND_HAPTIC_DATA.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        JSONArray jsonArray = new JSONArray();
+        try {
+            jsonArray.put(JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_HAPTIC_RECT.getStore()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        try {
+            result.put(SendHapticData.KEY_HAPTIC_RECT_DATA, jsonArray);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        List<HapticRect> list = msg.getHapticRectData();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_HAPTIC_RECT, list.get(0));
+
+        // Invalid/Null Tests
+        SendHapticData msg = new SendHapticData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getHapticRectData());
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
index 14867c7f6..0120d8279 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
@@ -26,81 +26,81 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SendLocation}
  */
 public class SendLocationTests extends BaseRpcTests {
-	
+
     @Override
-    protected RPCMessage createMessage(){
-    	SendLocation msg = new SendLocation();
-    	
-    	msg.setLatitudeDegrees(TestValues.GENERAL_DOUBLE);
-    	msg.setLongitudeDegrees(TestValues.GENERAL_DOUBLE);
-    	msg.setLocationName(TestValues.GENERAL_STRING);
-    	msg.setLocationDescription(TestValues.GENERAL_STRING);
-    	msg.setPhoneNumber(TestValues.GENERAL_STRING);
-    	msg.setAddressLines(TestValues.GENERAL_STRING_LIST);
-    	msg.setLocationImage(TestValues.GENERAL_IMAGE);
-    	
-    	return msg;
+    protected RPCMessage createMessage() {
+        SendLocation msg = new SendLocation();
+
+        msg.setLatitudeDegrees(TestValues.GENERAL_DOUBLE);
+        msg.setLongitudeDegrees(TestValues.GENERAL_DOUBLE);
+        msg.setLocationName(TestValues.GENERAL_STRING);
+        msg.setLocationDescription(TestValues.GENERAL_STRING);
+        msg.setPhoneNumber(TestValues.GENERAL_STRING);
+        msg.setAddressLines(TestValues.GENERAL_STRING_LIST);
+        msg.setLocationImage(TestValues.GENERAL_IMAGE);
+
+        return msg;
     }
-    
+
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
-    
+
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SEND_LOCATION.toString();
     }
-    
+
     @Override
-    protected JSONObject getExpectedParameters (int sdlVersion){
-    	JSONObject result = new JSONObject();
-    	
-    	try {
-    		result.put(SendLocation.KEY_LAT_DEGREES, TestValues.GENERAL_DOUBLE);
-    		result.put(SendLocation.KEY_LON_DEGREES, TestValues.GENERAL_DOUBLE);
-    		result.put(SendLocation.KEY_LOCATION_NAME, TestValues.GENERAL_STRING);
-    		result.put(SendLocation.KEY_LOCATION_DESCRIPTION, TestValues.GENERAL_STRING);
-    		result.put(SendLocation.KEY_PHONE_NUMBER, TestValues.GENERAL_STRING);
-    		result.put(SendLocation.KEY_LOCATION_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON());
-    		result.put(SendLocation.KEY_ADDRESS_LINES, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
-    	} catch(JSONException e){
-    		fail(TestValues.JSON_FAIL);
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(SendLocation.KEY_LAT_DEGREES, TestValues.GENERAL_DOUBLE);
+            result.put(SendLocation.KEY_LON_DEGREES, TestValues.GENERAL_DOUBLE);
+            result.put(SendLocation.KEY_LOCATION_NAME, TestValues.GENERAL_STRING);
+            result.put(SendLocation.KEY_LOCATION_DESCRIPTION, TestValues.GENERAL_STRING);
+            result.put(SendLocation.KEY_PHONE_NUMBER, TestValues.GENERAL_STRING);
+            result.put(SendLocation.KEY_LOCATION_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON());
+            result.put(SendLocation.KEY_ADDRESS_LINES, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
-    	
-    	return result;
+
+        return result;
     }
-    
+
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {    	
-    	// Test Values
-    	Double latitude = ((SendLocation) msg).getLatitudeDegrees();
+    public void testRpcValues() {
+        // Test Values
+        Double latitude = ((SendLocation) msg).getLatitudeDegrees();
         Double longitude = ((SendLocation) msg).getLongitudeDegrees();
         String locationName = ((SendLocation) msg).getLocationName();
-    	String locationDesc = ((SendLocation) msg).getLocationDescription();
-    	String phoneNumber = ((SendLocation) msg).getPhoneNumber();
-    	List<String> addressLines = ((SendLocation) msg).getAddressLines();
-    	Image locationImage = ((SendLocation) msg).getLocationImage();
-    	
-    	// Valid Tests
+        String locationDesc = ((SendLocation) msg).getLocationDescription();
+        String phoneNumber = ((SendLocation) msg).getPhoneNumber();
+        List<String> addressLines = ((SendLocation) msg).getAddressLines();
+        Image locationImage = ((SendLocation) msg).getLocationImage();
+
+        // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, longitude);
         assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, latitude);
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, locationDesc);
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, locationName);
-    	assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, phoneNumber);
-    	assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, addressLines));
-    	assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, locationImage));
-    
-    	// Invalid/Null Tests
-    	SendLocation msg = new SendLocation();
-    	assertNotNull(TestValues.NOT_NULL, msg);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, locationDesc);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, locationName);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, phoneNumber);
+        assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, addressLines));
+        assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, locationImage));
+
+        // Invalid/Null Tests
+        SendLocation msg = new SendLocation();
+        assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
 
         assertNull(TestValues.NULL, msg.getLatitudeDegrees());
@@ -116,40 +116,40 @@ public class SendLocationTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull("Command object is null", commandJson);
-    	
-    	try {
-    		Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-    		SendLocation cmd = new SendLocation(hash);
-    		assertNotNull(TestValues.NOT_NULL, cmd);
-    		
-    		JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-    		assertNotNull(TestValues.NOT_NULL, body);
-    		
-    		// Test everything in the json body.
-    		assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-    		
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LAT_DEGREES), cmd.getLatitudeDegrees());
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LON_DEGREES), cmd.getLongitudeDegrees());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_LOCATION_NAME), cmd.getLocationName());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_LOCATION_DESCRIPTION), cmd.getLocationDescription());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_PHONE_NUMBER), cmd.getPhoneNumber());
-			
-			List<String> addressList = JsonUtils.readStringListFromJsonObject(parameters, SendLocation.KEY_ADDRESS_LINES);
-			List<String> testList = cmd.getAddressLines();
-			assertEquals(TestValues.MATCH, addressList.size(), testList.size());
-			assertTrue(TestValues.TRUE, Validator.validateStringList(addressList, testList));
-			
-			JSONObject cmdIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, SendLocation.KEY_LOCATION_IMAGE);
-			Image reference = new Image(JsonRPCMarshaller.deserializeJSONObject(cmdIcon));
-			assertTrue(TestValues.TRUE, Validator.validateImage(reference, cmd.getLocationImage()));
-			
-    	} catch (JSONException e) {
-    		fail(TestValues.JSON_FAIL);
-		}
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull("Command object is null", commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SendLocation cmd = new SendLocation(hash);
+            assertNotNull(TestValues.NOT_NULL, cmd);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LAT_DEGREES), cmd.getLatitudeDegrees());
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, SendLocation.KEY_LON_DEGREES), cmd.getLongitudeDegrees());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_LOCATION_NAME), cmd.getLocationName());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_LOCATION_DESCRIPTION), cmd.getLocationDescription());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SendLocation.KEY_PHONE_NUMBER), cmd.getPhoneNumber());
+
+            List<String> addressList = JsonUtils.readStringListFromJsonObject(parameters, SendLocation.KEY_ADDRESS_LINES);
+            List<String> testList = cmd.getAddressLines();
+            assertEquals(TestValues.MATCH, addressList.size(), testList.size());
+            assertTrue(TestValues.TRUE, Validator.validateStringList(addressList, testList));
+
+            JSONObject cmdIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, SendLocation.KEY_LOCATION_IMAGE);
+            Image reference = new Image(JsonRPCMarshaller.deserializeJSONObject(cmdIcon));
+            assertTrue(TestValues.TRUE, Validator.validateImage(reference, cmd.getLocationImage()));
+
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java
index 2b47f7837..7430f4174 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java
@@ -22,86 +22,86 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SetAppIcon}
  */
 public class SetAppIconTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		SetAppIcon msg = new SetAppIcon();
-
-		msg.setSdlFileName(TestValues.GENERAL_STRING);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SET_APP_ICON.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(SetAppIcon.KEY_SDL_FILE_NAME, TestValues.GENERAL_STRING);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {    	
-    	// Test Values
-		String copy = ( (SetAppIcon) msg ).getSdlFileName();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, copy);
-	
-		// Invalid/Null Tests
-		SetAppIcon msg = new SetAppIcon();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getSdlFileName());
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        SetAppIcon msg = new SetAppIcon();
+
+        msg.setSdlFileName(TestValues.GENERAL_STRING);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SET_APP_ICON.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(SetAppIcon.KEY_SDL_FILE_NAME, TestValues.GENERAL_STRING);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        String copy = ((SetAppIcon) msg).getSdlFileName();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, copy);
+
+        // Invalid/Null Tests
+        SetAppIcon msg = new SetAppIcon();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getSdlFileName());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SetAppIcon cmd = new SetAppIcon(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetAppIcon.KEY_SDL_FILE_NAME), cmd.getSdlFileName());
-			
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SetAppIcon cmd = new SetAppIcon(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetAppIcon.KEY_SDL_FILE_NAME), cmd.getSdlFileName());
+
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java
index 2db06fa01..fb71fda20 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetCloudAppPropertiesTests.java
@@ -14,7 +14,7 @@ import static junit.framework.TestCase.fail;
 public class SetCloudAppPropertiesTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         SetCloudAppProperties msg = new SetCloudAppProperties();
 
         msg.setProperties(TestValues.GENERAL_CLOUDAPPPROPERTIES);
@@ -23,22 +23,22 @@ public class SetCloudAppPropertiesTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SET_CLOUD_APP_PROPERTIES.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(SetCloudAppProperties.KEY_PROPERTIES, TestValues.GENERAL_CLOUDAPPPROPERTIES.serializeJSON());
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java
index f5a080295..97607f56c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java
@@ -26,106 +26,106 @@ import static junit.framework.TestCase.fail;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SetDisplayLayout}
  */
 public class SetDisplayLayoutTests extends BaseRpcTests {
-	
-	@Override
-	protected RPCMessage createMessage() {
-		SetDisplayLayout msg = new SetDisplayLayout();
-
-		msg.setDisplayLayout(TestValues.GENERAL_STRING);
-		msg.setDayColorScheme(TestValues.GENERAL_DAYCOLORSCHEME);
-		msg.setNightColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SET_DISPLAY_LAYOUT.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(SetDisplayLayout.KEY_DISPLAY_LAYOUT, TestValues.GENERAL_STRING);
-			result.put(SetDisplayLayout.KEY_DAY_COLOR_SCHEME, TestValues.JSON_DAYCOLORSCHEME);
-			result.put(SetDisplayLayout.KEY_NIGHT_COLOR_SCHEME, TestValues.JSON_NIGHTCOLORSCHEME);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {   
-    	// Test Values
-		String testDisplayLayout = ( (SetDisplayLayout) msg ).getDisplayLayout();
-		TemplateColorScheme testDayColorScheme = ( (SetDisplayLayout) msg).getDayColorScheme();
-		TemplateColorScheme testNightColorScheme = ( (SetDisplayLayout) msg).getNightColorScheme();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testDisplayLayout);
-		assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_DAYCOLORSCHEME, testDayColorScheme));
-		assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME, testNightColorScheme));
-		
-		// Invalid/Null Tests
-		SetDisplayLayout msg = new SetDisplayLayout();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getDisplayLayout());
-		assertNull(TestValues.NULL, msg.getDayColorScheme());
-		assertNull(TestValues.NULL, msg.getNightColorScheme());
-	}
-	
-	/**
+
+    @Override
+    protected RPCMessage createMessage() {
+        SetDisplayLayout msg = new SetDisplayLayout();
+
+        msg.setDisplayLayout(TestValues.GENERAL_STRING);
+        msg.setDayColorScheme(TestValues.GENERAL_DAYCOLORSCHEME);
+        msg.setNightColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SET_DISPLAY_LAYOUT.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(SetDisplayLayout.KEY_DISPLAY_LAYOUT, TestValues.GENERAL_STRING);
+            result.put(SetDisplayLayout.KEY_DAY_COLOR_SCHEME, TestValues.JSON_DAYCOLORSCHEME);
+            result.put(SetDisplayLayout.KEY_NIGHT_COLOR_SCHEME, TestValues.JSON_NIGHTCOLORSCHEME);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        String testDisplayLayout = ((SetDisplayLayout) msg).getDisplayLayout();
+        TemplateColorScheme testDayColorScheme = ((SetDisplayLayout) msg).getDayColorScheme();
+        TemplateColorScheme testNightColorScheme = ((SetDisplayLayout) msg).getNightColorScheme();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testDisplayLayout);
+        assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_DAYCOLORSCHEME, testDayColorScheme));
+        assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(TestValues.GENERAL_NIGHTCOLORSCHEME, testNightColorScheme));
+
+        // Invalid/Null Tests
+        SetDisplayLayout msg = new SetDisplayLayout();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getDisplayLayout());
+        assertNull(TestValues.NULL, msg.getDayColorScheme());
+        assertNull(TestValues.NULL, msg.getNightColorScheme());
+    }
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SetDisplayLayout cmd = new SetDisplayLayout(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.MATCH, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetDisplayLayout.KEY_DISPLAY_LAYOUT), cmd.getDisplayLayout());
-
-
-			JSONObject dayColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayout.KEY_DAY_COLOR_SCHEME);
-			TemplateColorScheme dayColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(dayColorSchemeObj));
-			assertTrue(TestValues.TRUE,  Validator.validateTemplateColorScheme(dayColorScheme, cmd.getDayColorScheme()) );
-
-			JSONObject nightColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayout.KEY_DAY_COLOR_SCHEME);
-			TemplateColorScheme nightColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(nightColorSchemeObj));
-			assertTrue(TestValues.TRUE,  Validator.validateTemplateColorScheme(nightColorScheme, cmd.getDayColorScheme()) );
-
-			
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SetDisplayLayout cmd = new SetDisplayLayout(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.MATCH, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetDisplayLayout.KEY_DISPLAY_LAYOUT), cmd.getDisplayLayout());
+
+
+            JSONObject dayColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayout.KEY_DAY_COLOR_SCHEME);
+            TemplateColorScheme dayColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(dayColorSchemeObj));
+            assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(dayColorScheme, cmd.getDayColorScheme()));
+
+            JSONObject nightColorSchemeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayout.KEY_DAY_COLOR_SCHEME);
+            TemplateColorScheme nightColorScheme = new TemplateColorScheme(JsonRPCMarshaller.deserializeJSONObject(nightColorSchemeObj));
+            assertTrue(TestValues.TRUE, Validator.validateTemplateColorScheme(nightColorScheme, cmd.getDayColorScheme()));
+
+
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java
index abf889104..849ed07dc 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java
@@ -32,155 +32,155 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SetGlobalProperties}
  */
 public class SetGlobalPropertiesTests extends BaseRpcTests {
-		
-	@Override
-	protected RPCMessage createMessage() {
-		SetGlobalProperties msg = new SetGlobalProperties();
-		
-		msg.setVrHelpTitle(TestValues.GENERAL_STRING);
-		msg.setMenuTitle(TestValues.GENERAL_STRING);
-		msg.setMenuIcon(TestValues.GENERAL_IMAGE);
-		msg.setVrHelp(TestValues.GENERAL_VRHELPITEM_LIST);
-		msg.setHelpPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
-		msg.setTimeoutPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
-		msg.setKeyboardProperties(TestValues.GENERAL_KEYBOARDPROPERTIES);
-		msg.setMenuLayout(TestValues.GENERAL_MENU_LAYOUT);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SET_GLOBAL_PROPERTIES.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-		
-		try {			
-			result.put(SetGlobalProperties.KEY_MENU_ICON, TestValues.JSON_IMAGE);
-			result.put(SetGlobalProperties.KEY_VR_HELP, TestValues.JSON_VRHELPITEMS);
-			result.put(SetGlobalProperties.KEY_HELP_PROMPT, TestValues.JSON_TTSCHUNKS);
-			result.put(SetGlobalProperties.KEY_TIMEOUT_PROMPT, TestValues.JSON_TTSCHUNKS);
-			result.put(SetGlobalProperties.KEY_MENU_TITLE, TestValues.GENERAL_STRING);
-			result.put(SetGlobalProperties.KEY_VR_HELP_TITLE, TestValues.GENERAL_STRING);
-			result.put(SetGlobalProperties.KEY_KEYBOARD_PROPERTIES, TestValues.JSON_KEYBOARDPROPERTIES);
-			result.put(SetGlobalProperties.KEY_MENU_LAYOUT, TestValues.GENERAL_MENU_LAYOUT);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () { 
-    	// Test Values
-    	Image              testImage       = ( (SetGlobalProperties) msg ).getMenuIcon();
-    	String             testVrHelpTitle = ( (SetGlobalProperties) msg ).getVrHelpTitle();
-    	String             testMenuTitle   = ( (SetGlobalProperties) msg ).getMenuTitle();
-		List<TTSChunk>     testHelpPrompt  = ( (SetGlobalProperties) msg ).getHelpPrompt();
-		List<TTSChunk>     testTimeout     = ( (SetGlobalProperties) msg ).getTimeoutPrompt();
-		List<VrHelpItem>   testVrHelpItems = ( (SetGlobalProperties) msg ).getVrHelp();
-		KeyboardProperties testKeyboardProperties = ( (SetGlobalProperties) msg ).getKeyboardProperties();
-		MenuLayout testMenuLayout = ( (SetGlobalProperties) msg ).getMenuLayout();
-		
-		// Valid Tests		
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testMenuTitle);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testVrHelpTitle);
-		assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testImage));
-		assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(TestValues.GENERAL_VRHELPITEM_LIST, testVrHelpItems));
-		assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testHelpPrompt));
-		assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTimeout));
-		assertTrue(TestValues.TRUE, Validator.validateKeyboardProperties(TestValues.GENERAL_KEYBOARDPROPERTIES, testKeyboardProperties));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_MENU_LAYOUT, testMenuLayout);
-		
-		// Invalid/Null Tests
-		SetGlobalProperties msg = new SetGlobalProperties();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getMenuIcon());
-		assertNull(TestValues.NULL, msg.getMenuTitle());
-		assertNull(TestValues.NULL, msg.getVrHelp());
-		assertNull(TestValues.NULL, msg.getHelpPrompt());
-		assertNull(TestValues.NULL, msg.getTimeoutPrompt());
-		assertNull(TestValues.NULL, msg.getKeyboardProperties());
-		assertNull(TestValues.NULL, msg.getVrHelpTitle());
-		assertNull(TestValues.NULL, msg.getMenuLayout());
-	}
-	
-	/**
+
+    @Override
+    protected RPCMessage createMessage() {
+        SetGlobalProperties msg = new SetGlobalProperties();
+
+        msg.setVrHelpTitle(TestValues.GENERAL_STRING);
+        msg.setMenuTitle(TestValues.GENERAL_STRING);
+        msg.setMenuIcon(TestValues.GENERAL_IMAGE);
+        msg.setVrHelp(TestValues.GENERAL_VRHELPITEM_LIST);
+        msg.setHelpPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
+        msg.setTimeoutPrompt(TestValues.GENERAL_TTSCHUNK_LIST);
+        msg.setKeyboardProperties(TestValues.GENERAL_KEYBOARDPROPERTIES);
+        msg.setMenuLayout(TestValues.GENERAL_MENU_LAYOUT);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SET_GLOBAL_PROPERTIES.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(SetGlobalProperties.KEY_MENU_ICON, TestValues.JSON_IMAGE);
+            result.put(SetGlobalProperties.KEY_VR_HELP, TestValues.JSON_VRHELPITEMS);
+            result.put(SetGlobalProperties.KEY_HELP_PROMPT, TestValues.JSON_TTSCHUNKS);
+            result.put(SetGlobalProperties.KEY_TIMEOUT_PROMPT, TestValues.JSON_TTSCHUNKS);
+            result.put(SetGlobalProperties.KEY_MENU_TITLE, TestValues.GENERAL_STRING);
+            result.put(SetGlobalProperties.KEY_VR_HELP_TITLE, TestValues.GENERAL_STRING);
+            result.put(SetGlobalProperties.KEY_KEYBOARD_PROPERTIES, TestValues.JSON_KEYBOARDPROPERTIES);
+            result.put(SetGlobalProperties.KEY_MENU_LAYOUT, TestValues.GENERAL_MENU_LAYOUT);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        Image testImage = ((SetGlobalProperties) msg).getMenuIcon();
+        String testVrHelpTitle = ((SetGlobalProperties) msg).getVrHelpTitle();
+        String testMenuTitle = ((SetGlobalProperties) msg).getMenuTitle();
+        List<TTSChunk> testHelpPrompt = ((SetGlobalProperties) msg).getHelpPrompt();
+        List<TTSChunk> testTimeout = ((SetGlobalProperties) msg).getTimeoutPrompt();
+        List<VrHelpItem> testVrHelpItems = ((SetGlobalProperties) msg).getVrHelp();
+        KeyboardProperties testKeyboardProperties = ((SetGlobalProperties) msg).getKeyboardProperties();
+        MenuLayout testMenuLayout = ((SetGlobalProperties) msg).getMenuLayout();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testMenuTitle);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testVrHelpTitle);
+        assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testImage));
+        assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(TestValues.GENERAL_VRHELPITEM_LIST, testVrHelpItems));
+        assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testHelpPrompt));
+        assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, testTimeout));
+        assertTrue(TestValues.TRUE, Validator.validateKeyboardProperties(TestValues.GENERAL_KEYBOARDPROPERTIES, testKeyboardProperties));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_MENU_LAYOUT, testMenuLayout);
+
+        // Invalid/Null Tests
+        SetGlobalProperties msg = new SetGlobalProperties();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getMenuIcon());
+        assertNull(TestValues.NULL, msg.getMenuTitle());
+        assertNull(TestValues.NULL, msg.getVrHelp());
+        assertNull(TestValues.NULL, msg.getHelpPrompt());
+        assertNull(TestValues.NULL, msg.getTimeoutPrompt());
+        assertNull(TestValues.NULL, msg.getKeyboardProperties());
+        assertNull(TestValues.NULL, msg.getVrHelpTitle());
+        assertNull(TestValues.NULL, msg.getMenuLayout());
+    }
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SetGlobalProperties cmd = new SetGlobalProperties(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetGlobalProperties.KEY_VR_HELP_TITLE), cmd.getVrHelpTitle());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_TITLE), cmd.getMenuTitle());
-
-			assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_LAYOUT), cmd.getMenuLayout());
-			
-			JSONObject menuIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_ICON);
-			Image referenceMenuIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(menuIcon));
-			assertTrue(TestValues.TRUE, Validator.validateImage(referenceMenuIcon, cmd.getMenuIcon()));
-			
-			JSONObject keyboardProperties = JsonUtils.readJsonObjectFromJsonObject(parameters, SetGlobalProperties.KEY_KEYBOARD_PROPERTIES);
-			KeyboardProperties referenceKeyboardProperties = new KeyboardProperties(JsonRPCMarshaller.deserializeJSONObject(keyboardProperties));
-			assertTrue(TestValues.TRUE, Validator.validateKeyboardProperties(referenceKeyboardProperties, cmd.getKeyboardProperties()));
-			
-			JSONArray helpPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_HELP_PROMPT);
-			List<TTSChunk> helpPromptList = new ArrayList<TTSChunk>();
-			for (int index = 0; index < helpPromptArray.length(); index++) {
-	        	TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)helpPromptArray.get(index)) );
-	        	helpPromptList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateTtsChunks(helpPromptList, cmd.getHelpPrompt()));
-			
-			JSONArray timeoutPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_TIMEOUT_PROMPT);
-			List<TTSChunk> timeoutPromptList = new ArrayList<TTSChunk>();
-			for (int index = 0; index < timeoutPromptArray.length(); index++) {
-				TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)timeoutPromptArray.get(index)) );
-				timeoutPromptList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateTtsChunks(timeoutPromptList, cmd.getTimeoutPrompt()));
-			
-			JSONArray vrHelpArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_VR_HELP);
-			List<VrHelpItem> vrHelpList = new ArrayList<VrHelpItem>();
-			for (int index = 0; index < vrHelpArray.length(); index++) {
-				VrHelpItem chunk = new VrHelpItem(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)vrHelpArray.get(index)) );
-				vrHelpList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(vrHelpList, cmd.getVrHelp()));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SetGlobalProperties cmd = new SetGlobalProperties(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetGlobalProperties.KEY_VR_HELP_TITLE), cmd.getVrHelpTitle());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_TITLE), cmd.getMenuTitle());
+
+            assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_LAYOUT), cmd.getMenuLayout());
+
+            JSONObject menuIcon = JsonUtils.readJsonObjectFromJsonObject(parameters, SetGlobalProperties.KEY_MENU_ICON);
+            Image referenceMenuIcon = new Image(JsonRPCMarshaller.deserializeJSONObject(menuIcon));
+            assertTrue(TestValues.TRUE, Validator.validateImage(referenceMenuIcon, cmd.getMenuIcon()));
+
+            JSONObject keyboardProperties = JsonUtils.readJsonObjectFromJsonObject(parameters, SetGlobalProperties.KEY_KEYBOARD_PROPERTIES);
+            KeyboardProperties referenceKeyboardProperties = new KeyboardProperties(JsonRPCMarshaller.deserializeJSONObject(keyboardProperties));
+            assertTrue(TestValues.TRUE, Validator.validateKeyboardProperties(referenceKeyboardProperties, cmd.getKeyboardProperties()));
+
+            JSONArray helpPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_HELP_PROMPT);
+            List<TTSChunk> helpPromptList = new ArrayList<TTSChunk>();
+            for (int index = 0; index < helpPromptArray.length(); index++) {
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) helpPromptArray.get(index)));
+                helpPromptList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(helpPromptList, cmd.getHelpPrompt()));
+
+            JSONArray timeoutPromptArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_TIMEOUT_PROMPT);
+            List<TTSChunk> timeoutPromptList = new ArrayList<TTSChunk>();
+            for (int index = 0; index < timeoutPromptArray.length(); index++) {
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) timeoutPromptArray.get(index)));
+                timeoutPromptList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(timeoutPromptList, cmd.getTimeoutPrompt()));
+
+            JSONArray vrHelpArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetGlobalProperties.KEY_VR_HELP);
+            List<VrHelpItem> vrHelpList = new ArrayList<VrHelpItem>();
+            for (int index = 0; index < vrHelpArray.length(); index++) {
+                VrHelpItem chunk = new VrHelpItem(JsonRPCMarshaller.deserializeJSONObject((JSONObject) vrHelpArray.get(index)));
+                vrHelpList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateVrHelpItems(vrHelpList, cmd.getVrHelp()));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java
index 727b9e209..73a3f82e9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetInteriorVehicleDataTests.java
@@ -31,7 +31,7 @@ import static junit.framework.TestCase.fail;
 public class SetInteriorVehicleDataTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         SetInteriorVehicleData msg = new SetInteriorVehicleData();
 
         msg.setModuleData(TestValues.GENERAL_MODULEDATA);
@@ -40,22 +40,22 @@ public class SetInteriorVehicleDataTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SET_INTERIOR_VEHICLE_DATA.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(SetInteriorVehicleData.KEY_MODULE_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore()));
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -66,9 +66,9 @@ public class SetInteriorVehicleDataTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        ModuleData testModuleData = ( (SetInteriorVehicleData) msg ).getModuleData();
+        ModuleData testModuleData = ((SetInteriorVehicleData) msg).getModuleData();
 
         // Valid Tests
         assertTrue(TestValues.TRUE, Validator.validateModuleData(TestValues.GENERAL_MODULEDATA, testModuleData));
@@ -85,7 +85,7 @@ public class SetInteriorVehicleDataTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
@@ -105,7 +105,7 @@ public class SetInteriorVehicleDataTests extends BaseRpcTests {
             ModuleData referenceModuleData = new ModuleData(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(parameters, SetInteriorVehicleData.KEY_MODULE_DATA)));
 
             assertTrue(TestValues.TRUE, Validator.validateModuleData(referenceModuleData, cmd.getModuleData()));
-        }catch (JSONException e) {
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
index c4937aa95..7f22c0701 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
@@ -27,174 +27,174 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SetMediaClockTimer}
  */
 public class SetMediaClockTimerTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		SetMediaClockTimer msg = new SetMediaClockTimer();
-
-		msg.setStartTime(TestValues.GENERAL_STARTTIME);
-		msg.setEndTime(TestValues.GENERAL_STARTTIME);
-		msg.setUpdateMode(TestValues.GENERAL_UPDATEMODE);
-		msg.setAudioStreamingIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SET_MEDIA_CLOCK_TIMER.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(SetMediaClockTimer.KEY_START_TIME, TestValues.JSON_STARTTIME);
-			result.put(SetMediaClockTimer.KEY_END_TIME, TestValues.JSON_STARTTIME);
-			result.put(SetMediaClockTimer.KEY_UPDATE_MODE, TestValues.GENERAL_UPDATEMODE);
-			result.put(SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {  
-    	// Test Values
-		StartTime  testStartTime  = ( (SetMediaClockTimer) msg ).getStartTime();
-		StartTime  testEndTime    = ( (SetMediaClockTimer) msg ).getEndTime();
-		UpdateMode testUpdateMode = ( (SetMediaClockTimer) msg ).getUpdateMode();
-		AudioStreamingIndicator testAudioStreamingIndicator = ( (SetMediaClockTimer) msg ).getAudioStreamingIndicator();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_UPDATEMODE, testUpdateMode);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, testAudioStreamingIndicator);
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(TestValues.GENERAL_STARTTIME, testStartTime));
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(TestValues.GENERAL_STARTTIME, testEndTime));
-		
-		// Invalid/Null Tests
-		SetMediaClockTimer msg = new SetMediaClockTimer();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getStartTime());
-		assertNull(TestValues.NULL, msg.getEndTime());
-		assertNull(TestValues.NULL, msg.getUpdateMode());
-		assertNull(TestValues.NULL, msg.getAudioStreamingIndicator());
-	}
-
-	/**
-	 * Test static initializers
-	 */
-	@Test
-	public void testInitializers(){
-		Integer timeInterval1 = 5000;
-		StartTime startTime1 = new StartTime(timeInterval1);
-		Integer timeInterval2 = 7000;
-		StartTime startTime2 = new StartTime(timeInterval2);
-		SetMediaClockTimer msg;
-
-		msg = SetMediaClockTimer.countUpFromStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-		assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTUP);
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
-
-		msg = SetMediaClockTimer.countUpFromStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-		assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTUP);
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
-
-		msg = SetMediaClockTimer.countDownFromStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-		assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTDOWN);
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
-
-		msg = SetMediaClockTimer.countDownFromStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-		assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTDOWN);
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
-
-		msg = SetMediaClockTimer.pauseWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-		assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE);
-		assertNull(TestValues.NULL, msg.getStartTime());
-		assertNull(TestValues.NULL, msg.getEndTime());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
-
-		msg = SetMediaClockTimer.updatePauseWithNewStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-		assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE);
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
-
-		msg = SetMediaClockTimer.updatePauseWithNewStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-		assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE);
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
-		assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
-
-		msg = SetMediaClockTimer.resumeWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-		assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.RESUME);
-		assertNull(TestValues.NULL, msg.getStartTime());
-		assertNull(TestValues.NULL, msg.getEndTime());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
-
-		msg = SetMediaClockTimer.clearWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
-		assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.CLEAR);
-		assertNull(TestValues.NULL, msg.getStartTime());
-		assertNull(TestValues.NULL, msg.getEndTime());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
-	}
-	
-	/**
+    @Override
+    protected RPCMessage createMessage() {
+        SetMediaClockTimer msg = new SetMediaClockTimer();
+
+        msg.setStartTime(TestValues.GENERAL_STARTTIME);
+        msg.setEndTime(TestValues.GENERAL_STARTTIME);
+        msg.setUpdateMode(TestValues.GENERAL_UPDATEMODE);
+        msg.setAudioStreamingIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SET_MEDIA_CLOCK_TIMER.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(SetMediaClockTimer.KEY_START_TIME, TestValues.JSON_STARTTIME);
+            result.put(SetMediaClockTimer.KEY_END_TIME, TestValues.JSON_STARTTIME);
+            result.put(SetMediaClockTimer.KEY_UPDATE_MODE, TestValues.GENERAL_UPDATEMODE);
+            result.put(SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        StartTime testStartTime = ((SetMediaClockTimer) msg).getStartTime();
+        StartTime testEndTime = ((SetMediaClockTimer) msg).getEndTime();
+        UpdateMode testUpdateMode = ((SetMediaClockTimer) msg).getUpdateMode();
+        AudioStreamingIndicator testAudioStreamingIndicator = ((SetMediaClockTimer) msg).getAudioStreamingIndicator();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_UPDATEMODE, testUpdateMode);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, testAudioStreamingIndicator);
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(TestValues.GENERAL_STARTTIME, testStartTime));
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(TestValues.GENERAL_STARTTIME, testEndTime));
+
+        // Invalid/Null Tests
+        SetMediaClockTimer msg = new SetMediaClockTimer();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getStartTime());
+        assertNull(TestValues.NULL, msg.getEndTime());
+        assertNull(TestValues.NULL, msg.getUpdateMode());
+        assertNull(TestValues.NULL, msg.getAudioStreamingIndicator());
+    }
+
+    /**
+     * Test static initializers
+     */
+    @Test
+    public void testInitializers() {
+        Integer timeInterval1 = 5000;
+        StartTime startTime1 = new StartTime(timeInterval1);
+        Integer timeInterval2 = 7000;
+        StartTime startTime2 = new StartTime(timeInterval2);
+        SetMediaClockTimer msg;
+
+        msg = SetMediaClockTimer.countUpFromStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+        assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTUP);
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+        msg = SetMediaClockTimer.countUpFromStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+        assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTUP);
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+        msg = SetMediaClockTimer.countDownFromStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+        assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTDOWN);
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+        msg = SetMediaClockTimer.countDownFromStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+        assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.COUNTDOWN);
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+        msg = SetMediaClockTimer.pauseWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+        assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE);
+        assertNull(TestValues.NULL, msg.getStartTime());
+        assertNull(TestValues.NULL, msg.getEndTime());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+        msg = SetMediaClockTimer.updatePauseWithNewStartTimeInterval(timeInterval1, timeInterval2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+        assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE);
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+        msg = SetMediaClockTimer.updatePauseWithNewStartTime(startTime1, startTime2, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+        assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.PAUSE);
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime1, msg.getStartTime()));
+        assertTrue(TestValues.TRUE, Validator.validateStartTime(startTime2, msg.getEndTime()));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+        msg = SetMediaClockTimer.resumeWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+        assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.RESUME);
+        assertNull(TestValues.NULL, msg.getStartTime());
+        assertNull(TestValues.NULL, msg.getEndTime());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+
+        msg = SetMediaClockTimer.clearWithPlayPauseIndicator(TestValues.GENERAL_AUDIO_STREAMING_INDICATOR);
+        assertEquals(TestValues.MATCH, msg.getUpdateMode(), UpdateMode.CLEAR);
+        assertNull(TestValues.NULL, msg.getStartTime());
+        assertNull(TestValues.NULL, msg.getEndTime());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_AUDIO_STREAMING_INDICATOR, msg.getAudioStreamingIndicator());
+    }
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SetMediaClockTimer cmd = new SetMediaClockTimer(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			JSONObject startTime = JsonUtils.readJsonObjectFromJsonObject(parameters, SetMediaClockTimer.KEY_START_TIME);
-			StartTime referenceStartTime = new StartTime(JsonRPCMarshaller.deserializeJSONObject(startTime));
-			assertTrue(TestValues.TRUE, Validator.validateStartTime(referenceStartTime, cmd.getStartTime()));
-			
-			JSONObject endTime = JsonUtils.readJsonObjectFromJsonObject(parameters, SetMediaClockTimer.KEY_END_TIME);
-			StartTime referenceEndTime = new StartTime(JsonRPCMarshaller.deserializeJSONObject(endTime));
-			assertTrue(TestValues.TRUE, Validator.validateStartTime(referenceEndTime, cmd.getEndTime()));
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetMediaClockTimer.KEY_UPDATE_MODE), cmd.getUpdateMode().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR), cmd.getAudioStreamingIndicator().toString());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SetMediaClockTimer cmd = new SetMediaClockTimer(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            JSONObject startTime = JsonUtils.readJsonObjectFromJsonObject(parameters, SetMediaClockTimer.KEY_START_TIME);
+            StartTime referenceStartTime = new StartTime(JsonRPCMarshaller.deserializeJSONObject(startTime));
+            assertTrue(TestValues.TRUE, Validator.validateStartTime(referenceStartTime, cmd.getStartTime()));
+
+            JSONObject endTime = JsonUtils.readJsonObjectFromJsonObject(parameters, SetMediaClockTimer.KEY_END_TIME);
+            StartTime referenceEndTime = new StartTime(JsonRPCMarshaller.deserializeJSONObject(endTime));
+            assertTrue(TestValues.TRUE, Validator.validateStartTime(referenceEndTime, cmd.getEndTime()));
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetMediaClockTimer.KEY_UPDATE_MODE), cmd.getUpdateMode().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SetMediaClockTimer.KEY_AUDIO_STREAMING_INDICATOR), cmd.getAudioStreamingIndicator().toString());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java
index 27d876f14..db0c88440 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowAppMenuTests.java
@@ -62,81 +62,81 @@ import static junit.framework.TestCase.fail;
  */
 public class ShowAppMenuTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		ShowAppMenu msg = new ShowAppMenu();
-		msg.setMenuID(TestValues.GENERAL_INTEGER);
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SHOW_APP_MENU.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(ShowAppMenu.KEY_MENU_ID, TestValues.GENERAL_INTEGER);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		Integer copy = ( (ShowAppMenu) msg ).getMenuID();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, copy);
-
-		// Invalid/Null Tests
-		ShowAppMenu msg = new ShowAppMenu();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.MATCH, msg.getMenuID());
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ShowAppMenu cmd = new ShowAppMenu(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			Integer serviceID = JsonUtils.readIntegerFromJsonObject(parameters, ShowAppMenu.KEY_MENU_ID);
-			assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, serviceID);
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        ShowAppMenu msg = new ShowAppMenu();
+        msg.setMenuID(TestValues.GENERAL_INTEGER);
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SHOW_APP_MENU.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(ShowAppMenu.KEY_MENU_ID, TestValues.GENERAL_INTEGER);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        Integer copy = ((ShowAppMenu) msg).getMenuID();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, copy);
+
+        // Invalid/Null Tests
+        ShowAppMenu msg = new ShowAppMenu();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.MATCH, msg.getMenuID());
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ShowAppMenu cmd = new ShowAppMenu(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            Integer serviceID = JsonUtils.readIntegerFromJsonObject(parameters, ShowAppMenu.KEY_MENU_ID);
+            assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, serviceID);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
index 848d40a1f..e454fcf7a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
@@ -29,99 +29,99 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ShowConstantTbt}
  */
 public class ShowConstantTbtTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		ShowConstantTbt msg = new ShowConstantTbt();
-		
-		msg.setDistanceToManeuver(TestValues.GENERAL_DOUBLE);
-		msg.setDistanceToManeuverScale(TestValues.GENERAL_DOUBLE);
-		msg.setEta(TestValues.GENERAL_STRING);
-		msg.setManeuverComplete(true);
-		msg.setNavigationText1(TestValues.GENERAL_STRING);
-		msg.setNavigationText2(TestValues.GENERAL_STRING);
-		msg.setNextTurnIcon(TestValues.GENERAL_IMAGE);
-		msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST);
-		msg.setTimeToDestination(TestValues.GENERAL_STRING);
-		msg.setTotalDistance(TestValues.GENERAL_STRING);
-		msg.setTurnIcon(TestValues.GENERAL_IMAGE);
-		
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SHOW_CONSTANT_TBT.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-        
-        try {			
-			result.put(ShowConstantTbt.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
-        	result.put(ShowConstantTbt.KEY_ETA, TestValues.GENERAL_STRING);
-        	result.put(ShowConstantTbt.KEY_MANEUVER_COMPLETE, true);
-        	result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE, TestValues.GENERAL_DOUBLE);
-        	result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE, TestValues.GENERAL_DOUBLE);
-        	result.put(ShowConstantTbt.KEY_TEXT1, TestValues.GENERAL_STRING);
-        	result.put(ShowConstantTbt.KEY_TEXT2, TestValues.GENERAL_STRING);
-        	result.put(ShowConstantTbt.KEY_TIME_TO_DESTINATION, TestValues.GENERAL_STRING);
-        	result.put(ShowConstantTbt.KEY_TOTAL_DISTANCE, TestValues.GENERAL_STRING);
-        	result.put(ShowConstantTbt.KEY_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON());
-        	result.put(ShowConstantTbt.KEY_NEXT_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON());
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+    @Override
+    protected RPCMessage createMessage() {
+        ShowConstantTbt msg = new ShowConstantTbt();
+
+        msg.setDistanceToManeuver(TestValues.GENERAL_DOUBLE);
+        msg.setDistanceToManeuverScale(TestValues.GENERAL_DOUBLE);
+        msg.setEta(TestValues.GENERAL_STRING);
+        msg.setManeuverComplete(true);
+        msg.setNavigationText1(TestValues.GENERAL_STRING);
+        msg.setNavigationText2(TestValues.GENERAL_STRING);
+        msg.setNextTurnIcon(TestValues.GENERAL_IMAGE);
+        msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST);
+        msg.setTimeToDestination(TestValues.GENERAL_STRING);
+        msg.setTotalDistance(TestValues.GENERAL_STRING);
+        msg.setTurnIcon(TestValues.GENERAL_IMAGE);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SHOW_CONSTANT_TBT.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(ShowConstantTbt.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
+            result.put(ShowConstantTbt.KEY_ETA, TestValues.GENERAL_STRING);
+            result.put(ShowConstantTbt.KEY_MANEUVER_COMPLETE, true);
+            result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE, TestValues.GENERAL_DOUBLE);
+            result.put(ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE, TestValues.GENERAL_DOUBLE);
+            result.put(ShowConstantTbt.KEY_TEXT1, TestValues.GENERAL_STRING);
+            result.put(ShowConstantTbt.KEY_TEXT2, TestValues.GENERAL_STRING);
+            result.put(ShowConstantTbt.KEY_TIME_TO_DESTINATION, TestValues.GENERAL_STRING);
+            result.put(ShowConstantTbt.KEY_TOTAL_DISTANCE, TestValues.GENERAL_STRING);
+            result.put(ShowConstantTbt.KEY_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON());
+            result.put(ShowConstantTbt.KEY_NEXT_MANEUVER_IMAGE, TestValues.GENERAL_IMAGE.serializeJSON());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
-        
-		return result;
-	}
-	
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {
-		// Test Values
-    	Double  testScale                = ((ShowConstantTbt) msg).getDistanceToManeuverScale();
-    	Double  testDistance             = ((ShowConstantTbt) msg).getDistanceToManeuver();
-    	String  testEta                  = ((ShowConstantTbt) msg).getEta();
-		String  testTimeToDestination    = ((ShowConstantTbt) msg).getTimeToDestination();
-		String  testTotalDistance        = ((ShowConstantTbt) msg).getTotalDistance();
-		String  testNavText2             = ((ShowConstantTbt) msg).getNavigationText2();
-		String  testNavText1             = ((ShowConstantTbt) msg).getNavigationText1();
-		Boolean testManeuverComplete     = ((ShowConstantTbt) msg).getManeuverComplete();
-		Image   testTurnIcon             = ((ShowConstantTbt) msg).getTurnIcon();
-		Image   testNextTurnIcon         = ((ShowConstantTbt) msg).getNextTurnIcon();
-		List<SoftButton> testSoftButtons = ((ShowConstantTbt) msg).getSoftButtons();
-		
-		// Valid Test
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTimeToDestination);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, testScale);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNavText1);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNavText2);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testEta);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTotalDistance);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, testDistance);
-		assertTrue(TestValues.TRUE, testManeuverComplete);
-		assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons));
-		assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testTurnIcon));
-		assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testNextTurnIcon));
-		
-		// Invalid/Null Tests
-		ShowConstantTbt msg = new ShowConstantTbt();
-		assertNotNull(TestValues.NOT_NULL, msg);
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        Double testScale = ((ShowConstantTbt) msg).getDistanceToManeuverScale();
+        Double testDistance = ((ShowConstantTbt) msg).getDistanceToManeuver();
+        String testEta = ((ShowConstantTbt) msg).getEta();
+        String testTimeToDestination = ((ShowConstantTbt) msg).getTimeToDestination();
+        String testTotalDistance = ((ShowConstantTbt) msg).getTotalDistance();
+        String testNavText2 = ((ShowConstantTbt) msg).getNavigationText2();
+        String testNavText1 = ((ShowConstantTbt) msg).getNavigationText1();
+        Boolean testManeuverComplete = ((ShowConstantTbt) msg).getManeuverComplete();
+        Image testTurnIcon = ((ShowConstantTbt) msg).getTurnIcon();
+        Image testNextTurnIcon = ((ShowConstantTbt) msg).getNextTurnIcon();
+        List<SoftButton> testSoftButtons = ((ShowConstantTbt) msg).getSoftButtons();
+
+        // Valid Test
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTimeToDestination);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, testScale);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNavText1);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testNavText2);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testEta);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTotalDistance);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_DOUBLE, testDistance);
+        assertTrue(TestValues.TRUE, testManeuverComplete);
+        assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons));
+        assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testTurnIcon));
+        assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testNextTurnIcon));
+
+        // Invalid/Null Tests
+        ShowConstantTbt msg = new ShowConstantTbt();
+        assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
-        
+
         assertNull(TestValues.NULL, msg.getSoftButtons());
         assertNull(TestValues.NULL, msg.getNavigationText1());
         assertNull(TestValues.NULL, msg.getNavigationText2());
@@ -133,53 +133,53 @@ public class ShowConstantTbtTests extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getTimeToDestination());
         assertNull(TestValues.NULL, msg.getTotalDistance());
         assertNull(TestValues.NULL, msg.getTurnIcon());
-	}
-	
-	/**
+    }
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-    	try {
-    		Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-    		ShowConstantTbt cmd = new ShowConstantTbt(hash);
-    		JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_ETA), cmd.getEta());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_COMPLETE), cmd.getManeuverComplete());
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE), cmd.getDistanceToManeuver());
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE), cmd.getDistanceToManeuverScale());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT1), cmd.getNavigationText1());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT2), cmd.getNavigationText2());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TIME_TO_DESTINATION), cmd.getTimeToDestination());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TOTAL_DISTANCE), cmd.getTotalDistance());
-			
-			JSONObject icon1 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_IMAGE);
-			Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(icon1));
-			assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, cmd.getTurnIcon()));
-			
-			JSONObject icon2 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTbt.KEY_NEXT_MANEUVER_IMAGE);
-			Image refIcon2 = new Image(JsonRPCMarshaller.deserializeJSONObject(icon2));
-			assertTrue(TestValues.TRUE, Validator.validateImage(refIcon2, cmd.getNextTurnIcon()));
-			
-			JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ShowConstantTbt.KEY_SOFT_BUTTONS);
-			List<SoftButton> softButtonList = new ArrayList<SoftButton>();
-			for (int index = 0; index < softButtonArray.length(); index++) {
-				SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) );
-				softButtonList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
-    	} catch (JSONException e) {
-    		fail(TestValues.JSON_FAIL);
-		}
-	}
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ShowConstantTbt cmd = new ShowConstantTbt(hash);
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_ETA), cmd.getEta());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_COMPLETE), cmd.getManeuverComplete());
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE), cmd.getDistanceToManeuver());
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_DISTANCE_SCALE), cmd.getDistanceToManeuverScale());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT1), cmd.getNavigationText1());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TEXT2), cmd.getNavigationText2());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TIME_TO_DESTINATION), cmd.getTimeToDestination());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, ShowConstantTbt.KEY_TOTAL_DISTANCE), cmd.getTotalDistance());
+
+            JSONObject icon1 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTbt.KEY_MANEUVER_IMAGE);
+            Image refIcon1 = new Image(JsonRPCMarshaller.deserializeJSONObject(icon1));
+            assertTrue(TestValues.TRUE, Validator.validateImage(refIcon1, cmd.getTurnIcon()));
+
+            JSONObject icon2 = JsonUtils.readJsonObjectFromJsonObject(parameters, ShowConstantTbt.KEY_NEXT_MANEUVER_IMAGE);
+            Image refIcon2 = new Image(JsonRPCMarshaller.deserializeJSONObject(icon2));
+            assertTrue(TestValues.TRUE, Validator.validateImage(refIcon2, cmd.getNextTurnIcon()));
+
+            JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ShowConstantTbt.KEY_SOFT_BUTTONS);
+            List<SoftButton> softButtonList = new ArrayList<SoftButton>();
+            for (int index = 0; index < softButtonArray.length(); index++) {
+                SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index)));
+                softButtonList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
index 14585c439..03396cd3f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
@@ -32,184 +32,184 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.Show}
  */
 public class ShowTests extends BaseRpcTests {
 
     @Override
-	protected RPCMessage createMessage() {
-		Show msg = new Show();
-
-		msg.setMainField1(TestValues.GENERAL_STRING);
-		msg.setMainField2(TestValues.GENERAL_STRING);
-		msg.setMainField3(TestValues.GENERAL_STRING);
-		msg.setMainField4(TestValues.GENERAL_STRING);
-		msg.setStatusBar(TestValues.GENERAL_STRING);
-		msg.setMediaTrack(TestValues.GENERAL_STRING);
-		msg.setTemplateTitle(TestValues.GENERAL_STRING);
-		msg.setAlignment(TestValues.GENERAL_TEXTALIGNMENT);
-		msg.setGraphic(TestValues.GENERAL_IMAGE);
-		msg.setSecondaryGraphic(TestValues.GENERAL_IMAGE);
-		msg.setCustomPresets(TestValues.GENERAL_STRING_LIST);
-		msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST);
-		msg.setMetadataTags(TestValues.GENERAL_METADATASTRUCT);
-		msg.setWindowID(TestValues.GENERAL_INT);
-		msg.setTemplateConfiguration(TestValues.GENERAL_TEMPLATE_CONFIGURATION);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SHOW.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(Show.KEY_MAIN_FIELD_1, TestValues.GENERAL_STRING);
-			result.put(Show.KEY_MAIN_FIELD_2, TestValues.GENERAL_STRING);
-			result.put(Show.KEY_MAIN_FIELD_3, TestValues.GENERAL_STRING);
-			result.put(Show.KEY_MAIN_FIELD_4, TestValues.GENERAL_STRING);
-			result.put(Show.KEY_STATUS_BAR,  TestValues.GENERAL_STRING);
-			result.put(Show.KEY_MEDIA_TRACK, TestValues.GENERAL_STRING);
-			result.put(Show.KEY_TEMPLATE_TITLE, TestValues.GENERAL_STRING);
-			result.put(Show.KEY_GRAPHIC, TestValues.JSON_IMAGE);
-			result.put(Show.KEY_SECONDARY_GRAPHIC, TestValues.JSON_IMAGE);
-			result.put(Show.KEY_ALIGNMENT, TestValues.GENERAL_TEXTALIGNMENT);
-			result.put(Show.KEY_CUSTOM_PRESETS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
-			result.put(Show.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
-			result.put(Show.KEY_METADATA_TAGS, TestValues.GENERAL_METADATASTRUCT.serializeJSON());
-			result.put(Show.KEY_WINDOW_ID, TestValues.GENERAL_INT);
-			result.put(Show.KEY_TEMPLATE_CONFIGURATION, TestValues.GENERAL_TEMPLATE_CONFIGURATION.serializeJSON());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	@Test
-	public void testSoftButtons () {
-		// TestValues
-		String testTrack     = ( (Show) msg ).getMediaTrack();
-		String templateTitle     = ( (Show) msg ).getTemplateTitle();
-		Image  testGraphic2  = ( (Show) msg ).getSecondaryGraphic();
-		Image  testGraphic1  = ( (Show) msg ).getGraphic();
-		String testStatusBar = ( (Show) msg ).getStatusBar();
-		String testText1     = ( (Show) msg ).getMainField1();
-		String testText2     = ( (Show) msg ).getMainField2();
-		String testText3     = ( (Show) msg ).getMainField3();
-		String testText4     = ( (Show) msg ).getMainField4();
-		TextAlignment    testAlignment     = ( (Show) msg ).getAlignment();
-		List<SoftButton> testSoftButtons   = ( (Show) msg ).getSoftButtons();
-		List<String>     testCustomPresets = ( (Show) msg ).getCustomPresets();
-		MetadataTags testMetadata      = ( (Show) msg ).getMetadataTags();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTrack);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, templateTitle);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTALIGNMENT, testAlignment);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testStatusBar);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText1);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText2);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText3);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText4);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), testCustomPresets.size());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_METADATASTRUCT, testMetadata);
-		assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons));
-		assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testGraphic2));
-		assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testGraphic1));
-
-		// Invalid/Null Tests
-		Show msg = new Show();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getMainField1());
-		assertNull(TestValues.NULL, msg.getMainField2());
-		assertNull(TestValues.NULL, msg.getMainField3());
-		assertNull(TestValues.NULL, msg.getMainField4());
-		assertNull(TestValues.NULL, msg.getStatusBar());
-		assertNull(TestValues.NULL, msg.getAlignment());
-		assertNull(TestValues.NULL, msg.getGraphic());
-		assertNull(TestValues.NULL, msg.getSecondaryGraphic());
-		assertNull(TestValues.NULL, msg.getCustomPresets());
-		assertNull(TestValues.NULL, msg.getMediaTrack());
-		assertNull(TestValues.NULL, msg.getTemplateTitle());
-		assertNull(TestValues.NULL, msg.getSoftButtons());
-		assertNull(TestValues.NULL, msg.getMetadataTags());
-		assertNull(TestValues.NULL, msg.getWindowID());
-		assertNull(TestValues.NULL, msg.getTemplateConfiguration());
-	}
-
-	/**
+    protected RPCMessage createMessage() {
+        Show msg = new Show();
+
+        msg.setMainField1(TestValues.GENERAL_STRING);
+        msg.setMainField2(TestValues.GENERAL_STRING);
+        msg.setMainField3(TestValues.GENERAL_STRING);
+        msg.setMainField4(TestValues.GENERAL_STRING);
+        msg.setStatusBar(TestValues.GENERAL_STRING);
+        msg.setMediaTrack(TestValues.GENERAL_STRING);
+        msg.setTemplateTitle(TestValues.GENERAL_STRING);
+        msg.setAlignment(TestValues.GENERAL_TEXTALIGNMENT);
+        msg.setGraphic(TestValues.GENERAL_IMAGE);
+        msg.setSecondaryGraphic(TestValues.GENERAL_IMAGE);
+        msg.setCustomPresets(TestValues.GENERAL_STRING_LIST);
+        msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST);
+        msg.setMetadataTags(TestValues.GENERAL_METADATASTRUCT);
+        msg.setWindowID(TestValues.GENERAL_INT);
+        msg.setTemplateConfiguration(TestValues.GENERAL_TEMPLATE_CONFIGURATION);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SHOW.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(Show.KEY_MAIN_FIELD_1, TestValues.GENERAL_STRING);
+            result.put(Show.KEY_MAIN_FIELD_2, TestValues.GENERAL_STRING);
+            result.put(Show.KEY_MAIN_FIELD_3, TestValues.GENERAL_STRING);
+            result.put(Show.KEY_MAIN_FIELD_4, TestValues.GENERAL_STRING);
+            result.put(Show.KEY_STATUS_BAR, TestValues.GENERAL_STRING);
+            result.put(Show.KEY_MEDIA_TRACK, TestValues.GENERAL_STRING);
+            result.put(Show.KEY_TEMPLATE_TITLE, TestValues.GENERAL_STRING);
+            result.put(Show.KEY_GRAPHIC, TestValues.JSON_IMAGE);
+            result.put(Show.KEY_SECONDARY_GRAPHIC, TestValues.JSON_IMAGE);
+            result.put(Show.KEY_ALIGNMENT, TestValues.GENERAL_TEXTALIGNMENT);
+            result.put(Show.KEY_CUSTOM_PRESETS, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
+            result.put(Show.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
+            result.put(Show.KEY_METADATA_TAGS, TestValues.GENERAL_METADATASTRUCT.serializeJSON());
+            result.put(Show.KEY_WINDOW_ID, TestValues.GENERAL_INT);
+            result.put(Show.KEY_TEMPLATE_CONFIGURATION, TestValues.GENERAL_TEMPLATE_CONFIGURATION.serializeJSON());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    @Test
+    public void testSoftButtons() {
+        // TestValues
+        String testTrack = ((Show) msg).getMediaTrack();
+        String templateTitle = ((Show) msg).getTemplateTitle();
+        Image testGraphic2 = ((Show) msg).getSecondaryGraphic();
+        Image testGraphic1 = ((Show) msg).getGraphic();
+        String testStatusBar = ((Show) msg).getStatusBar();
+        String testText1 = ((Show) msg).getMainField1();
+        String testText2 = ((Show) msg).getMainField2();
+        String testText3 = ((Show) msg).getMainField3();
+        String testText4 = ((Show) msg).getMainField4();
+        TextAlignment testAlignment = ((Show) msg).getAlignment();
+        List<SoftButton> testSoftButtons = ((Show) msg).getSoftButtons();
+        List<String> testCustomPresets = ((Show) msg).getCustomPresets();
+        MetadataTags testMetadata = ((Show) msg).getMetadataTags();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testTrack);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, templateTitle);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_TEXTALIGNMENT, testAlignment);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testStatusBar);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText1);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText2);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText3);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText4);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), testCustomPresets.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_METADATASTRUCT, testMetadata);
+        assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtons));
+        assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testGraphic2));
+        assertTrue(TestValues.TRUE, Validator.validateImage(TestValues.GENERAL_IMAGE, testGraphic1));
+
+        // Invalid/Null Tests
+        Show msg = new Show();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getMainField1());
+        assertNull(TestValues.NULL, msg.getMainField2());
+        assertNull(TestValues.NULL, msg.getMainField3());
+        assertNull(TestValues.NULL, msg.getMainField4());
+        assertNull(TestValues.NULL, msg.getStatusBar());
+        assertNull(TestValues.NULL, msg.getAlignment());
+        assertNull(TestValues.NULL, msg.getGraphic());
+        assertNull(TestValues.NULL, msg.getSecondaryGraphic());
+        assertNull(TestValues.NULL, msg.getCustomPresets());
+        assertNull(TestValues.NULL, msg.getMediaTrack());
+        assertNull(TestValues.NULL, msg.getTemplateTitle());
+        assertNull(TestValues.NULL, msg.getSoftButtons());
+        assertNull(TestValues.NULL, msg.getMetadataTags());
+        assertNull(TestValues.NULL, msg.getWindowID());
+        assertNull(TestValues.NULL, msg.getTemplateConfiguration());
+    }
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(),getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			Show cmd = new Show(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			JSONObject graphic = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_GRAPHIC);
-			Image referenceGraphic = new Image(JsonRPCMarshaller.deserializeJSONObject(graphic));
-			assertTrue(TestValues.TRUE, Validator.validateImage(referenceGraphic, cmd.getGraphic()));
-
-			List<String> customPresetsList = JsonUtils.readStringListFromJsonObject(parameters, Show.KEY_CUSTOM_PRESETS);
-			List<String> testPresetsList = cmd.getCustomPresets();
-			assertEquals(TestValues.MATCH, customPresetsList.size(), testPresetsList.size());
-			assertTrue(TestValues.TRUE, Validator.validateStringList(customPresetsList, testPresetsList));
-
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_1), cmd.getMainField1());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_2), cmd.getMainField2());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_3), cmd.getMainField3());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_4), cmd.getMainField4());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_STATUS_BAR), cmd.getStatusBar());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_ALIGNMENT), cmd.getAlignment().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MEDIA_TRACK), cmd.getMediaTrack());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_TEMPLATE_TITLE), cmd.getTemplateTitle());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_METADATA_TAGS), cmd.getMetadataTags());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Show.KEY_WINDOW_ID), cmd.getWindowID());
-
-			JSONObject templateConfiguration = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_TEMPLATE_CONFIGURATION);
-			TemplateConfiguration refTemplateConfiguration = new TemplateConfiguration(JsonRPCMarshaller.deserializeJSONObject(templateConfiguration));
-			assertTrue(TestValues.TRUE, Validator.validateTemplateConfiguration(refTemplateConfiguration, cmd.getTemplateConfiguration()));
-
-			JSONObject secondaryGraphic = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_SECONDARY_GRAPHIC);
-			Image referenceSecondaryGraphic = new Image(JsonRPCMarshaller.deserializeJSONObject(secondaryGraphic));
-			assertTrue(TestValues.TRUE, Validator.validateImage(referenceSecondaryGraphic, cmd.getSecondaryGraphic()));
-
-			JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Show.KEY_SOFT_BUTTONS);
-			List<SoftButton> softButtonList = new ArrayList<SoftButton>();
-			for (int index = 0; index < softButtonArray.length(); index++) {
-				SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) );
-				softButtonList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
-
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            Show cmd = new Show(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            JSONObject graphic = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_GRAPHIC);
+            Image referenceGraphic = new Image(JsonRPCMarshaller.deserializeJSONObject(graphic));
+            assertTrue(TestValues.TRUE, Validator.validateImage(referenceGraphic, cmd.getGraphic()));
+
+            List<String> customPresetsList = JsonUtils.readStringListFromJsonObject(parameters, Show.KEY_CUSTOM_PRESETS);
+            List<String> testPresetsList = cmd.getCustomPresets();
+            assertEquals(TestValues.MATCH, customPresetsList.size(), testPresetsList.size());
+            assertTrue(TestValues.TRUE, Validator.validateStringList(customPresetsList, testPresetsList));
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_1), cmd.getMainField1());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_2), cmd.getMainField2());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_3), cmd.getMainField3());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MAIN_FIELD_4), cmd.getMainField4());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_STATUS_BAR), cmd.getStatusBar());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_ALIGNMENT), cmd.getAlignment().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_MEDIA_TRACK), cmd.getMediaTrack());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_TEMPLATE_TITLE), cmd.getTemplateTitle());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Show.KEY_METADATA_TAGS), cmd.getMetadataTags());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Show.KEY_WINDOW_ID), cmd.getWindowID());
+
+            JSONObject templateConfiguration = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_TEMPLATE_CONFIGURATION);
+            TemplateConfiguration refTemplateConfiguration = new TemplateConfiguration(JsonRPCMarshaller.deserializeJSONObject(templateConfiguration));
+            assertTrue(TestValues.TRUE, Validator.validateTemplateConfiguration(refTemplateConfiguration, cmd.getTemplateConfiguration()));
+
+            JSONObject secondaryGraphic = JsonUtils.readJsonObjectFromJsonObject(parameters, Show.KEY_SECONDARY_GRAPHIC);
+            Image referenceSecondaryGraphic = new Image(JsonRPCMarshaller.deserializeJSONObject(secondaryGraphic));
+            assertTrue(TestValues.TRUE, Validator.validateImage(referenceSecondaryGraphic, cmd.getSecondaryGraphic()));
+
+            JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Show.KEY_SOFT_BUTTONS);
+            List<SoftButton> softButtonList = new ArrayList<SoftButton>();
+            for (int index = 0; index < softButtonArray.length(); index++) {
+                SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index)));
+                softButtonList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
+
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java
index def35eae2..c4abeb086 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java
@@ -25,121 +25,120 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.Slider}
  */
 public class SliderTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		Slider msg = new Slider();
-
-		msg.setNumTicks(TestValues.GENERAL_INT);
-		msg.setPosition(TestValues.GENERAL_INT);
-		msg.setTimeout(TestValues.GENERAL_INT);
-		msg.setSliderHeader(TestValues.GENERAL_STRING);
-		msg.setSliderFooter(TestValues.GENERAL_STRING_LIST);
-		msg.setCancelID(TestValues.GENERAL_INTEGER);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SLIDER.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(Slider.KEY_SLIDER_HEADER, TestValues.GENERAL_STRING);
-			result.put(Slider.KEY_SLIDER_FOOTER, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
-			result.put(Slider.KEY_POSITION, TestValues.GENERAL_INT);
-			result.put(Slider.KEY_TIMEOUT, TestValues.GENERAL_INT);
-			result.put(Slider.KEY_NUM_TICKS, TestValues.GENERAL_INT);
-			result.put(Slider.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-	
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () { 
-    	// Test Values
-    	Integer testNumTicks    = ( (Slider) msg ).getNumTicks();
-    	Integer testTimeout     = ( (Slider) msg ).getTimeout();
-    	Integer testPosition    = ( (Slider) msg ).getPosition();
-    	String  testSlider      = ( (Slider) msg ).getSliderHeader();
-    	List<String> testFooter = ( (Slider) msg ).getSliderFooter();
-    	Integer testCancelID = ( (Slider) msg ).getCancelID();
-
-    	// Valid Tests
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testNumTicks);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout);
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testPosition);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testSlider);
-		assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testFooter));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID);
-		    	
-    	// Invalid/Null Tests
-		Slider msg = new Slider();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getSliderHeader());
-		assertNull(TestValues.NULL, msg.getSliderFooter());
-		assertNull(TestValues.NULL, msg.getPosition());
-		assertNull(TestValues.NULL, msg.getTimeout());
-		assertNull(TestValues.NULL, msg.getNumTicks());
-		assertNull(TestValues.NULL, msg.getCancelID());
-	}
-	
-	/**
+    @Override
+    protected RPCMessage createMessage() {
+        Slider msg = new Slider();
+
+        msg.setNumTicks(TestValues.GENERAL_INT);
+        msg.setPosition(TestValues.GENERAL_INT);
+        msg.setTimeout(TestValues.GENERAL_INT);
+        msg.setSliderHeader(TestValues.GENERAL_STRING);
+        msg.setSliderFooter(TestValues.GENERAL_STRING_LIST);
+        msg.setCancelID(TestValues.GENERAL_INTEGER);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SLIDER.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(Slider.KEY_SLIDER_HEADER, TestValues.GENERAL_STRING);
+            result.put(Slider.KEY_SLIDER_FOOTER, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
+            result.put(Slider.KEY_POSITION, TestValues.GENERAL_INT);
+            result.put(Slider.KEY_TIMEOUT, TestValues.GENERAL_INT);
+            result.put(Slider.KEY_NUM_TICKS, TestValues.GENERAL_INT);
+            result.put(Slider.KEY_CANCEL_ID, TestValues.GENERAL_INTEGER);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        Integer testNumTicks = ((Slider) msg).getNumTicks();
+        Integer testTimeout = ((Slider) msg).getTimeout();
+        Integer testPosition = ((Slider) msg).getPosition();
+        String testSlider = ((Slider) msg).getSliderHeader();
+        List<String> testFooter = ((Slider) msg).getSliderFooter();
+        Integer testCancelID = ((Slider) msg).getCancelID();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testNumTicks);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testTimeout);
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testPosition);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testSlider);
+        assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testFooter));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, testCancelID);
+
+        // Invalid/Null Tests
+        Slider msg = new Slider();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getSliderHeader());
+        assertNull(TestValues.NULL, msg.getSliderFooter());
+        assertNull(TestValues.NULL, msg.getPosition());
+        assertNull(TestValues.NULL, msg.getTimeout());
+        assertNull(TestValues.NULL, msg.getNumTicks());
+        assertNull(TestValues.NULL, msg.getCancelID());
+    }
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			Slider cmd = new Slider(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_NUM_TICKS), cmd.getNumTicks());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Slider.KEY_SLIDER_HEADER), cmd.getSliderHeader());
-
-			List<String> sliderFooterList = JsonUtils.readStringListFromJsonObject(parameters, Slider.KEY_SLIDER_FOOTER);
-			List<String> testFooterList = cmd.getSliderFooter();
-			assertEquals(TestValues.MATCH, sliderFooterList.size(), testFooterList.size());
-			assertTrue(TestValues.TRUE, Validator.validateStringList(sliderFooterList, testFooterList));
-			
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_POSITION), cmd.getPosition());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_TIMEOUT), cmd.getTimeout());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_CANCEL_ID), cmd.getCancelID());
-		} 
-		catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }	
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            Slider cmd = new Slider(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_NUM_TICKS), cmd.getNumTicks());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, Slider.KEY_SLIDER_HEADER), cmd.getSliderHeader());
+
+            List<String> sliderFooterList = JsonUtils.readStringListFromJsonObject(parameters, Slider.KEY_SLIDER_FOOTER);
+            List<String> testFooterList = cmd.getSliderFooter();
+            assertEquals(TestValues.MATCH, sliderFooterList.size(), testFooterList.size());
+            assertTrue(TestValues.TRUE, Validator.validateStringList(sliderFooterList, testFooterList));
+
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_POSITION), cmd.getPosition());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_TIMEOUT), cmd.getTimeout());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, Slider.KEY_CANCEL_ID), cmd.getCancelID());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java
index b9c89493f..f66e91312 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java
@@ -28,88 +28,88 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 public class SpeakTests extends BaseRpcTests {
-	
-	@Override
-	protected RPCMessage createMessage() {
-		Speak msg = new Speak();
-
-		msg.setTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SPEAK.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-		
-		try {	        
-			result.put(Speak.KEY_TTS_CHUNKS, TestValues.JSON_TTSCHUNKS);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {       	
-    	// Test Values
-		List<TTSChunk> copy = ( (Speak) msg ).getTtsChunks();
-		
-		// Valid Tests
-	    assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, copy));
-	
-	    // Invalid/Null Tests
-		Speak msg = new Speak();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.MATCH, msg.getTtsChunks());
-	}
+
+    @Override
+    protected RPCMessage createMessage() {
+        Speak msg = new Speak();
+
+        msg.setTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SPEAK.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(Speak.KEY_TTS_CHUNKS, TestValues.JSON_TTSCHUNKS);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        List<TTSChunk> copy = ((Speak) msg).getTtsChunks();
+
+        // Valid Tests
+        assertTrue(TestValues.TRUE, Validator.validateTtsChunks(TestValues.GENERAL_TTSCHUNK_LIST, copy));
+
+        // Invalid/Null Tests
+        Speak msg = new Speak();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.MATCH, msg.getTtsChunks());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			Speak cmd = new Speak(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			
-			JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Speak.KEY_TTS_CHUNKS);
-			List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>();
-			for (int index = 0; index < ttsChunkArray.length(); index++) {
-	        	TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)) );
-	        	ttsChunkList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks()));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            Speak cmd = new Speak(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, Speak.KEY_TTS_CHUNKS);
+            List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>();
+            for (int index = 0; index < ttsChunkArray.length(); index++) {
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsChunkArray.get(index)));
+                ttsChunkList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java
index cb838dc5f..ebd1fbc8c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java
@@ -23,85 +23,85 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SubscribeButton}
  */
 public class SubscribeButtonTests extends BaseRpcTests {
-	
-	@Override
-	protected RPCMessage createMessage() {
-		SubscribeButton msg = new SubscribeButton();
-
-		msg.setButtonName(TestValues.GENERAL_BUTTONNAME);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SUBSCRIBE_BUTTON.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(SubscribeButton.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {
-    	// Test Values
-    	ButtonName testButtonName = ( (SubscribeButton) msg ).getButtonName();
-    	
-    	// Valid Tests   
-    	assertEquals("Data didn't match input data.", TestValues.GENERAL_BUTTONNAME, testButtonName);
-    	
-    	// Invalid/Null Tests
-		SubscribeButton msg = new SubscribeButton();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getButtonName());
-	}
-	
-	/**
+
+    @Override
+    protected RPCMessage createMessage() {
+        SubscribeButton msg = new SubscribeButton();
+
+        msg.setButtonName(TestValues.GENERAL_BUTTONNAME);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SUBSCRIBE_BUTTON.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(SubscribeButton.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        ButtonName testButtonName = ((SubscribeButton) msg).getButtonName();
+
+        // Valid Tests
+        assertEquals("Data didn't match input data.", TestValues.GENERAL_BUTTONNAME, testButtonName);
+
+        // Invalid/Null Tests
+        SubscribeButton msg = new SubscribeButton();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getButtonName());
+    }
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SubscribeButton cmd = new SubscribeButton(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SubscribeButton.KEY_BUTTON_NAME), cmd.getButtonName().toString());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SubscribeButton cmd = new SubscribeButton(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SubscribeButton.KEY_BUTTON_NAME), cmd.getButtonName().toString());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
index 341eb73d4..528eeb128 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
@@ -23,67 +23,67 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SubscribeVehicleData}
  */
 public class SubscribeVehicleDataTests extends BaseRpcTests {
-		
-	@Override
-	protected RPCMessage createMessage() {
-		SubscribeVehicleData msg = new SubscribeVehicleData();
 
-		msg.setSpeed(TestValues.GENERAL_BOOLEAN);
-		msg.setRpm(TestValues.GENERAL_BOOLEAN);
-		msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN);
-		msg.setFuelLevel(TestValues.GENERAL_BOOLEAN);
-		msg.setPrndl(TestValues.GENERAL_BOOLEAN);
-		msg.setTirePressure(TestValues.GENERAL_BOOLEAN);
-		msg.setEngineTorque(TestValues.GENERAL_BOOLEAN);
-		msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN);
-		msg.setOdometer(TestValues.GENERAL_BOOLEAN);
-		msg.setGps(TestValues.GENERAL_BOOLEAN);
-		msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN);
-		msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN);
-		msg.setBeltStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setBodyInformation(TestValues.GENERAL_BOOLEAN);
-		msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setDriverBraking(TestValues.GENERAL_BOOLEAN);
-		msg.setWiperStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN);
-		msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN);
-		msg.setECallInfo(TestValues.GENERAL_BOOLEAN);
-		msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN);
-		msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setMyKey(TestValues.GENERAL_BOOLEAN);
-		msg.setFuelRange(TestValues.GENERAL_BOOLEAN);
-		msg.setTurnSignal(TestValues.GENERAL_BOOLEAN);
-		msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN);
-		msg.setWindowStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setGearStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
-		
-		return msg;
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        SubscribeVehicleData msg = new SubscribeVehicleData();
 
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
+        msg.setSpeed(TestValues.GENERAL_BOOLEAN);
+        msg.setRpm(TestValues.GENERAL_BOOLEAN);
+        msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN);
+        msg.setFuelLevel(TestValues.GENERAL_BOOLEAN);
+        msg.setPrndl(TestValues.GENERAL_BOOLEAN);
+        msg.setTirePressure(TestValues.GENERAL_BOOLEAN);
+        msg.setEngineTorque(TestValues.GENERAL_BOOLEAN);
+        msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN);
+        msg.setOdometer(TestValues.GENERAL_BOOLEAN);
+        msg.setGps(TestValues.GENERAL_BOOLEAN);
+        msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN);
+        msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN);
+        msg.setBeltStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setBodyInformation(TestValues.GENERAL_BOOLEAN);
+        msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setDriverBraking(TestValues.GENERAL_BOOLEAN);
+        msg.setWiperStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN);
+        msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN);
+        msg.setECallInfo(TestValues.GENERAL_BOOLEAN);
+        msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN);
+        msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setMyKey(TestValues.GENERAL_BOOLEAN);
+        msg.setFuelRange(TestValues.GENERAL_BOOLEAN);
+        msg.setTurnSignal(TestValues.GENERAL_BOOLEAN);
+        msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN);
+        msg.setWindowStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setGearStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
 
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SUBSCRIBE_VEHICLE_DATA.toString();
-	}
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SUBSCRIBE_VEHICLE_DATA.toString();
+    }
 
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
 
-		try {
+        try {
             result.put(SubscribeVehicleData.KEY_SPEED, TestValues.GENERAL_BOOLEAN);
             result.put(SubscribeVehicleData.KEY_RPM, TestValues.GENERAL_BOOLEAN);
             result.put(SubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_BOOLEAN);
@@ -117,58 +117,58 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
             result.put(SubscribeVehicleData.KEY_GEAR_STATUS, TestValues.GENERAL_BOOLEAN);
             result.put(SubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN);
             result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
 
-		return result;
-	}
+        // Valid Tests
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getSpeed());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getRpm());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getExternalTemperature());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getFuelLevel());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getPrndl());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getTirePressure());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getEngineTorque());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getEngineOilLife());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getOdometer());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getGps());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getFuelLevelState());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getInstantFuelConsumption());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getBeltStatus());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getBodyInformation());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getDeviceStatus());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getDriverBraking());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getWiperStatus());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getHeadLampStatus());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getAccPedalPosition());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getSteeringWheelAngle());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getECallInfo());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getAirbagStatus());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getEmergencyEvent());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getClusterModeStatus());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getMyKey());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getFuelRange());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getTurnSignal());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getElectronicParkBrakeStatus());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getHandsOffSteering());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getWindowStatus());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getGearStatus());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getStabilityControlsStatus());
+        assertTrue(TestValues.MATCH, ((SubscribeVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
 
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {
-    	
-    	// Valid Tests
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getSpeed());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getRpm());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getExternalTemperature());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getFuelLevel());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getPrndl());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getTirePressure());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getEngineTorque());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getEngineOilLife());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getOdometer());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getGps());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getFuelLevelState());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getInstantFuelConsumption());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getBeltStatus());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getBodyInformation());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getDeviceStatus());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getDriverBraking());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getWiperStatus());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getHeadLampStatus());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getAccPedalPosition());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getSteeringWheelAngle());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getECallInfo());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getAirbagStatus());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getEmergencyEvent());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getClusterModeStatus());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getMyKey());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getFuelRange());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getTurnSignal());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getElectronicParkBrakeStatus());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getHandsOffSteering());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getWindowStatus());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getGearStatus());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getStabilityControlsStatus());
-		assertTrue(TestValues.MATCH,( (SubscribeVehicleData) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-    
-		// Invalid/Null Tests
-		SubscribeVehicleData msg = new SubscribeVehicleData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
+        // Invalid/Null Tests
+        SubscribeVehicleData msg = new SubscribeVehicleData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
 
         assertNull(TestValues.NULL, msg.getAccPedalPosition());
         assertNull(TestValues.NULL, msg.getAirbagStatus());
@@ -203,62 +203,62 @@ public class SubscribeVehicleDataTests extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getGearStatus());
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-	}
-	
+    }
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SubscribeVehicleData cmd = new SubscribeVehicleData(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SubscribeVehicleData cmd = new SubscribeVehicleData(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
 
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_SPEED), cmd.getSpeed());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_RPM), cmd.getRpm());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_PRNDL), cmd.getPrndl());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ODOMETER), cmd.getOdometer());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_GPS), cmd.getGps());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_MY_KEY), cmd.getMyKey());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_SPEED), cmd.getSpeed());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_RPM), cmd.getRpm());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_PRNDL), cmd.getPrndl());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ODOMETER), cmd.getOdometer());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_GPS), cmd.getGps());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_MY_KEY), cmd.getMyKey());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, SubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java
index a28d31bbf..d79b3905b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeWayPointsTests.java
@@ -49,7 +49,7 @@ public class SubscribeWayPointsTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Invalid/Null Tests
         SubscribeWayPoints msg = new SubscribeWayPoints();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -60,7 +60,7 @@ public class SubscribeWayPointsTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubtleAlertTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubtleAlertTests.java
index 7c5a49534..d817c817d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubtleAlertTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubtleAlertTests.java
@@ -83,12 +83,12 @@ public class SubtleAlertTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SUBTLE_ALERT.toString();
     }
 
@@ -115,7 +115,7 @@ public class SubtleAlertTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
         String testAlertText1 = ((SubtleAlert) msg).getAlertText1();
         String testAlertText2 = ((SubtleAlert) msg).getAlertText2();
@@ -152,7 +152,7 @@ public class SubtleAlertTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
@@ -177,25 +177,24 @@ public class SubtleAlertTests extends BaseRpcTests {
             JSONArray ttsChunkArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SubtleAlert.KEY_TTS_CHUNKS);
             List<TTSChunk> ttsChunkList = new ArrayList<TTSChunk>();
             for (int index = 0; index < ttsChunkArray.length(); index++) {
-                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)ttsChunkArray.get(index)) );
+                TTSChunk chunk = new TTSChunk(JsonRPCMarshaller.deserializeJSONObject((JSONObject) ttsChunkArray.get(index)));
                 ttsChunkList.add(chunk);
             }
-            assertTrue(TestValues.TRUE,  Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks()));
+            assertTrue(TestValues.TRUE, Validator.validateTtsChunks(ttsChunkList, cmd.getTtsChunks()));
 
             assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, SubtleAlert.KEY_DURATION), cmd.getDuration());
 
             JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SubtleAlert.KEY_SOFT_BUTTONS);
             List<SoftButton> softButtonList = new ArrayList<SoftButton>();
             for (int index = 0; index < softButtonArray.length(); index++) {
-                SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) );
+                SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index)));
                 softButtonList.add(chunk);
             }
-            assertTrue(TestValues.TRUE,  Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
+            assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
 
             assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, SubtleAlert.KEY_CANCEL_ID), cmd.getCancelID());
 
-        }
-        catch (JSONException e) {
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java
index 973d63713..3f2a1a997 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java
@@ -27,108 +27,108 @@ import static junit.framework.TestCase.fail;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SystemRequest}
  */
 public class SystemRequestTests extends BaseRpcTests {
-    
-	@Override
-	protected RPCMessage createMessage() {
-		SystemRequest msg = new SystemRequest();
-
-		msg.setLegacyData(TestValues.GENERAL_STRING_LIST);
-		msg.setFileName(TestValues.GENERAL_STRING);
-		msg.setRequestType(TestValues.GENERAL_REQUESTTYPE);
-		msg.setRequestSubType(TestValues.GENERAL_STRING);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SYSTEM_REQUEST.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(SystemRequest.KEY_DATA, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
-			result.put(SystemRequest.KEY_FILE_NAME, TestValues.GENERAL_STRING);
-			result.put(SystemRequest.KEY_REQUEST_TYPE, TestValues.GENERAL_REQUESTTYPE);
-			result.put(SystemRequest.KEY_REQUEST_SUB_TYPE, TestValues.GENERAL_STRING);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {
-    	// Test Values
-    	RequestType  testRequestType = ( (SystemRequest) msg ).getRequestType();
-    	String  testRequestSubType   = ( (SystemRequest) msg ).getRequestSubType();
-    	String       testFileName    = ( (SystemRequest) msg ).getFileName();
-    	List<String> testLegacyData  = ( (SystemRequest) msg ).getLegacyData();
-    	
-    	// Valid Tests
-	    assertEquals(TestValues.MATCH, TestValues.GENERAL_REQUESTTYPE, testRequestType);
-	    assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testRequestSubType);
-	    assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testFileName);
-	    assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testLegacyData));
-    	
-    	// Invalid/Null Tests
-		SystemRequest msg = new SystemRequest();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getLegacyData());
-		assertNull(TestValues.NULL, msg.getFileName());
-		assertNull(TestValues.NULL, msg.getRequestType());
-		assertNull(TestValues.NULL, msg.getRequestSubType());
-		assertNull(TestValues.NULL, msg.getBulkData());
-	}
-	
-	/**
+
+    @Override
+    protected RPCMessage createMessage() {
+        SystemRequest msg = new SystemRequest();
+
+        msg.setLegacyData(TestValues.GENERAL_STRING_LIST);
+        msg.setFileName(TestValues.GENERAL_STRING);
+        msg.setRequestType(TestValues.GENERAL_REQUESTTYPE);
+        msg.setRequestSubType(TestValues.GENERAL_STRING);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SYSTEM_REQUEST.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(SystemRequest.KEY_DATA, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
+            result.put(SystemRequest.KEY_FILE_NAME, TestValues.GENERAL_STRING);
+            result.put(SystemRequest.KEY_REQUEST_TYPE, TestValues.GENERAL_REQUESTTYPE);
+            result.put(SystemRequest.KEY_REQUEST_SUB_TYPE, TestValues.GENERAL_STRING);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        RequestType testRequestType = ((SystemRequest) msg).getRequestType();
+        String testRequestSubType = ((SystemRequest) msg).getRequestSubType();
+        String testFileName = ((SystemRequest) msg).getFileName();
+        List<String> testLegacyData = ((SystemRequest) msg).getLegacyData();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_REQUESTTYPE, testRequestType);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testRequestSubType);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testFileName);
+        assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, testLegacyData));
+
+        // Invalid/Null Tests
+        SystemRequest msg = new SystemRequest();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getLegacyData());
+        assertNull(TestValues.NULL, msg.getFileName());
+        assertNull(TestValues.NULL, msg.getRequestType());
+        assertNull(TestValues.NULL, msg.getRequestSubType());
+        assertNull(TestValues.NULL, msg.getBulkData());
+    }
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SystemRequest cmd = new SystemRequest(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_FILE_NAME), cmd.getFileName());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_REQUEST_TYPE), cmd.getRequestType().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_REQUEST_SUB_TYPE), cmd.getRequestSubType());
-
-			List<String> dataList = JsonUtils.readStringListFromJsonObject(parameters, SystemRequest.KEY_DATA);
-			List<String> testDataList = cmd.getLegacyData();
-			assertEquals(TestValues.MATCH, dataList.size(), testDataList.size());
-			assertTrue(TestValues.TRUE, Validator.validateStringList(dataList, testDataList));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }	
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SystemRequest cmd = new SystemRequest(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_FILE_NAME), cmd.getFileName());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_REQUEST_TYPE), cmd.getRequestType().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, SystemRequest.KEY_REQUEST_SUB_TYPE), cmd.getRequestSubType());
+
+            List<String> dataList = JsonUtils.readStringListFromJsonObject(parameters, SystemRequest.KEY_DATA);
+            List<String> testDataList = cmd.getLegacyData();
+            assertEquals(TestValues.MATCH, dataList.size(), testDataList.size());
+            assertTrue(TestValues.TRUE, Validator.validateStringList(dataList, testDataList));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java
index 7b57be8ac..aef04ae7e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnpublishAppServiceTests.java
@@ -62,93 +62,93 @@ import static junit.framework.TestCase.fail;
  */
 public class UnpublishAppServiceTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		UnpublishAppService msg = new UnpublishAppService();
-		msg.setServiceID(TestValues.GENERAL_STRING);
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.UNPUBLISH_APP_SERVICE.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(UnpublishAppService.KEY_SERVICE_ID, TestValues.GENERAL_STRING);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		String copy = ( (UnpublishAppService) msg ).getServiceID();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, copy);
-
-		// Invalid/Null Tests
-		UnpublishAppService msg = new UnpublishAppService();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.MATCH, msg.getServiceID());
-	}
-
-	/**
-	 * Tests constructor with required params
-	 */
-	@Test
-	public void testRequiredParamsConstructor () {
-
-		UnpublishAppService msg = new UnpublishAppService(TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, msg);
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getServiceID());
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			UnpublishAppService cmd = new UnpublishAppService(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			String serviceID = JsonUtils.readStringFromJsonObject(parameters, UnpublishAppService.KEY_SERVICE_ID);
-			assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceID);
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        UnpublishAppService msg = new UnpublishAppService();
+        msg.setServiceID(TestValues.GENERAL_STRING);
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.UNPUBLISH_APP_SERVICE.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(UnpublishAppService.KEY_SERVICE_ID, TestValues.GENERAL_STRING);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        String copy = ((UnpublishAppService) msg).getServiceID();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, copy);
+
+        // Invalid/Null Tests
+        UnpublishAppService msg = new UnpublishAppService();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.MATCH, msg.getServiceID());
+    }
+
+    /**
+     * Tests constructor with required params
+     */
+    @Test
+    public void testRequiredParamsConstructor() {
+
+        UnpublishAppService msg = new UnpublishAppService(TestValues.GENERAL_STRING);
+        assertNotNull(TestValues.NOT_NULL, msg);
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, msg.getServiceID());
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            UnpublishAppService cmd = new UnpublishAppService(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            String serviceID = JsonUtils.readStringFromJsonObject(parameters, UnpublishAppService.KEY_SERVICE_ID);
+            assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceID);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java
index 768a7c27b..08cd129e6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java
@@ -21,63 +21,62 @@ import static junit.framework.TestCase.assertNotNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.UnregisterAppInterface}
  */
 public class UnregisterAppInterfaceTests extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new UnregisterAppInterface();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.UNREGISTER_APP_INTERFACE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {    	
-    	// Invalid/Null Tests
-    	UnregisterAppInterface msg = new UnregisterAppInterface();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        UnregisterAppInterface msg = new UnregisterAppInterface();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			UnregisterAppInterface cmd = new UnregisterAppInterface(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} 
-		catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            UnregisterAppInterface cmd = new UnregisterAppInterface(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java
index 5716f8b84..667d02a77 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java
@@ -23,87 +23,86 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.UnsubscribeButton}
  */
 public class UnsubscribeButtonTests extends BaseRpcTests {
-	
-	@Override
-	protected RPCMessage createMessage() {
-		UnsubscribeButton msg = new UnsubscribeButton();
-
-		msg.setButtonName(TestValues.GENERAL_BUTTONNAME);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.UNSUBSCRIBE_BUTTON.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(UnsubscribeButton.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME);
-			
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () { 
-    	// Test Values
-    	ButtonName testButtonName = ( (UnsubscribeButton) msg ).getButtonName();
-		
-    	// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, testButtonName);
-		
-		// Invalid/Null Tests
-		UnsubscribeButton msg = new UnsubscribeButton();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getButtonName());
+
+    @Override
+    protected RPCMessage createMessage() {
+        UnsubscribeButton msg = new UnsubscribeButton();
+
+        msg.setButtonName(TestValues.GENERAL_BUTTONNAME);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.UNSUBSCRIBE_BUTTON.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(UnsubscribeButton.KEY_BUTTON_NAME, TestValues.GENERAL_BUTTONNAME);
+
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
     }
-	
-	/**
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        ButtonName testButtonName = ((UnsubscribeButton) msg).getButtonName();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONNAME, testButtonName);
+
+        // Invalid/Null Tests
+        UnsubscribeButton msg = new UnsubscribeButton();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getButtonName());
+    }
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			UnsubscribeButton cmd = new UnsubscribeButton(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, UnsubscribeButton.KEY_BUTTON_NAME), cmd.getButtonName().toString());
-		} 
-		catch (JSONException e) {
-			e.printStackTrace();
-		}    	
-    }	
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            UnsubscribeButton cmd = new UnsubscribeButton(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, UnsubscribeButton.KEY_BUTTON_NAME), cmd.getButtonName().toString());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
index 2ea0dae9b..cfe2548f3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
@@ -25,68 +25,68 @@ import static junit.framework.TestCase.fail;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.UnsubscribeVehicleData}
  */
 public class UnsubscribeVehicleDataTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		UnsubscribeVehicleData msg = new UnsubscribeVehicleData();
+    @Override
+    protected RPCMessage createMessage() {
+        UnsubscribeVehicleData msg = new UnsubscribeVehicleData();
 
-		msg.setSpeed(TestValues.GENERAL_BOOLEAN);
-		msg.setRpm(TestValues.GENERAL_BOOLEAN);
-		msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN);
-		msg.setFuelLevel(TestValues.GENERAL_BOOLEAN);
-		msg.setPrndl(TestValues.GENERAL_BOOLEAN);
-		msg.setTirePressure(TestValues.GENERAL_BOOLEAN);
-		msg.setEngineTorque(TestValues.GENERAL_BOOLEAN);
-		msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN);
-		msg.setOdometer(TestValues.GENERAL_BOOLEAN);
-		msg.setGps(TestValues.GENERAL_BOOLEAN);
-		msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN);
-		msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN);
-		msg.setBeltStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setBodyInformation(TestValues.GENERAL_BOOLEAN);
-		msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setDriverBraking(TestValues.GENERAL_BOOLEAN);
-		msg.setWiperStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN);
-		msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN);
-		msg.setECallInfo(TestValues.GENERAL_BOOLEAN);
-		msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN);
-		msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setMyKey(TestValues.GENERAL_BOOLEAN);
-		msg.setFuelRange(TestValues.GENERAL_BOOLEAN);
-		msg.setTurnSignal(TestValues.GENERAL_BOOLEAN);
-		msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setCloudAppVehicleID(TestValues.GENERAL_BOOLEAN);
-		msg.setGearStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN);
-		msg.setWindowStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN);
-		msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
+        msg.setSpeed(TestValues.GENERAL_BOOLEAN);
+        msg.setRpm(TestValues.GENERAL_BOOLEAN);
+        msg.setExternalTemperature(TestValues.GENERAL_BOOLEAN);
+        msg.setFuelLevel(TestValues.GENERAL_BOOLEAN);
+        msg.setPrndl(TestValues.GENERAL_BOOLEAN);
+        msg.setTirePressure(TestValues.GENERAL_BOOLEAN);
+        msg.setEngineTorque(TestValues.GENERAL_BOOLEAN);
+        msg.setEngineOilLife(TestValues.GENERAL_BOOLEAN);
+        msg.setOdometer(TestValues.GENERAL_BOOLEAN);
+        msg.setGps(TestValues.GENERAL_BOOLEAN);
+        msg.setFuelLevelState(TestValues.GENERAL_BOOLEAN);
+        msg.setInstantFuelConsumption(TestValues.GENERAL_BOOLEAN);
+        msg.setBeltStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setBodyInformation(TestValues.GENERAL_BOOLEAN);
+        msg.setDeviceStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setDriverBraking(TestValues.GENERAL_BOOLEAN);
+        msg.setWiperStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setHeadLampStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setAccPedalPosition(TestValues.GENERAL_BOOLEAN);
+        msg.setSteeringWheelAngle(TestValues.GENERAL_BOOLEAN);
+        msg.setECallInfo(TestValues.GENERAL_BOOLEAN);
+        msg.setAirbagStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setEmergencyEvent(TestValues.GENERAL_BOOLEAN);
+        msg.setClusterModeStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setMyKey(TestValues.GENERAL_BOOLEAN);
+        msg.setFuelRange(TestValues.GENERAL_BOOLEAN);
+        msg.setTurnSignal(TestValues.GENERAL_BOOLEAN);
+        msg.setElectronicParkBrakeStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setCloudAppVehicleID(TestValues.GENERAL_BOOLEAN);
+        msg.setGearStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setHandsOffSteering(TestValues.GENERAL_BOOLEAN);
+        msg.setWindowStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setStabilityControlsStatus(TestValues.GENERAL_BOOLEAN);
+        msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
 
-		return msg;
-	}
+        return msg;
+    }
 
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_REQUEST;
-	}
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_REQUEST;
+    }
 
-	@Override
-	protected String getCommandType() {
-		return FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString();
-	}
+    @Override
+    protected String getCommandType() {
+        return FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString();
+    }
 
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
 
-		try {
+        try {
             result.put(UnsubscribeVehicleData.KEY_SPEED, TestValues.GENERAL_BOOLEAN);
             result.put(UnsubscribeVehicleData.KEY_RPM, TestValues.GENERAL_BOOLEAN);
             result.put(UnsubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_BOOLEAN);
@@ -114,66 +114,66 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
             result.put(UnsubscribeVehicleData.KEY_MY_KEY, TestValues.GENERAL_BOOLEAN);
             result.put(UnsubscribeVehicleData.KEY_FUEL_RANGE, TestValues.GENERAL_BOOLEAN);
             result.put(UnsubscribeVehicleData.KEY_TURN_SIGNAL, TestValues.GENERAL_BOOLEAN);
-			result.put(UnsubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_BOOLEAN);
-			result.put(UnsubscribeVehicleData.KEY_CLOUD_APP_VEHICLE_ID, TestValues.GENERAL_BOOLEAN);
-			result.put(UnsubscribeVehicleData.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_BOOLEAN);
-			result.put(UnsubscribeVehicleData.KEY_WINDOW_STATUS, TestValues.GENERAL_BOOLEAN);
-			result.put(UnsubscribeVehicleData.KEY_GEAR_STATUS, TestValues.GENERAL_BOOLEAN);
-			result.put(UnsubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN);
-			result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
+            result.put(UnsubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_BOOLEAN);
+            result.put(UnsubscribeVehicleData.KEY_CLOUD_APP_VEHICLE_ID, TestValues.GENERAL_BOOLEAN);
+            result.put(UnsubscribeVehicleData.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_BOOLEAN);
+            result.put(UnsubscribeVehicleData.KEY_WINDOW_STATUS, TestValues.GENERAL_BOOLEAN);
+            result.put(UnsubscribeVehicleData.KEY_GEAR_STATUS, TestValues.GENERAL_BOOLEAN);
+            result.put(UnsubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_BOOLEAN);
+            result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_BOOLEAN);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
 
-		return result;
-	}
+        return result;
+    }
 
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues(){
-		// Valid Tests
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getSpeed());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getRpm());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getExternalTemperature());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getFuelLevel());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getPrndl());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getTirePressure());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getEngineTorque());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getEngineOilLife());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getOdometer());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getGps());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getFuelLevelState());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getInstantFuelConsumption());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getBeltStatus());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getBodyInformation());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getDeviceStatus());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getDriverBraking());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getWiperStatus());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getHeadLampStatus());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getAccPedalPosition());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getSteeringWheelAngle());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getECallInfo());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getAirbagStatus());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getEmergencyEvent());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getClusterModeStatus());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getMyKey());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getFuelRange());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getTurnSignal());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getElectronicParkBrakeStatus());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getCloudAppVehicleID());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getHandsOffSteering());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getWindowStatus());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getGearStatus());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getStabilityControlsStatus());
-		assertTrue(TestValues.TRUE,( (UnsubscribeVehicleData) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-		// Invalid/Null Tests
-		UnsubscribeVehicleData msg = new UnsubscribeVehicleData();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-		
-		assertNull(TestValues.NULL, msg.getAccPedalPosition());
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Valid Tests
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getSpeed());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getRpm());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getExternalTemperature());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getFuelLevel());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getPrndl());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getTirePressure());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getEngineTorque());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getEngineOilLife());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getOdometer());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getGps());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getFuelLevelState());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getInstantFuelConsumption());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getBeltStatus());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getBodyInformation());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getDeviceStatus());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getDriverBraking());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getWiperStatus());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getHeadLampStatus());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getAccPedalPosition());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getSteeringWheelAngle());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getECallInfo());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getAirbagStatus());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getEmergencyEvent());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getClusterModeStatus());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getMyKey());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getFuelRange());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getTurnSignal());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getElectronicParkBrakeStatus());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getCloudAppVehicleID());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getHandsOffSteering());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getWindowStatus());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getGearStatus());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getStabilityControlsStatus());
+        assertTrue(TestValues.TRUE, ((UnsubscribeVehicleData) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
+        // Invalid/Null Tests
+        UnsubscribeVehicleData msg = new UnsubscribeVehicleData();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getAccPedalPosition());
         assertNull(TestValues.NULL, msg.getAirbagStatus());
         assertNull(TestValues.NULL, msg.getBeltStatus());
         assertNull(TestValues.NULL, msg.getDriverBraking());
@@ -200,73 +200,72 @@ public class UnsubscribeVehicleDataTests extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getMyKey());
         assertNull(TestValues.NULL, msg.getFuelRange());
         assertNull(TestValues.NULL, msg.getTurnSignal());
-		assertNull(TestValues.NULL, msg.getElectronicParkBrakeStatus());
-		assertNull(TestValues.NULL, msg.getCloudAppVehicleID());
-		assertNull(TestValues.NULL, msg.getHandsOffSteering());
-		assertNull(TestValues.NULL, msg.getWindowStatus());
-		assertNull(TestValues.NULL, msg.getGearStatus());
-		assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
-		assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-	}
+        assertNull(TestValues.NULL, msg.getElectronicParkBrakeStatus());
+        assertNull(TestValues.NULL, msg.getCloudAppVehicleID());
+        assertNull(TestValues.NULL, msg.getHandsOffSteering());
+        assertNull(TestValues.NULL, msg.getWindowStatus());
+        assertNull(TestValues.NULL, msg.getGearStatus());
+        assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
+        assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
+    }
 
-	/**
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			UnsubscribeVehicleData cmd = new UnsubscribeVehicleData(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            UnsubscribeVehicleData cmd = new UnsubscribeVehicleData(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
 
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_SPEED), cmd.getSpeed());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_RPM), cmd.getRpm());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_PRNDL), cmd.getPrndl());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ODOMETER), cmd.getOdometer());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_GPS), cmd.getGps());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_MY_KEY), cmd.getMyKey());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_CLOUD_APP_VEHICLE_ID), cmd.getCloudAppVehicleID());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_GEAR_STATUS), cmd.getGearStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_SPEED), cmd.getSpeed());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_RPM), cmd.getRpm());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_LEVEL), cmd.getFuelLevel());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_PRNDL), cmd.getPrndl());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_TIRE_PRESSURE), cmd.getTirePressure());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ENGINE_TORQUE), cmd.getEngineTorque());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ODOMETER), cmd.getOdometer());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_GPS), cmd.getGps());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_BELT_STATUS), cmd.getBeltStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_BODY_INFORMATION), cmd.getBodyInformation());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_DEVICE_STATUS), cmd.getDeviceStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_DRIVER_BRAKING), cmd.getDriverBraking());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_WIPER_STATUS), cmd.getWiperStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_HEAD_LAMP_STATUS), cmd.getHeadLampStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_E_CALL_INFO), cmd.getECallInfo());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_AIRBAG_STATUS), cmd.getAirbagStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_EMERGENCY_EVENT), cmd.getEmergencyEvent());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_CLUSTER_MODE_STATUS), cmd.getClusterModeStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_MY_KEY), cmd.getMyKey());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_FUEL_RANGE), cmd.getFuelRange());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_TURN_SIGNAL), cmd.getTurnSignal());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_CLOUD_APP_VEHICLE_ID), cmd.getCloudAppVehicleID());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_WINDOW_STATUS), cmd.getWindowStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_GEAR_STATUS), cmd.getGearStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, UnsubscribeVehicleData.KEY_STABILITY_CONTROLS_STATUS), cmd.getStabilityControlsStatus());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
 
-		} 
-		catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}    	
-    }	
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java
index fe3aa9ffc..a0320aa08 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeWayPointsTests.java
@@ -49,7 +49,7 @@ public class UnsubscribeWayPointsTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Invalid/Null Tests
         UnsubscribeWayPoints msg = new UnsubscribeWayPoints();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -60,7 +60,7 @@ public class UnsubscribeWayPointsTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
index 195530934..4f5cd4285 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
@@ -29,107 +29,107 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.UpdateTurnList}
  */
 public class UpdateTurnListTests extends BaseRpcTests {
 
     @Override
     protected RPCMessage createMessage() {
-    	UpdateTurnList msg = new UpdateTurnList();
-    	
-    	msg.setTurnList(TestValues.GENERAL_TURN_LIST);
-    	msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST);
-    	
-    	return msg;
+        UpdateTurnList msg = new UpdateTurnList();
+
+        msg.setTurnList(TestValues.GENERAL_TURN_LIST);
+        msg.setSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST);
+
+        return msg;
     }
-    
+
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_REQUEST;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.UPDATE_TURN_LIST.toString();
     }
-    
+
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
-        
-        try{			
-			result.put(UpdateTurnList.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
-			result.put(UpdateTurnList.KEY_TURN_LIST, TestValues.JSON_TURNS);
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+
+        try {
+            result.put(UpdateTurnList.KEY_SOFT_BUTTONS, TestValues.JSON_SOFTBUTTONS);
+            result.put(UpdateTurnList.KEY_TURN_LIST, TestValues.JSON_TURNS);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {    	
-    	// Test Values
-    	List<SoftButton> testSoftButtonList = ( (UpdateTurnList) msg ).getSoftButtons();
-    	List<Turn>       testTurnList       = ( (UpdateTurnList) msg ).getTurnList();
-		
-    	// Valid Tests
-		assertNotNull(TestValues.NOT_NULL, testSoftButtonList);
-		assertNotNull(TestValues.NOT_NULL, testTurnList);
-		
-		assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtonList));
-		assertTrue(TestValues.TRUE, Validator.validateTurnList(TestValues.GENERAL_TURN_LIST, testTurnList));
-	
-		// Invalid/Null Tests
-		UpdateTurnList msg = new UpdateTurnList();
+    public void testRpcValues() {
+        // Test Values
+        List<SoftButton> testSoftButtonList = ((UpdateTurnList) msg).getSoftButtons();
+        List<Turn> testTurnList = ((UpdateTurnList) msg).getTurnList();
+
+        // Valid Tests
+        assertNotNull(TestValues.NOT_NULL, testSoftButtonList);
+        assertNotNull(TestValues.NOT_NULL, testTurnList);
+
+        assertTrue(TestValues.TRUE, Validator.validateSoftButtons(TestValues.GENERAL_SOFTBUTTON_LIST, testSoftButtonList));
+        assertTrue(TestValues.TRUE, Validator.validateTurnList(TestValues.GENERAL_TURN_LIST, testTurnList));
+
+        // Invalid/Null Tests
+        UpdateTurnList msg = new UpdateTurnList();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
 
         assertNull(TestValues.NULL, msg.getTurnList());
         assertNull(TestValues.NULL, msg.getSoftButtons());
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			UpdateTurnList cmd = new UpdateTurnList(hash);
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, UpdateTurnList.KEY_SOFT_BUTTONS);
-			List<SoftButton> softButtonList = new ArrayList<SoftButton>();
-			for (int index = 0; index < softButtonArray.length(); index++) {
-				SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonArray.get(index)) );
-				softButtonList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
-			
-			JSONArray turnArray = JsonUtils.readJsonArrayFromJsonObject(parameters, UpdateTurnList.KEY_TURN_LIST);
-			List<Turn> turnList = new ArrayList<Turn>();
-			for (int index = 0; index < turnArray.length(); index++) {
-				Turn chunk = new Turn(JsonRPCMarshaller.deserializeJSONObject((JSONObject) turnArray.get(index)));
-				if (chunk != null)
-					turnList.add(chunk);
-			}
-			assertTrue(TestValues.TRUE,  Validator.validateTurnList(turnList, cmd.getTurnList()));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            UpdateTurnList cmd = new UpdateTurnList(hash);
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            JSONArray softButtonArray = JsonUtils.readJsonArrayFromJsonObject(parameters, UpdateTurnList.KEY_SOFT_BUTTONS);
+            List<SoftButton> softButtonList = new ArrayList<SoftButton>();
+            for (int index = 0; index < softButtonArray.length(); index++) {
+                SoftButton chunk = new SoftButton(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonArray.get(index)));
+                softButtonList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateSoftButtons(softButtonList, cmd.getSoftButtons()));
+
+            JSONArray turnArray = JsonUtils.readJsonArrayFromJsonObject(parameters, UpdateTurnList.KEY_TURN_LIST);
+            List<Turn> turnList = new ArrayList<Turn>();
+            for (int index = 0; index < turnArray.length(); index++) {
+                Turn chunk = new Turn(JsonRPCMarshaller.deserializeJSONObject((JSONObject) turnArray.get(index)));
+                if (chunk != null)
+                    turnList.add(chunk);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateTurnList(turnList, cmd.getTurnList()));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
index 459fce382..52e113be4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
@@ -21,62 +21,62 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.AddCommandResponse}
  */
-public class AddCommandResponseTests extends BaseRpcTests{
+public class AddCommandResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new AddCommandResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ADD_COMMAND.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         AddCommandResponse msg = new AddCommandResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			AddCommand cmd = new AddCommand(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            AddCommand cmd = new AddCommand(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
index c4cf43309..826d8f481 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
@@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.AddSubMenuResponse}
  */
-public class AddSubmenuResponseTests extends BaseRpcTests{
+public class AddSubmenuResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new AddSubMenuResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ADD_SUB_MENU.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {    
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         AddSubMenuResponse msg = new AddSubMenuResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -60,22 +60,22 @@ public class AddSubmenuResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			AddSubMenuResponse cmd = new AddSubMenuResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            AddSubMenuResponse cmd = new AddSubMenuResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
index 44149d663..b7caed595 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
@@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.AlertManeuverResponse}
  */
 public class AlertManeuverResponseTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		return new AlertManeuverResponse();
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        return new AlertManeuverResponse();
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
 
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
+    @Override
+    protected String getCommandType() {
+        return FunctionID.ALERT_MANEUVER.toString();
+    }
 
-	@Override
-	protected String getCommandType() {
-		return FunctionID.ALERT_MANEUVER.toString();
-	}
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        return new JSONObject();
+    }
 
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		return new JSONObject();
-	}
-	
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {    
-    	// Invalid/Null Tests
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Invalid/Null Tests
         AlertManeuverResponse msg = new AlertManeuverResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -60,22 +60,22 @@ public class AlertManeuverResponseTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-	public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			AlertManeuverResponse cmd = new AlertManeuverResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            AlertManeuverResponse cmd = new AlertManeuverResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
index 7d439aacc..517e7fd3c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
@@ -22,54 +22,54 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.AlertResponse}
  */
-public class AlertResponseTests extends BaseRpcTests{
+public class AlertResponseTests extends BaseRpcTests {
 
     private static final int TRY_AGAIN_TIME = 400;
 
     @Override
-    protected RPCMessage createMessage(){
-    	AlertResponse alert = new AlertResponse();
-    	alert.setTryAgainTime(TRY_AGAIN_TIME);
+    protected RPCMessage createMessage() {
+        AlertResponse alert = new AlertResponse();
+        alert.setTryAgainTime(TRY_AGAIN_TIME);
         return alert;
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.ALERT.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(AlertResponse.KEY_TRY_AGAIN_TIME, TRY_AGAIN_TIME);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {    
-    	// Test Values
-        int tryAgainTime = ( (AlertResponse) msg ).getTryAgainTime();
-        
+    public void testRpcValues() {
+        // Test Values
+        int tryAgainTime = ((AlertResponse) msg).getTryAgainTime();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TRY_AGAIN_TIME, tryAgainTime);
-        
+
         // Invalid/Null Tests
         AlertResponse msg = new AlertResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -82,25 +82,25 @@ public class AlertResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			AlertResponse cmd = new AlertResponse(hash);
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AlertResponse.KEY_TRY_AGAIN_TIME), cmd.getTryAgainTime());
-			
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            AlertResponse cmd = new AlertResponse(hash);
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, AlertResponse.KEY_TRY_AGAIN_TIME), cmd.getTryAgainTime());
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java
index 6350b6e80..e614bc636 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ButtonPressResponseTest.java
@@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ButtonPressResponse}
  */
 public class ButtonPressResponseTest extends BaseRpcTests {
-	
-	@Override
-    protected RPCMessage createMessage(){
+
+    @Override
+    protected RPCMessage createMessage() {
         return new ButtonPressResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.BUTTON_PRESS.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         ButtonPressResponse msg = new ButtonPressResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -60,22 +60,22 @@ public class ButtonPressResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
             ButtonPressResponse cmd = new ButtonPressResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java
index fb9374247..66f143449 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CancelInteractionResponseTests.java
@@ -60,22 +60,22 @@ import static junit.framework.TestCase.assertNotNull;
 public class CancelInteractionResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new CancelInteractionResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.CANCEL_INTERACTION.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
@@ -83,7 +83,7 @@ public class CancelInteractionResponseTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Invalid/Null Tests
         CancelInteractionResponse msg = new CancelInteractionResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -94,7 +94,7 @@ public class CancelInteractionResponseTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
index e3000a9ed..b81a73a45 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
@@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ChangeRegistrationResponse}
  */
-public class ChangeRegistrationResponseTests extends BaseRpcTests{
+public class ChangeRegistrationResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new ChangeRegistrationResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.CHANGE_REGISTRATION.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {    
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         ChangeRegistrationResponse msg = new ChangeRegistrationResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -60,23 +60,23 @@ public class ChangeRegistrationResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ChangeRegistrationResponse cmd = new ChangeRegistrationResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ChangeRegistrationResponse cmd = new ChangeRegistrationResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
 
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java
index 135155e6e..21a41fad9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CloseApplicationResponseTests.java
@@ -60,22 +60,22 @@ import static junit.framework.TestCase.assertNotNull;
 public class CloseApplicationResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new CloseApplicationResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.CLOSE_APPLICATION.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
@@ -83,7 +83,7 @@ public class CloseApplicationResponseTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Invalid/Null Tests
         CloseApplicationResponse msg = new CloseApplicationResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -94,7 +94,7 @@ public class CloseApplicationResponseTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java
index 3c0b783b3..34f290114 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java
@@ -12,37 +12,37 @@ import org.junit.Test;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSetResponse}
  */
-public class CreateInteractionChoiceSetResponseTests extends BaseRpcTests{
+public class CreateInteractionChoiceSetResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new CreateInteractionChoiceSetResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.CREATE_INTERACTION_CHOICE_SET.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {    
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         CreateInteractionChoiceSetResponse msg = new CreateInteractionChoiceSetResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
index 92a179855..cda4f25ba 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
@@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DeleteCommandResponse}
  */
-public class DeleteCommandResponseTests extends BaseRpcTests{
+public class DeleteCommandResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new DeleteCommandResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DELETE_COMMAND.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         DeleteCommandResponse msg = new DeleteCommandResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -60,22 +60,22 @@ public class DeleteCommandResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			DeleteCommandResponse cmd = new DeleteCommandResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            DeleteCommandResponse cmd = new DeleteCommandResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
index 42b26d1bd..68dcf1bd6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
@@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DeleteFileResponse}
  */
-public class DeleteFileResponseTests extends BaseRpcTests{
+public class DeleteFileResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         DeleteFileResponse msg = new DeleteFileResponse();
 
         msg.setSpaceAvailable(TestValues.GENERAL_INT);
@@ -37,39 +37,39 @@ public class DeleteFileResponseTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DELETE_FILE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(DeleteFileResponse.KEY_SPACE_AVAILABLE, TestValues.GENERAL_INT);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () { 
-    	// Test Values
-        int spaceAvailable = ( (DeleteFileResponse) msg ).getSpaceAvailable();
-        
+    public void testRpcValues() {
+        // Test Values
+        int spaceAvailable = ((DeleteFileResponse) msg).getSpaceAvailable();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, spaceAvailable);
-    
+
         // Invalid/Null Tests
         DeleteFileResponse msg = new DeleteFileResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -82,25 +82,25 @@ public class DeleteFileResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			DeleteFileResponse cmd = new DeleteFileResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteFileResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            DeleteFileResponse cmd = new DeleteFileResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, DeleteFileResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
index 53d5f58e9..647b2817c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
@@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSetResponse}
  */
-public class DeleteInteractionChoiceSetResponseTests extends BaseRpcTests{
+public class DeleteInteractionChoiceSetResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new DeleteInteractionChoiceSetResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DELETE_INTERACTION_CHOICE_SET.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         DeleteInteractionChoiceSetResponse msg = new DeleteInteractionChoiceSetResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -60,22 +60,22 @@ public class DeleteInteractionChoiceSetResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			DeleteInteractionChoiceSetResponse cmd = new DeleteInteractionChoiceSetResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            DeleteInteractionChoiceSetResponse cmd = new DeleteInteractionChoiceSetResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
index 8809b51c3..f9357510e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
@@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DeleteSubMenuResponse}
  */
-public class DeleteSubMenuResponseTests extends BaseRpcTests{
+public class DeleteSubMenuResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new DeleteSubMenuResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DELETE_SUB_MENU.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         DeleteSubMenuResponse msg = new DeleteSubMenuResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -60,22 +60,22 @@ public class DeleteSubMenuResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			DeleteSubMenuResponse cmd = new DeleteSubMenuResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            DeleteSubMenuResponse cmd = new DeleteSubMenuResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
index 289269ffd..5b22b5e83 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
@@ -25,13 +25,13 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.DiagnosticMessageResponse}
  */
-public class DiagnosticMessageResponseTests extends BaseRpcTests{
+public class DiagnosticMessageResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         DiagnosticMessageResponse msg = new DiagnosticMessageResponse();
 
         msg.setMessageDataResult(TestValues.GENERAL_INTEGER_LIST);
@@ -40,24 +40,24 @@ public class DiagnosticMessageResponseTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.DIAGNOSTIC_MESSAGE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(DiagnosticMessageResponse.KEY_MESSAGE_DATA_RESULT,
                     JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST));
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
@@ -65,20 +65,20 @@ public class DiagnosticMessageResponseTests extends BaseRpcTests{
 
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Test Values
-        List<Integer> cmdId = ( (DiagnosticMessageResponse) msg ).getMessageDataResult();
+    public void testRpcValues() {
+        // Test Values
+        List<Integer> cmdId = ((DiagnosticMessageResponse) msg).getMessageDataResult();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST.size(), cmdId.size());
 
-        for(int i = 0; i < TestValues.GENERAL_INTEGER_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_INTEGER_LIST.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST.get(i), cmdId.get(i));
         }
-        
+
         // Invalid/Null Tests
         DiagnosticMessageResponse msg = new DiagnosticMessageResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -91,30 +91,30 @@ public class DiagnosticMessageResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			DiagnosticMessageResponse cmd = new DiagnosticMessageResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			
-			List<Integer> dataResultList = JsonUtils.readIntegerListFromJsonObject(parameters, DiagnosticMessageResponse.KEY_MESSAGE_DATA_RESULT);
-			List<Integer> testResultList = cmd.getMessageDataResult();
-			
-			assertEquals(TestValues.MATCH, dataResultList.size(), testResultList.size());
-			assertTrue(TestValues.TRUE, Validator.validateIntegerList(dataResultList, testResultList));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            DiagnosticMessageResponse cmd = new DiagnosticMessageResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            List<Integer> dataResultList = JsonUtils.readIntegerListFromJsonObject(parameters, DiagnosticMessageResponse.KEY_MESSAGE_DATA_RESULT);
+            List<Integer> testResultList = cmd.getMessageDataResult();
+
+            assertEquals(TestValues.MATCH, dataResultList.size(), testResultList.size());
+            assertTrue(TestValues.TRUE, Validator.validateIntegerList(dataResultList, testResultList));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java
index 006e6d050..ec3e6c32e 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DialNumberResponseTests.java
@@ -49,7 +49,7 @@ public class DialNumberResponseTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Invalid/Null Tests
         DialNumberResponse msg = new DialNumberResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -60,7 +60,7 @@ public class DialNumberResponseTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
index a3a79b6bd..35ea755b4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
@@ -20,37 +20,37 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.EndAudioPassThruResponse}
  */
-public class EndAudioPassThruResponseTests extends BaseRpcTests{
+public class EndAudioPassThruResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new EndAudioPassThruResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.END_AUDIO_PASS_THRU.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         EndAudioPassThruResponse msg = new EndAudioPassThruResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -60,22 +60,22 @@ public class EndAudioPassThruResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			EndAudioPassThruResponse cmd = new EndAudioPassThruResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            EndAudioPassThruResponse cmd = new EndAudioPassThruResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java
index ecb6fad7c..f22e9ecca 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java
@@ -12,37 +12,37 @@ import org.junit.Test;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.GenericResponse}
  */
-public class GenericResponseTests extends BaseRpcTests{
+public class GenericResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new GenericResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.GENERIC_RESPONSE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
+    public void testRpcValues() {
+        // Invalid/Null Tests
         GenericResponse msg = new GenericResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java
index 49de496e4..8bc12e5d7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetAppServiceDataResponseTests.java
@@ -26,61 +26,61 @@ import static junit.framework.TestCase.assertNotNull;
  */
 public class GetAppServiceDataResponseTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage(){
-		return new GetAppServiceDataResponse();
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        return new GetAppServiceDataResponse();
+    }
 
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_RESPONSE;
-	}
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
 
-	@Override
-	protected String getCommandType(){
-		return FunctionID.GET_APP_SERVICE_DATA.toString();
-	}
+    @Override
+    protected String getCommandType() {
+        return FunctionID.GET_APP_SERVICE_DATA.toString();
+    }
 
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		return new JSONObject();
-	}
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        return new JSONObject();
+    }
 
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Invalid/Null Tests
-		GetAppServiceDataResponse msg = new GetAppServiceDataResponse();
-		msg.setServiceData(TestValues.GENERAL_APPSERVICEDATA);
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        GetAppServiceDataResponse msg = new GetAppServiceDataResponse();
+        msg.setServiceData(TestValues.GENERAL_APPSERVICEDATA);
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
 
-		// test getter
-		AppServiceData serviceData = msg.getServiceData();
-		assertEquals(TestValues.GENERAL_APPSERVICEDATA, serviceData);
-	}
+        // test getter
+        AppServiceData serviceData = msg.getServiceData();
+        assertEquals(TestValues.GENERAL_APPSERVICEDATA, serviceData);
+    }
 
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
 
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			GetAppServiceDataResponse cmd = new GetAppServiceDataResponse(hash);
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            GetAppServiceDataResponse cmd = new GetAppServiceDataResponse(hash);
 
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
 
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java
index b9d40f907..bc3873421 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetCloudAppPropertiesResponseTests.java
@@ -12,35 +12,35 @@ import org.junit.Test;
 import static junit.framework.TestCase.assertNotNull;
 
 public class GetCloudAppPropertiesResponseTests extends BaseRpcTests {
-	@Override
-	protected RPCMessage createMessage(){
-		return new GetCloudAppPropertiesResponse();
-	}
-
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType(){
-		return FunctionID.GET_CLOUD_APP_PROPERTIES.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		return new JSONObject();
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Invalid/Null Tests
-		GetCloudAppPropertiesResponse msg = new GetCloudAppPropertiesResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        return new GetCloudAppPropertiesResponse();
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.GET_CLOUD_APP_PROPERTIES.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        return new JSONObject();
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        GetCloudAppPropertiesResponse msg = new GetCloudAppPropertiesResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
index bbbd2559a..e54b1b71b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
@@ -25,13 +25,13 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.GetDTCsResponse}
  */
-public class GetDTCsResponseTests extends BaseRpcTests{
-	
+public class GetDTCsResponseTests extends BaseRpcTests {
+
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         GetDTCsResponse msg = new GetDTCsResponse();
 
         msg.setDtc(TestValues.GENERAL_STRING_LIST);
@@ -40,43 +40,43 @@ public class GetDTCsResponseTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.GET_DTCS.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(GetDTCsResponse.KEY_DTC, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {       	
-    	// Test Values
-        List<String> cmdId = ( (GetDTCsResponse) msg ).getDtc();
+    public void testRpcValues() {
+        // Test Values
+        List<String> cmdId = ((GetDTCsResponse) msg).getDtc();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), cmdId.size());
 
-        for(int i = 0; i < TestValues.GENERAL_STRING_LIST.size(); i++){
+        for (int i = 0; i < TestValues.GENERAL_STRING_LIST.size(); i++) {
             assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.get(i), cmdId.get(i));
         }
-    
+
         // Invalid/Null Tests
         GetDTCsResponse msg = new GetDTCsResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -89,30 +89,30 @@ public class GetDTCsResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			GetDTCsResponse cmd = new GetDTCsResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			
-			List<String> dtcList = JsonUtils.readStringListFromJsonObject(parameters, GetDTCsResponse.KEY_DTC);
-			List<String> testDtcList = cmd.getDtc();
-			assertEquals(TestValues.MATCH, dtcList.size(), testDtcList.size());
-			assertTrue(TestValues.TRUE, Validator.validateStringList(dtcList, testDtcList));
-			
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            GetDTCsResponse cmd = new GetDTCsResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            List<String> dtcList = JsonUtils.readStringListFromJsonObject(parameters, GetDTCsResponse.KEY_DTC);
+            List<String> testDtcList = cmd.getDtc();
+            assertEquals(TestValues.MATCH, dtcList.size(), testDtcList.size());
+            assertTrue(TestValues.TRUE, Validator.validateStringList(dtcList, testDtcList));
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java
index 867e91cb2..87f7ebd8b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetFileResponseTests.java
@@ -29,100 +29,100 @@ import static junit.framework.TestCase.fail;
  */
 public class GetFileResponseTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage(){
-
-		GetFileResponse msg = new GetFileResponse();
-
-		msg.setCRC(TestValues.GENERAL_INT);
-		msg.setFileType(TestValues.GENERAL_FILETYPE);
-		msg.setOffset(TestValues.GENERAL_INT);
-		msg.setLength(TestValues.GENERAL_INT);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType(){
-		return FunctionID.GET_FILE.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		JSONObject result = new JSONObject();
-
-		try{
-			result.put(GetFileResponse.KEY_CRC, TestValues.GENERAL_INTEGER);
-			result.put(GetFileResponse.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE);
-			result.put(GetFileResponse.KEY_OFFSET, TestValues.GENERAL_INTEGER);
-			result.put(GetFileResponse.KEY_LENGTH, TestValues.GENERAL_INTEGER);
-		}catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		Integer crc = ( (GetFileResponse) msg ).getCRC();
-		FileType fileType = ( (GetFileResponse) msg ).getFileType();
-		Integer offset = ( (GetFileResponse) msg ).getOffset();
-		Integer length = ( (GetFileResponse) msg ).getLength();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, crc);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, fileType);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, offset);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, length);
-
-		// Invalid/Null Tests
-		GetFileResponse msg = new GetFileResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getCRC());
-		assertNull(TestValues.NULL, msg.getFileType());
-		assertNull(TestValues.NULL, msg.getOffset());
-		assertNull(TestValues.NULL, msg.getLength());
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			GetFileResponse cmd = new GetFileResponse (hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_CRC), cmd.getCRC());
-			assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetFileResponse.KEY_FILE_TYPE).toString(), cmd.getFileType().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_LENGTH), cmd.getLength());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_OFFSET), cmd.getOffset());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+
+        GetFileResponse msg = new GetFileResponse();
+
+        msg.setCRC(TestValues.GENERAL_INT);
+        msg.setFileType(TestValues.GENERAL_FILETYPE);
+        msg.setOffset(TestValues.GENERAL_INT);
+        msg.setLength(TestValues.GENERAL_INT);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.GET_FILE.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(GetFileResponse.KEY_CRC, TestValues.GENERAL_INTEGER);
+            result.put(GetFileResponse.KEY_FILE_TYPE, TestValues.GENERAL_FILETYPE);
+            result.put(GetFileResponse.KEY_OFFSET, TestValues.GENERAL_INTEGER);
+            result.put(GetFileResponse.KEY_LENGTH, TestValues.GENERAL_INTEGER);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        Integer crc = ((GetFileResponse) msg).getCRC();
+        FileType fileType = ((GetFileResponse) msg).getFileType();
+        Integer offset = ((GetFileResponse) msg).getOffset();
+        Integer length = ((GetFileResponse) msg).getLength();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, crc);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_FILETYPE, fileType);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, offset);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER, length);
+
+        // Invalid/Null Tests
+        GetFileResponse msg = new GetFileResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getCRC());
+        assertNull(TestValues.NULL, msg.getFileType());
+        assertNull(TestValues.NULL, msg.getOffset());
+        assertNull(TestValues.NULL, msg.getLength());
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            GetFileResponse cmd = new GetFileResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_CRC), cmd.getCRC());
+            assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetFileResponse.KEY_FILE_TYPE).toString(), cmd.getFileType().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_LENGTH), cmd.getLength());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetFileResponse.KEY_OFFSET), cmd.getOffset());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java
index 512d324e3..715e49f6c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataConsentResponseTests.java
@@ -25,68 +25,68 @@ import static junit.framework.TestCase.fail;
 
 public class GetInteriorVehicleDataConsentResponseTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		GetInteriorVehicleDataConsentResponse msg = new GetInteriorVehicleDataConsentResponse();
-		msg.setAllowances(TestValues.GENERAL_BOOLEAN_LIST);
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.GET_INTERIOR_VEHICLE_DATA_CONSENT.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try{
-			result.put(GetInteriorVehicleDataConsentResponse.KEY_ALLOWED, JsonUtils.createJsonArray(TestValues.GENERAL_BOOLEAN_LIST));
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-		return result;
-	}
-
-	@Test
-	public void testRpcValues() {
-		List<Boolean> list = ((GetInteriorVehicleDataConsentResponse) msg).getAllowances();
-		assertEquals(TestValues.MATCH, list, TestValues.GENERAL_BOOLEAN_LIST);
-	}
-
-	@Test
-	public void testRequiredParams(){
-		GetInteriorVehicleDataConsentResponse msg = new GetInteriorVehicleDataConsentResponse(true, Result.SUCCESS);
-		assertTrue(msg.getSuccess());
-		assertEquals(TestValues.MATCH, msg.getResultCode(), Result.SUCCESS);
-	}
-
-	@Test
-	public void testJsonConstructor() {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			GetInteriorVehicleDataConsentResponse cmd = new GetInteriorVehicleDataConsentResponse(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanListFromJsonObject(parameters,
-					GetInteriorVehicleDataConsentResponse.KEY_ALLOWED), cmd.getAllowances());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        GetInteriorVehicleDataConsentResponse msg = new GetInteriorVehicleDataConsentResponse();
+        msg.setAllowances(TestValues.GENERAL_BOOLEAN_LIST);
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.GET_INTERIOR_VEHICLE_DATA_CONSENT.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(GetInteriorVehicleDataConsentResponse.KEY_ALLOWED, JsonUtils.createJsonArray(TestValues.GENERAL_BOOLEAN_LIST));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+        return result;
+    }
+
+    @Test
+    public void testRpcValues() {
+        List<Boolean> list = ((GetInteriorVehicleDataConsentResponse) msg).getAllowances();
+        assertEquals(TestValues.MATCH, list, TestValues.GENERAL_BOOLEAN_LIST);
+    }
+
+    @Test
+    public void testRequiredParams() {
+        GetInteriorVehicleDataConsentResponse msg = new GetInteriorVehicleDataConsentResponse(true, Result.SUCCESS);
+        assertTrue(msg.getSuccess());
+        assertEquals(TestValues.MATCH, msg.getResultCode(), Result.SUCCESS);
+    }
+
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            GetInteriorVehicleDataConsentResponse cmd = new GetInteriorVehicleDataConsentResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanListFromJsonObject(parameters,
+                    GetInteriorVehicleDataConsentResponse.KEY_ALLOWED), cmd.getAllowances());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java
index e4006d4a4..bef276ffb 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetInteriorVehicleDataResponseTests.java
@@ -31,7 +31,7 @@ import static junit.framework.TestCase.fail;
 public class GetInteriorVehicleDataResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
 
         GetInteriorVehicleDataResponse msg = new GetInteriorVehicleDataResponse();
 
@@ -42,23 +42,23 @@ public class GetInteriorVehicleDataResponseTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.GET_INTERIOR_VEHICLE_DATA.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(GetInteriorVehicleDataResponse.KEY_IS_SUBSCRIBED, TestValues.GENERAL_BOOLEAN);
             result.put(GetInteriorVehicleDataResponse.KEY_MODULE_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore()));
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -69,10 +69,10 @@ public class GetInteriorVehicleDataResponseTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        boolean testIsSubscribed = ( (GetInteriorVehicleDataResponse) msg ).getIsSubscribed();
-        ModuleData testModuleData = ( (GetInteriorVehicleDataResponse) msg ).getModuleData();
+        boolean testIsSubscribed = ((GetInteriorVehicleDataResponse) msg).getIsSubscribed();
+        ModuleData testModuleData = ((GetInteriorVehicleDataResponse) msg).getModuleData();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, testIsSubscribed);
@@ -91,13 +91,13 @@ public class GetInteriorVehicleDataResponseTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
         try {
             Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-            GetInteriorVehicleDataResponse cmd = new GetInteriorVehicleDataResponse (hash);
+            GetInteriorVehicleDataResponse cmd = new GetInteriorVehicleDataResponse(hash);
 
             JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
             assertNotNull(TestValues.NOT_NULL, body);
@@ -111,7 +111,7 @@ public class GetInteriorVehicleDataResponseTests extends BaseRpcTests {
             ModuleData testModuleData = new ModuleData(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleDataResponse.KEY_MODULE_DATA)));
             ModuleData cmdModuleData = cmd.getModuleData();
 
-            assertTrue(TestValues.TRUE, Validator.validateModuleData(testModuleData, cmdModuleData) );
+            assertTrue(TestValues.TRUE, Validator.validateModuleData(testModuleData, cmdModuleData));
             assertEquals(TestValues.MATCH, JsonUtils.readObjectFromJsonObject(parameters, GetInteriorVehicleDataResponse.KEY_IS_SUBSCRIBED), cmd.getIsSubscribed());
         } catch (JSONException e) {
             e.printStackTrace();
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java
index 827b340e7..802201d2c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetSystemCapabilityResponseTests.java
@@ -25,7 +25,7 @@ import static junit.framework.TestCase.fail;
 public class GetSystemCapabilityResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         GetSystemCapabilityResponse msg = new GetSystemCapabilityResponse();
 
         msg.setSystemCapability(TestValues.GENERAL_SYSTEMCAPABILITY);
@@ -34,22 +34,22 @@ public class GetSystemCapabilityResponseTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.GET_SYSTEM_CAPABILITY.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(GetSystemCapabilityResponse.KEY_SYSTEM_CAPABILITY, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_SYSTEMCAPABILITY.getStore()));
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -60,9 +60,9 @@ public class GetSystemCapabilityResponseTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        SystemCapability testCapability = ( (GetSystemCapabilityResponse) msg ).getSystemCapability();
+        SystemCapability testCapability = ((GetSystemCapabilityResponse) msg).getSystemCapability();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_SYSTEMCAPABILITY.getSystemCapabilityType(), testCapability.getSystemCapabilityType());
@@ -79,7 +79,7 @@ public class GetSystemCapabilityResponseTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
index 91e13586a..606283cc7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
@@ -47,31 +47,31 @@ import static junit.framework.TestCase.fail;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.GetVehicleDataResponse}
  */
-public class GetVehicleDataResponseTests extends BaseRpcTests{
+public class GetVehicleDataResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
-    	return VehicleDataHelper.VEHICLE_DATA_RESPONSE;
+    protected RPCMessage createMessage() {
+        return VehicleDataHelper.VEHICLE_DATA_RESPONSE;
     }
-    
+
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.GET_VEHICLE_DATA.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(GetVehicleDataResponse.KEY_SPEED, VehicleDataHelper.SPEED);
             result.put(GetVehicleDataResponse.KEY_RPM, VehicleDataHelper.RPM);
             result.put(GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE);
@@ -101,13 +101,13 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
             result.put(GetVehicleDataResponse.KEY_FUEL_RANGE, VehicleDataHelper.JSON_FUEL_RANGE);
             result.put(GetVehicleDataResponse.KEY_TURN_SIGNAL, VehicleDataHelper.TURN_SIGNAL);
             result.put(GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
-			result.put(GetVehicleDataResponse.KEY_WINDOW_STATUS, VehicleDataHelper.WINDOW_STATUS_LIST);
+            result.put(GetVehicleDataResponse.KEY_WINDOW_STATUS, VehicleDataHelper.WINDOW_STATUS_LIST);
             result.put(GetVehicleDataResponse.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING);
             result.put(GetVehicleDataResponse.KEY_GEAR_STATUS, VehicleDataHelper.GEAR_STATUS);
-			result.put(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, VehicleDataHelper.STABILITY_CONTROLS_STATUS);
-			result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
-        } catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+            result.put(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, VehicleDataHelper.STABILITY_CONTROLS_STATUS);
+            result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
@@ -115,440 +115,424 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
 
     @Test
     public void testJson() {
-		JSONObject reference = new JSONObject();
-		
-		//objects needed on the first level
-		JSONObject tireStatusObj = new JSONObject();
-		JSONObject GPSDataObj = new JSONObject();
-		JSONObject beltStatusObj = new JSONObject();
-		JSONObject bodyInformationObj = new JSONObject();
-		JSONObject deviceStatusObj = new JSONObject();
-		JSONObject headLampStatusObj = new JSONObject();
-		JSONObject ECallInfoObj = new JSONObject();
-		JSONObject airbagStatusObj = new JSONObject();
-		JSONObject emergencyEventObj = new JSONObject();
-		JSONObject clusterModeStatusObj = new JSONObject();
-		JSONObject myKeyObj = new JSONObject();
-		JSONObject stabilityControlsStatusObj = new JSONObject();
-		JSONObject fuelRangeObj = new JSONObject();
-		JSONObject windowStatusObj = new JSONObject();
-		JSONObject gearStatusObj = new JSONObject();
-		JSONArray  fuelRangeArrayObj = new JSONArray();
-		JSONArray  windowStatusArrayObj = new JSONArray();
-
-		try {
-			//set up the JSONObject to represent GetVehicleDataResponse
-			//TIRE_PRESSURE
-			tireStatusObj.put(TireStatus.KEY_PRESSURE_TELL_TALE, VehicleDataHelper.TIRE_PRESSURE_TELL_TALE);
-			JSONObject tireLeftFront = new JSONObject();
-			tireLeftFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_FRONT);
-			tireStatusObj.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront);
-			JSONObject tireRightFront = new JSONObject();
-			tireRightFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_FRONT);
-			tireStatusObj.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront);
-			JSONObject tireLeftRear = new JSONObject();
-			tireLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_REAR);
-			tireStatusObj.put(TireStatus.KEY_LEFT_REAR, tireLeftRear);
-			JSONObject tireRightRear = new JSONObject();
-			tireRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_REAR);
-			tireStatusObj.put(TireStatus.KEY_RIGHT_REAR, tireRightRear);
-			JSONObject tireInnerLeftRear = new JSONObject();
-			tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_LEFT_REAR);
-			tireStatusObj.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear);
-			JSONObject tireInnerRightRear = new JSONObject();
-			tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_RIGHT_REAR);
-			tireStatusObj.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear);
-			
-			//GPS
-			GPSDataObj.put(GPSData.KEY_LONGITUDE_DEGREES, VehicleDataHelper.GPS_LONGITUDE);
-			GPSDataObj.put(GPSData.KEY_LATITUDE_DEGREES, VehicleDataHelper.GPS_LATITUDE);
-			GPSDataObj.put(GPSData.KEY_UTC_YEAR, VehicleDataHelper.GPS_YEAR);
-			GPSDataObj.put(GPSData.KEY_UTC_MONTH, VehicleDataHelper.GPS_MONTH);
-			GPSDataObj.put(GPSData.KEY_UTC_DAY, VehicleDataHelper.GPS_DAY);
-			GPSDataObj.put(GPSData.KEY_UTC_HOURS, VehicleDataHelper.GPS_HOURS);
-			GPSDataObj.put(GPSData.KEY_UTC_MINUTES, VehicleDataHelper.GPS_MINUTES);
-			GPSDataObj.put(GPSData.KEY_UTC_SECONDS, VehicleDataHelper.GPS_SECONDS);
-			GPSDataObj.put(GPSData.KEY_COMPASS_DIRECTION, VehicleDataHelper.GPS_DIRECTION);
-			GPSDataObj.put(GPSData.KEY_PDOP, VehicleDataHelper.GPS_PDOP);
-			GPSDataObj.put(GPSData.KEY_VDOP, VehicleDataHelper.GPS_VDOP);
-			GPSDataObj.put(GPSData.KEY_HDOP, VehicleDataHelper.GPS_HDOP);
-			GPSDataObj.put(GPSData.KEY_ACTUAL, VehicleDataHelper.GPS_ACTUAL);
-			GPSDataObj.put(GPSData.KEY_SATELLITES, VehicleDataHelper.GPS_SATELLITES);
-			GPSDataObj.put(GPSData.KEY_DIMENSION, VehicleDataHelper.GPS_DIMENSION);
-			GPSDataObj.put(GPSData.KEY_ALTITUDE, VehicleDataHelper.GPS_ALTITUDE);
-			GPSDataObj.put(GPSData.KEY_HEADING, VehicleDataHelper.GPS_HEADING);
-			GPSDataObj.put(GPSData.KEY_SPEED, VehicleDataHelper.GPS_SPEED);
-			GPSDataObj.put(GPSData.KEY_SHIFTED, VehicleDataHelper.GPS_SHIFTED);
-			
-			//BELT_STATUS
-			beltStatusObj.put(BeltStatus.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED);
-			beltStatusObj.put(BeltStatus.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED);
-			beltStatusObj.put(BeltStatus.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD);
-			beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_LEFT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED);
-			beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED);
-			beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED);
-			
-			//BODY_INFORMATION
-			bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE);
-			bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS);
-			bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS);
-			bodyInformationObj.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR);
-			bodyInformationObj.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR);
-			bodyInformationObj.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR);
-			bodyInformationObj.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR);
-			
-			//DEVICE_STATUS
-			deviceStatusObj.put(DeviceStatus.KEY_VOICE_REC_ON, VehicleDataHelper.DEVICE_STATUS_VOICE_REC);
-			deviceStatusObj.put(DeviceStatus.KEY_BT_ICON_ON, VehicleDataHelper.DEVICE_STATUS_BT_ICON);
-			deviceStatusObj.put(DeviceStatus.KEY_CALL_ACTIVE, VehicleDataHelper.DEVICE_STATUS_CALL_ACTIVE);
-			deviceStatusObj.put(DeviceStatus.KEY_PHONE_ROAMING, VehicleDataHelper.DEVICE_STATUS_PHONE_ROAMING);
-			deviceStatusObj.put(DeviceStatus.KEY_TEXT_MSG_AVAILABLE, VehicleDataHelper.DEVICE_STATUS_TEXT_MSG_AVAILABLE);
-			deviceStatusObj.put(DeviceStatus.KEY_BATT_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_BATT_LEVEL_STATUS);
-			deviceStatusObj.put(DeviceStatus.KEY_STEREO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_STEREO_MUTED);
-			deviceStatusObj.put(DeviceStatus.KEY_MONO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_MONO_MUTED);
-			deviceStatusObj.put(DeviceStatus.KEY_SIGNAL_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_SIGNAL_LEVEL_STATUS);
-			deviceStatusObj.put(DeviceStatus.KEY_PRIMARY_AUDIO_SOURCE, VehicleDataHelper.DEVICE_STATUS_PRIMARY_AUDIO);
-			deviceStatusObj.put(DeviceStatus.KEY_E_CALL_EVENT_ACTIVE, VehicleDataHelper.DEVICE_STATUS_E_CALL_ACTIVE);
-			
-			//HEAD_LAMP_STATUS
-			headLampStatusObj.put(HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS, VehicleDataHelper.HEAD_LAMP_STATUS_AMBIENT_STATUS);
-			headLampStatusObj.put(HeadLampStatus.KEY_HIGH_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_HIGH_BEAMS);
-			headLampStatusObj.put(HeadLampStatus.KEY_LOW_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_LOW_BEAMS);
-			
-			//E_CALL_INFO
-			ECallInfoObj.put(ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_E_CALL_NOTIFICATION_STATUS);
-			ECallInfoObj.put(ECallInfo.KEY_AUX_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS);
-			ECallInfoObj.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, VehicleDataHelper.E_CALL_INFO_CONFIRMATION_STATUS);
-	    	
-			//AIRBAG_STATUS
-			airbagStatusObj.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED);
-			airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED);
-			
-			//EMERGENCY_EVENT
-			emergencyEventObj.put(EmergencyEvent.KEY_EMERGENCY_EVENT_TYPE, VehicleDataHelper.EMERGENCY_EVENT_TYPE);
-			emergencyEventObj.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, VehicleDataHelper.EMERGENCY_EVENT_FUEL_CUTOFF_STATUS);
-			emergencyEventObj.put(EmergencyEvent.KEY_ROLLOVER_EVENT, VehicleDataHelper.EMERGENCY_EVENT_ROLLOVER_EVENT);
-			emergencyEventObj.put(EmergencyEvent.KEY_MAXIMUM_CHANGE_VELOCITY, VehicleDataHelper.EMERGENCY_EVENT_MAX_CHANGE_VELOCITY);
-			emergencyEventObj.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS);
-			
-			//CLUSTER_MODE_STATUS
-			clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE);
-			clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS);
-			clusterModeStatusObj.put(ClusterModeStatus.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS);
-			clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS);
-
-			// STABILITY_CONTROL_STATUS
-			stabilityControlsStatusObj.put(StabilityControlsStatus.KEY_ESC_SYSTEM, VehicleDataHelper.ESC_SYSTEM);
-			stabilityControlsStatusObj.put(StabilityControlsStatus.KEY_TRAILER_SWAY_CONTROL, VehicleDataHelper.S_WAY_TRAILER);
-
-			//MY_KEY
-			myKeyObj.put(MyKey.KEY_E_911_OVERRIDE, VehicleDataHelper.MY_KEY_E_911_OVERRIDE);
-
-			// FUEL_RANGE
-			fuelRangeObj.put(FuelRange.KEY_TYPE, VehicleDataHelper.FUEL_RANGE_TYPE);
-			fuelRangeObj.put(FuelRange.KEY_RANGE, VehicleDataHelper.FUEL_RANGE_RANGE);
-			fuelRangeObj.put(FuelRange.KEY_CAPACITY, VehicleDataHelper.FUEL_RANGE_CAPACITY);
-			fuelRangeObj.put(FuelRange.KEY_CAPACITY_UNIT, VehicleDataHelper.FUEL_RANGE_CAPACITY_UNIT);
-			fuelRangeObj.put(FuelRange.KEY_LEVEL, VehicleDataHelper.FUEL_RANGE_LEVEL);
-			fuelRangeObj.put(FuelRange.KEY_LEVEL_STATE, VehicleDataHelper.FUEL_RANGE_LEVEL_STATE);
-			fuelRangeArrayObj.put(fuelRangeObj);
-
-			//GEAR_STATUS
-			gearStatusObj.put(GearStatus.KEY_USER_SELECTED_GEAR, VehicleDataHelper.USER_SELECTED_GEAR);
-			gearStatusObj.put(GearStatus.KEY_TRANSMISSION_TYPE, VehicleDataHelper.TRANSMISSION_TYPE);
-			gearStatusObj.put(GearStatus.KEY_ACTUAL_GEAR, VehicleDataHelper.ACTUAL_GEAR);
-
-			// WINDOW_STATUS
-			windowStatusObj.put(WindowStatus.KEY_LOCATION, VehicleDataHelper.LOCATION_GRID);
-			windowStatusObj.put(WindowStatus.KEY_STATE, VehicleDataHelper.WINDOW_STATE);
-			windowStatusArrayObj.put(windowStatusObj);
-
-			reference.put(GetVehicleDataResponse.KEY_SPEED, VehicleDataHelper.SPEED);
-			reference.put(GetVehicleDataResponse.KEY_RPM, VehicleDataHelper.RPM);
-			reference.put(GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE);
-			reference.put(GetVehicleDataResponse.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL);
-			reference.put(GetVehicleDataResponse.KEY_VIN, VehicleDataHelper.VIN);
-			reference.put(GetVehicleDataResponse.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL);
-			reference.put(GetVehicleDataResponse.KEY_TIRE_PRESSURE, tireStatusObj);
-			reference.put(GetVehicleDataResponse.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE);
-			reference.put(GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE, VehicleDataHelper.ENGINE_OIL_LIFE);
-			reference.put(GetVehicleDataResponse.KEY_ODOMETER, VehicleDataHelper.ODOMETER);
-			reference.put(GetVehicleDataResponse.KEY_GPS, GPSDataObj);
-			reference.put(GetVehicleDataResponse.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE);
-			reference.put(GetVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION);
-			reference.put(GetVehicleDataResponse.KEY_BELT_STATUS, beltStatusObj);
-			reference.put(GetVehicleDataResponse.KEY_BODY_INFORMATION, bodyInformationObj);
-			reference.put(GetVehicleDataResponse.KEY_DEVICE_STATUS, deviceStatusObj);
-			reference.put(GetVehicleDataResponse.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING);
-			reference.put(GetVehicleDataResponse.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS);
-			reference.put(GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS, headLampStatusObj);
-			reference.put(GetVehicleDataResponse.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION);
-			reference.put(GetVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE);
-			reference.put(GetVehicleDataResponse.KEY_E_CALL_INFO, ECallInfoObj);
-			reference.put(GetVehicleDataResponse.KEY_AIRBAG_STATUS, airbagStatusObj);
-			reference.put(GetVehicleDataResponse.KEY_EMERGENCY_EVENT, emergencyEventObj);
-			reference.put(GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj);
-			reference.put(GetVehicleDataResponse.KEY_MY_KEY, myKeyObj);
-			reference.put(GetVehicleDataResponse.KEY_FUEL_RANGE, fuelRangeArrayObj);
-			reference.put(GetVehicleDataResponse.KEY_TURN_SIGNAL, TurnSignal.OFF);
-			reference.put(GetVehicleDataResponse.KEY_GEAR_STATUS, gearStatusObj);
-			reference.put(GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
-			reference.put(GetVehicleDataResponse.KEY_WINDOW_STATUS, windowStatusArrayObj);
-			reference.put(GetVehicleDataResponse.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING);
-			reference.put(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, stabilityControlsStatusObj);
-			reference.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
-
-			JSONObject underTest = msg.serializeJSON();
-			
-			//go inside underTest and only return the JSONObject inside the parameters key inside the response key
-			underTest = underTest.getJSONObject("response").getJSONObject("parameters");
-
-			assertEquals("JSON size didn't match expected size.", reference.length(), underTest.length());
-
-			Iterator<?> iterator = reference.keys();
-			
-			while (iterator.hasNext()) {
-				String key = (String) iterator.next();
-				
-				if (key.equals(GetVehicleDataResponse.KEY_TIRE_PRESSURE)) {
-					JSONObject tirePressureReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject tirePressureTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateTireStatus(
-									new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureReference)),
-									new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureTest))));
-					
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_GPS)) {
-					JSONObject GPSObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject GPSObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateGpsData(
-									new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjReference)),
-									new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_BELT_STATUS)) {
-					JSONObject beltObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject beltObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateBeltStatus(
-									new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjReference)),
-									new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_BODY_INFORMATION)) {
-					JSONObject bodyInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject bodyInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateBodyInformation(
-									new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjReference)),
-									new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_DEVICE_STATUS)) {
-					JSONObject deviceObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject deviceObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateDeviceStatus(
-									new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjReference)),
-									new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS)) {
-					JSONObject headLampObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject headLampObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateHeadLampStatus(
-									new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjReference)),
-									new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_E_CALL_INFO)) {
-					JSONObject callInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject callInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateECallInfo(
-									new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjReference)),
-									new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_AIRBAG_STATUS)) {
-					JSONObject airbagObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject airbagObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateAirbagStatus(
-									new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjReference)),
-									new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_EMERGENCY_EVENT)) {
-					JSONObject emergencyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject emergencyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateEmergencyEvent(
-									new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjReference)),
-									new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS)) {
-					JSONObject clusterModeObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject clusterModeObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateClusterModeStatus(
-									new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjReference)),
-									new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_MY_KEY)) {
-					JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-					
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateMyKey(
-									new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
-									new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE)) {
-					assertEquals("JSON value didn't match expected value for key \"" + key + "\".",
-							JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_GEAR_STATUS)) {
-					JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-
-					assertTrue(TestValues.TRUE, Validator.validateGearStatuses(
-							new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
-							new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS)) {
-					JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
-					JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
-
-					StabilityControlsStatus status1 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference));
-					StabilityControlsStatus status2 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest));
-
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateStabilityControlStatus(
-									status1,
-									status2
-							)
-					);
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_FUEL_RANGE)) {
-					JSONArray fuelRangeArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-					List<FuelRange> fuelRangeRefereceList = new ArrayList<FuelRange>();
-					for (int index = 0; index < fuelRangeArrayObjReference.length(); index++) {
-						FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)fuelRangeArrayObjReference.get(index) ));
-						fuelRangeRefereceList.add(fuelRange);
-					}
-
-					JSONArray fuelRangeArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					List<FuelRange> fuelRangeUnderTestList = new ArrayList<FuelRange>();
-					for (int index = 0; index < fuelRangeArrayObjTest.length(); index++) {
-						FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)fuelRangeArrayObjTest.get(index) ));
-						fuelRangeUnderTestList.add(fuelRange);
-					}
-
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateFuelRange(
-									fuelRangeRefereceList,
-									fuelRangeUnderTestList));
-				}
-				else if (key.equals(GetVehicleDataResponse.KEY_WINDOW_STATUS)) {
-					JSONArray windowStatusArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
-					List<WindowStatus> windowStatusReferenceList = new ArrayList<>();
-					for (int index = 0; index < windowStatusArrayObjReference.length(); index++) {
-						WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)windowStatusArrayObjReference.get(index) ));
-						windowStatusReferenceList.add(windowStatus);
-					}
-
-					JSONArray windowStatusArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
-					List<WindowStatus> windowStatusUnderTestList = new ArrayList<>();
-					for (int index = 0; index < windowStatusArrayObjTest.length(); index++) {
-						WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)windowStatusArrayObjTest.get(index) ));
-						windowStatusUnderTestList.add(windowStatus);
-					}
-
-					assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
-							Validator.validateWindowStatuses(
-									windowStatusReferenceList,
-									windowStatusUnderTestList));
-				}
-				else {
-					assertEquals("JSON value didn't match expected value for key \"" + key + "\".",
-							JsonUtils.readObjectFromJsonObject(reference, key),
-							JsonUtils.readObjectFromJsonObject(underTest, key));
-	            }
-				
-			}
-			
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
+        JSONObject reference = new JSONObject();
+
+        //objects needed on the first level
+        JSONObject tireStatusObj = new JSONObject();
+        JSONObject GPSDataObj = new JSONObject();
+        JSONObject beltStatusObj = new JSONObject();
+        JSONObject bodyInformationObj = new JSONObject();
+        JSONObject deviceStatusObj = new JSONObject();
+        JSONObject headLampStatusObj = new JSONObject();
+        JSONObject ECallInfoObj = new JSONObject();
+        JSONObject airbagStatusObj = new JSONObject();
+        JSONObject emergencyEventObj = new JSONObject();
+        JSONObject clusterModeStatusObj = new JSONObject();
+        JSONObject myKeyObj = new JSONObject();
+        JSONObject stabilityControlsStatusObj = new JSONObject();
+        JSONObject fuelRangeObj = new JSONObject();
+        JSONObject windowStatusObj = new JSONObject();
+        JSONObject gearStatusObj = new JSONObject();
+        JSONArray fuelRangeArrayObj = new JSONArray();
+        JSONArray windowStatusArrayObj = new JSONArray();
+
+        try {
+            //set up the JSONObject to represent GetVehicleDataResponse
+            //TIRE_PRESSURE
+            tireStatusObj.put(TireStatus.KEY_PRESSURE_TELL_TALE, VehicleDataHelper.TIRE_PRESSURE_TELL_TALE);
+            JSONObject tireLeftFront = new JSONObject();
+            tireLeftFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_FRONT);
+            tireStatusObj.put(TireStatus.KEY_LEFT_FRONT, tireLeftFront);
+            JSONObject tireRightFront = new JSONObject();
+            tireRightFront.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_FRONT);
+            tireStatusObj.put(TireStatus.KEY_RIGHT_FRONT, tireRightFront);
+            JSONObject tireLeftRear = new JSONObject();
+            tireLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_LEFT_REAR);
+            tireStatusObj.put(TireStatus.KEY_LEFT_REAR, tireLeftRear);
+            JSONObject tireRightRear = new JSONObject();
+            tireRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_RIGHT_REAR);
+            tireStatusObj.put(TireStatus.KEY_RIGHT_REAR, tireRightRear);
+            JSONObject tireInnerLeftRear = new JSONObject();
+            tireInnerLeftRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_LEFT_REAR);
+            tireStatusObj.put(TireStatus.KEY_INNER_LEFT_REAR, tireInnerLeftRear);
+            JSONObject tireInnerRightRear = new JSONObject();
+            tireInnerRightRear.put(SingleTireStatus.KEY_STATUS, VehicleDataHelper.TIRE_PRESSURE_INNER_RIGHT_REAR);
+            tireStatusObj.put(TireStatus.KEY_INNER_RIGHT_REAR, tireInnerRightRear);
+
+            //GPS
+            GPSDataObj.put(GPSData.KEY_LONGITUDE_DEGREES, VehicleDataHelper.GPS_LONGITUDE);
+            GPSDataObj.put(GPSData.KEY_LATITUDE_DEGREES, VehicleDataHelper.GPS_LATITUDE);
+            GPSDataObj.put(GPSData.KEY_UTC_YEAR, VehicleDataHelper.GPS_YEAR);
+            GPSDataObj.put(GPSData.KEY_UTC_MONTH, VehicleDataHelper.GPS_MONTH);
+            GPSDataObj.put(GPSData.KEY_UTC_DAY, VehicleDataHelper.GPS_DAY);
+            GPSDataObj.put(GPSData.KEY_UTC_HOURS, VehicleDataHelper.GPS_HOURS);
+            GPSDataObj.put(GPSData.KEY_UTC_MINUTES, VehicleDataHelper.GPS_MINUTES);
+            GPSDataObj.put(GPSData.KEY_UTC_SECONDS, VehicleDataHelper.GPS_SECONDS);
+            GPSDataObj.put(GPSData.KEY_COMPASS_DIRECTION, VehicleDataHelper.GPS_DIRECTION);
+            GPSDataObj.put(GPSData.KEY_PDOP, VehicleDataHelper.GPS_PDOP);
+            GPSDataObj.put(GPSData.KEY_VDOP, VehicleDataHelper.GPS_VDOP);
+            GPSDataObj.put(GPSData.KEY_HDOP, VehicleDataHelper.GPS_HDOP);
+            GPSDataObj.put(GPSData.KEY_ACTUAL, VehicleDataHelper.GPS_ACTUAL);
+            GPSDataObj.put(GPSData.KEY_SATELLITES, VehicleDataHelper.GPS_SATELLITES);
+            GPSDataObj.put(GPSData.KEY_DIMENSION, VehicleDataHelper.GPS_DIMENSION);
+            GPSDataObj.put(GPSData.KEY_ALTITUDE, VehicleDataHelper.GPS_ALTITUDE);
+            GPSDataObj.put(GPSData.KEY_HEADING, VehicleDataHelper.GPS_HEADING);
+            GPSDataObj.put(GPSData.KEY_SPEED, VehicleDataHelper.GPS_SPEED);
+            GPSDataObj.put(GPSData.KEY_SHIFTED, VehicleDataHelper.GPS_SHIFTED);
+
+            //BELT_STATUS
+            beltStatusObj.put(BeltStatus.KEY_DRIVER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_DRIVER_DEPLOYED);
+            beltStatusObj.put(BeltStatus.KEY_PASSENGER_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_PASSENGER_DEPLOYED);
+            beltStatusObj.put(BeltStatus.KEY_PASSENGER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_PASSENGER_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_DRIVER_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_DRIVER_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_2_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_PASSENGER_CHILD_DETECTED, VehicleDataHelper.BELT_STATUS_PASSENGER_CHILD);
+            beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_2_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_2_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_2_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_3_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_LEFT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_ROW_3_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_RIGHT_ROW_3_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_ROW_3_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_LEFT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_LEFT_REAR_INFLATABLE_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_RIGHT_REAR_INFLATABLE_BELTED, VehicleDataHelper.BELT_STATUS_RIGHT_REAR_INFLATABLE_BELTED);
+            beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BELT_DEPLOYED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_DEPLOYED);
+            beltStatusObj.put(BeltStatus.KEY_MIDDLE_ROW_1_BUCKLE_BELTED, VehicleDataHelper.BELT_STATUS_MIDDLE_ROW_1_BELTED);
+
+            //BODY_INFORMATION
+            bodyInformationObj.put(BodyInformation.KEY_PARK_BRAKE_ACTIVE, VehicleDataHelper.BODY_INFORMATION_PARK_BRAKE);
+            bodyInformationObj.put(BodyInformation.KEY_IGNITION_STABLE_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STATUS);
+            bodyInformationObj.put(BodyInformation.KEY_IGNITION_STATUS, VehicleDataHelper.BODY_INFORMATION_IGNITION_STABLE_STATUS);
+            bodyInformationObj.put(BodyInformation.KEY_DRIVER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_DRIVER_AJAR);
+            bodyInformationObj.put(BodyInformation.KEY_PASSENGER_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_PASSENGER_AJAR);
+            bodyInformationObj.put(BodyInformation.KEY_REAR_LEFT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_LEFT_AJAR);
+            bodyInformationObj.put(BodyInformation.KEY_REAR_RIGHT_DOOR_AJAR, VehicleDataHelper.BODY_INFORMATION_REAR_RIGHT_AJAR);
+
+            //DEVICE_STATUS
+            deviceStatusObj.put(DeviceStatus.KEY_VOICE_REC_ON, VehicleDataHelper.DEVICE_STATUS_VOICE_REC);
+            deviceStatusObj.put(DeviceStatus.KEY_BT_ICON_ON, VehicleDataHelper.DEVICE_STATUS_BT_ICON);
+            deviceStatusObj.put(DeviceStatus.KEY_CALL_ACTIVE, VehicleDataHelper.DEVICE_STATUS_CALL_ACTIVE);
+            deviceStatusObj.put(DeviceStatus.KEY_PHONE_ROAMING, VehicleDataHelper.DEVICE_STATUS_PHONE_ROAMING);
+            deviceStatusObj.put(DeviceStatus.KEY_TEXT_MSG_AVAILABLE, VehicleDataHelper.DEVICE_STATUS_TEXT_MSG_AVAILABLE);
+            deviceStatusObj.put(DeviceStatus.KEY_BATT_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_BATT_LEVEL_STATUS);
+            deviceStatusObj.put(DeviceStatus.KEY_STEREO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_STEREO_MUTED);
+            deviceStatusObj.put(DeviceStatus.KEY_MONO_AUDIO_OUTPUT_MUTED, VehicleDataHelper.DEVICE_STATUS_MONO_MUTED);
+            deviceStatusObj.put(DeviceStatus.KEY_SIGNAL_LEVEL_STATUS, VehicleDataHelper.DEVICE_STATUS_SIGNAL_LEVEL_STATUS);
+            deviceStatusObj.put(DeviceStatus.KEY_PRIMARY_AUDIO_SOURCE, VehicleDataHelper.DEVICE_STATUS_PRIMARY_AUDIO);
+            deviceStatusObj.put(DeviceStatus.KEY_E_CALL_EVENT_ACTIVE, VehicleDataHelper.DEVICE_STATUS_E_CALL_ACTIVE);
+
+            //HEAD_LAMP_STATUS
+            headLampStatusObj.put(HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS, VehicleDataHelper.HEAD_LAMP_STATUS_AMBIENT_STATUS);
+            headLampStatusObj.put(HeadLampStatus.KEY_HIGH_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_HIGH_BEAMS);
+            headLampStatusObj.put(HeadLampStatus.KEY_LOW_BEAMS_ON, VehicleDataHelper.HEAD_LAMP_LOW_BEAMS);
+
+            //E_CALL_INFO
+            ECallInfoObj.put(ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_E_CALL_NOTIFICATION_STATUS);
+            ECallInfoObj.put(ECallInfo.KEY_AUX_E_CALL_NOTIFICATION_STATUS, VehicleDataHelper.E_CALL_INFO_AUX_E_CALL_NOTIFICATION_STATUS);
+            ECallInfoObj.put(ECallInfo.KEY_E_CALL_CONFIRMATION_STATUS, VehicleDataHelper.E_CALL_INFO_CONFIRMATION_STATUS);
+
+            //AIRBAG_STATUS
+            airbagStatusObj.put(AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_DRIVER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_SIDE_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_CURTAIN_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_DRIVER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_DRIVER_KNEE_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_SIDE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_SIDE_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_CURTAIN_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_CURTAIN_DEPLOYED);
+            airbagStatusObj.put(AirbagStatus.KEY_PASSENGER_KNEE_AIRBAG_DEPLOYED, VehicleDataHelper.AIRBAG_STATUS_PASSENGER_KNEE_DEPLOYED);
+
+            //EMERGENCY_EVENT
+            emergencyEventObj.put(EmergencyEvent.KEY_EMERGENCY_EVENT_TYPE, VehicleDataHelper.EMERGENCY_EVENT_TYPE);
+            emergencyEventObj.put(EmergencyEvent.KEY_FUEL_CUTOFF_STATUS, VehicleDataHelper.EMERGENCY_EVENT_FUEL_CUTOFF_STATUS);
+            emergencyEventObj.put(EmergencyEvent.KEY_ROLLOVER_EVENT, VehicleDataHelper.EMERGENCY_EVENT_ROLLOVER_EVENT);
+            emergencyEventObj.put(EmergencyEvent.KEY_MAXIMUM_CHANGE_VELOCITY, VehicleDataHelper.EMERGENCY_EVENT_MAX_CHANGE_VELOCITY);
+            emergencyEventObj.put(EmergencyEvent.KEY_MULTIPLE_EVENTS, VehicleDataHelper.EMERGENCY_EVENT_MULTIPLE_EVENTS);
+
+            //CLUSTER_MODE_STATUS
+            clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_ACTIVE, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_ACTIVE);
+            clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_QUALIFICATION_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_QUALIFICATION_STATUS);
+            clusterModeStatusObj.put(ClusterModeStatus.KEY_CAR_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_CAR_MODE_STATUS);
+            clusterModeStatusObj.put(ClusterModeStatus.KEY_POWER_MODE_STATUS, VehicleDataHelper.CLUSTER_MODE_STATUS_POWER_MODE_STATUS);
+
+            // STABILITY_CONTROL_STATUS
+            stabilityControlsStatusObj.put(StabilityControlsStatus.KEY_ESC_SYSTEM, VehicleDataHelper.ESC_SYSTEM);
+            stabilityControlsStatusObj.put(StabilityControlsStatus.KEY_TRAILER_SWAY_CONTROL, VehicleDataHelper.S_WAY_TRAILER);
+
+            //MY_KEY
+            myKeyObj.put(MyKey.KEY_E_911_OVERRIDE, VehicleDataHelper.MY_KEY_E_911_OVERRIDE);
+
+            // FUEL_RANGE
+            fuelRangeObj.put(FuelRange.KEY_TYPE, VehicleDataHelper.FUEL_RANGE_TYPE);
+            fuelRangeObj.put(FuelRange.KEY_RANGE, VehicleDataHelper.FUEL_RANGE_RANGE);
+            fuelRangeObj.put(FuelRange.KEY_CAPACITY, VehicleDataHelper.FUEL_RANGE_CAPACITY);
+            fuelRangeObj.put(FuelRange.KEY_CAPACITY_UNIT, VehicleDataHelper.FUEL_RANGE_CAPACITY_UNIT);
+            fuelRangeObj.put(FuelRange.KEY_LEVEL, VehicleDataHelper.FUEL_RANGE_LEVEL);
+            fuelRangeObj.put(FuelRange.KEY_LEVEL_STATE, VehicleDataHelper.FUEL_RANGE_LEVEL_STATE);
+            fuelRangeArrayObj.put(fuelRangeObj);
+
+            //GEAR_STATUS
+            gearStatusObj.put(GearStatus.KEY_USER_SELECTED_GEAR, VehicleDataHelper.USER_SELECTED_GEAR);
+            gearStatusObj.put(GearStatus.KEY_TRANSMISSION_TYPE, VehicleDataHelper.TRANSMISSION_TYPE);
+            gearStatusObj.put(GearStatus.KEY_ACTUAL_GEAR, VehicleDataHelper.ACTUAL_GEAR);
+
+            // WINDOW_STATUS
+            windowStatusObj.put(WindowStatus.KEY_LOCATION, VehicleDataHelper.LOCATION_GRID);
+            windowStatusObj.put(WindowStatus.KEY_STATE, VehicleDataHelper.WINDOW_STATE);
+            windowStatusArrayObj.put(windowStatusObj);
+
+            reference.put(GetVehicleDataResponse.KEY_SPEED, VehicleDataHelper.SPEED);
+            reference.put(GetVehicleDataResponse.KEY_RPM, VehicleDataHelper.RPM);
+            reference.put(GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, VehicleDataHelper.EXTERNAL_TEMPERATURE);
+            reference.put(GetVehicleDataResponse.KEY_FUEL_LEVEL, VehicleDataHelper.FUEL_LEVEL);
+            reference.put(GetVehicleDataResponse.KEY_VIN, VehicleDataHelper.VIN);
+            reference.put(GetVehicleDataResponse.KEY_PRNDL, VehicleDataHelper.PRNDL_FINAL);
+            reference.put(GetVehicleDataResponse.KEY_TIRE_PRESSURE, tireStatusObj);
+            reference.put(GetVehicleDataResponse.KEY_ENGINE_TORQUE, VehicleDataHelper.ENGINE_TORQUE);
+            reference.put(GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE, VehicleDataHelper.ENGINE_OIL_LIFE);
+            reference.put(GetVehicleDataResponse.KEY_ODOMETER, VehicleDataHelper.ODOMETER);
+            reference.put(GetVehicleDataResponse.KEY_GPS, GPSDataObj);
+            reference.put(GetVehicleDataResponse.KEY_FUEL_LEVEL_STATE, VehicleDataHelper.FUEL_LEVEL_STATE);
+            reference.put(GetVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION);
+            reference.put(GetVehicleDataResponse.KEY_BELT_STATUS, beltStatusObj);
+            reference.put(GetVehicleDataResponse.KEY_BODY_INFORMATION, bodyInformationObj);
+            reference.put(GetVehicleDataResponse.KEY_DEVICE_STATUS, deviceStatusObj);
+            reference.put(GetVehicleDataResponse.KEY_DRIVER_BRAKING, VehicleDataHelper.DRIVER_BRAKING);
+            reference.put(GetVehicleDataResponse.KEY_WIPER_STATUS, VehicleDataHelper.WIPER_STATUS);
+            reference.put(GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS, headLampStatusObj);
+            reference.put(GetVehicleDataResponse.KEY_ACC_PEDAL_POSITION, VehicleDataHelper.ACC_PEDAL_POSITION);
+            reference.put(GetVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, VehicleDataHelper.STEERING_WHEEL_ANGLE);
+            reference.put(GetVehicleDataResponse.KEY_E_CALL_INFO, ECallInfoObj);
+            reference.put(GetVehicleDataResponse.KEY_AIRBAG_STATUS, airbagStatusObj);
+            reference.put(GetVehicleDataResponse.KEY_EMERGENCY_EVENT, emergencyEventObj);
+            reference.put(GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS, clusterModeStatusObj);
+            reference.put(GetVehicleDataResponse.KEY_MY_KEY, myKeyObj);
+            reference.put(GetVehicleDataResponse.KEY_FUEL_RANGE, fuelRangeArrayObj);
+            reference.put(GetVehicleDataResponse.KEY_TURN_SIGNAL, TurnSignal.OFF);
+            reference.put(GetVehicleDataResponse.KEY_GEAR_STATUS, gearStatusObj);
+            reference.put(GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS);
+            reference.put(GetVehicleDataResponse.KEY_WINDOW_STATUS, windowStatusArrayObj);
+            reference.put(GetVehicleDataResponse.KEY_HANDS_OFF_STEERING, VehicleDataHelper.HANDS_OFF_STEERING);
+            reference.put(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, stabilityControlsStatusObj);
+            reference.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE);
+
+            JSONObject underTest = msg.serializeJSON();
+
+            //go inside underTest and only return the JSONObject inside the parameters key inside the response key
+            underTest = underTest.getJSONObject("response").getJSONObject("parameters");
+
+            assertEquals("JSON size didn't match expected size.", reference.length(), underTest.length());
+
+            Iterator<?> iterator = reference.keys();
+
+            while (iterator.hasNext()) {
+                String key = (String) iterator.next();
+
+                if (key.equals(GetVehicleDataResponse.KEY_TIRE_PRESSURE)) {
+                    JSONObject tirePressureReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject tirePressureTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateTireStatus(
+                                    new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureReference)),
+                                    new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tirePressureTest))));
+
+                } else if (key.equals(GetVehicleDataResponse.KEY_GPS)) {
+                    JSONObject GPSObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject GPSObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateGpsData(
+                                    new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjReference)),
+                                    new GPSData(JsonRPCMarshaller.deserializeJSONObject(GPSObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_BELT_STATUS)) {
+                    JSONObject beltObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject beltObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateBeltStatus(
+                                    new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjReference)),
+                                    new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_BODY_INFORMATION)) {
+                    JSONObject bodyInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject bodyInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateBodyInformation(
+                                    new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjReference)),
+                                    new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInfoObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_DEVICE_STATUS)) {
+                    JSONObject deviceObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject deviceObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateDeviceStatus(
+                                    new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjReference)),
+                                    new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS)) {
+                    JSONObject headLampObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject headLampObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateHeadLampStatus(
+                                    new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjReference)),
+                                    new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_E_CALL_INFO)) {
+                    JSONObject callInfoObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject callInfoObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateECallInfo(
+                                    new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjReference)),
+                                    new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(callInfoObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_AIRBAG_STATUS)) {
+                    JSONObject airbagObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject airbagObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateAirbagStatus(
+                                    new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjReference)),
+                                    new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_EMERGENCY_EVENT)) {
+                    JSONObject emergencyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject emergencyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateEmergencyEvent(
+                                    new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjReference)),
+                                    new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS)) {
+                    JSONObject clusterModeObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject clusterModeObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateClusterModeStatus(
+                                    new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjReference)),
+                                    new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_MY_KEY)) {
+                    JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateMyKey(
+                                    new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
+                                    new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE)) {
+                    assertEquals("JSON value didn't match expected value for key \"" + key + "\".",
+                            JsonUtils.readDoubleFromJsonObject(reference, key), JsonUtils.readDoubleFromJsonObject(underTest, key));
+                } else if (key.equals(GetVehicleDataResponse.KEY_GEAR_STATUS)) {
+                    JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    assertTrue(TestValues.TRUE, Validator.validateGearStatuses(
+                            new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference)),
+                            new GearStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest))));
+                } else if (key.equals(GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS)) {
+                    JSONObject myKeyObjReference = JsonUtils.readJsonObjectFromJsonObject(reference, key);
+                    JSONObject myKeyObjTest = JsonUtils.readJsonObjectFromJsonObject(underTest, key);
+
+                    StabilityControlsStatus status1 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjReference));
+                    StabilityControlsStatus status2 = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(myKeyObjTest));
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateStabilityControlStatus(
+                                    status1,
+                                    status2
+                            )
+                    );
+                } else if (key.equals(GetVehicleDataResponse.KEY_FUEL_RANGE)) {
+                    JSONArray fuelRangeArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                    List<FuelRange> fuelRangeRefereceList = new ArrayList<FuelRange>();
+                    for (int index = 0; index < fuelRangeArrayObjReference.length(); index++) {
+                        FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject((JSONObject) fuelRangeArrayObjReference.get(index)));
+                        fuelRangeRefereceList.add(fuelRange);
+                    }
+
+                    JSONArray fuelRangeArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    List<FuelRange> fuelRangeUnderTestList = new ArrayList<FuelRange>();
+                    for (int index = 0; index < fuelRangeArrayObjTest.length(); index++) {
+                        FuelRange fuelRange = new FuelRange(JsonRPCMarshaller.deserializeJSONObject((JSONObject) fuelRangeArrayObjTest.get(index)));
+                        fuelRangeUnderTestList.add(fuelRange);
+                    }
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateFuelRange(
+                                    fuelRangeRefereceList,
+                                    fuelRangeUnderTestList));
+                } else if (key.equals(GetVehicleDataResponse.KEY_WINDOW_STATUS)) {
+                    JSONArray windowStatusArrayObjReference = JsonUtils.readJsonArrayFromJsonObject(reference, key);
+                    List<WindowStatus> windowStatusReferenceList = new ArrayList<>();
+                    for (int index = 0; index < windowStatusArrayObjReference.length(); index++) {
+                        WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject((JSONObject) windowStatusArrayObjReference.get(index)));
+                        windowStatusReferenceList.add(windowStatus);
+                    }
+
+                    JSONArray windowStatusArrayObjTest = JsonUtils.readJsonArrayFromJsonObject(underTest, key);
+                    List<WindowStatus> windowStatusUnderTestList = new ArrayList<>();
+                    for (int index = 0; index < windowStatusArrayObjTest.length(); index++) {
+                        WindowStatus windowStatus = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject((JSONObject) windowStatusArrayObjTest.get(index)));
+                        windowStatusUnderTestList.add(windowStatus);
+                    }
+
+                    assertTrue("JSON value didn't match expected value for key \"" + key + "\".",
+                            Validator.validateWindowStatuses(
+                                    windowStatusReferenceList,
+                                    windowStatusUnderTestList));
+                } else {
+                    assertEquals("JSON value didn't match expected value for key \"" + key + "\".",
+                            JsonUtils.readObjectFromJsonObject(reference, key),
+                            JsonUtils.readObjectFromJsonObject(underTest, key));
+                }
+
+            }
+
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-	public void testRpcValues(){
-		// Valid Tests
-		assertEquals(TestValues.MATCH, VehicleDataHelper.SPEED, ( (GetVehicleDataResponse) msg ).getSpeed());
-		assertEquals(TestValues.MATCH, (Integer) VehicleDataHelper.RPM, ( (GetVehicleDataResponse) msg ).getRpm());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.EXTERNAL_TEMPERATURE, ( (GetVehicleDataResponse) msg ).getExternalTemperature());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL, ( (GetVehicleDataResponse) msg ).getFuelLevel());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.PRNDL_FINAL, ( (GetVehicleDataResponse) msg ).getPrndl());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.TIRE_PRESSURE, ( (GetVehicleDataResponse) msg ).getTirePressure());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_TORQUE, ( (GetVehicleDataResponse) msg ).getEngineTorque());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_OIL_LIFE, ( (GetVehicleDataResponse) msg ).getEngineOilLife());
-		assertEquals(TestValues.MATCH, (Integer) VehicleDataHelper.ODOMETER, ( (GetVehicleDataResponse) msg ).getOdometer());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.GPS, ( (GetVehicleDataResponse) msg ).getGps());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL_STATE, ( (GetVehicleDataResponse) msg ).getFuelLevelState());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION, ( (GetVehicleDataResponse) msg ).getInstantFuelConsumption());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.BELT_STATUS, ( (GetVehicleDataResponse) msg ).getBeltStatus());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.BODY_INFORMATION, ( (GetVehicleDataResponse) msg ).getBodyInformation());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.DEVICE_STATUS, ( (GetVehicleDataResponse) msg ).getDeviceStatus());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.DRIVER_BRAKING, ( (GetVehicleDataResponse) msg ).getDriverBraking());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.WIPER_STATUS, ( (GetVehicleDataResponse) msg ).getWiperStatus());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.HEAD_LAMP_STATUS, ( (GetVehicleDataResponse) msg ).getHeadLampStatus());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.ACC_PEDAL_POSITION, ( (GetVehicleDataResponse) msg ).getAccPedalPosition());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.STEERING_WHEEL_ANGLE, ( (GetVehicleDataResponse) msg ).getSteeringWheelAngle());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.E_CALL_INFO, ( (GetVehicleDataResponse) msg ).getECallInfo());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.AIRBAG_STATUS, ( (GetVehicleDataResponse) msg ).getAirbagStatus());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.EMERGENCY_EVENT, ( (GetVehicleDataResponse) msg ).getEmergencyEvent());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.CLUSTER_MODE_STATUS, ( (GetVehicleDataResponse) msg ).getClusterModeStatus());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.MY_KEY, ( (GetVehicleDataResponse) msg ).getMyKey());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.TURN_SIGNAL, ( (GetVehicleDataResponse) msg ).getTurnSignal());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS, ( (GetVehicleDataResponse) msg ).getElectronicParkBrakeStatus());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.WINDOW_STATUS_LIST, ( (GetVehicleDataResponse) msg ).getWindowStatus());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.GEAR_STATUS, ( (GetVehicleDataResponse) msg ).getGearStatus());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.HANDS_OFF_STEERING, ( (GetVehicleDataResponse) msg ).getHandsOffSteering());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.STABILITY_CONTROLS_STATUS, ( (GetVehicleDataResponse) msg ).getStabilityControlsStatus());
-		assertEquals(TestValues.MATCH, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE, ( (GetVehicleDataResponse) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-		
-		// Invalid/Null Tests
-		GetVehicleDataResponse msg = new GetVehicleDataResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-		
-		assertNull(TestValues.NULL, msg.getAccPedalPosition());
+    public void testRpcValues() {
+        // Valid Tests
+        assertEquals(TestValues.MATCH, VehicleDataHelper.SPEED, ((GetVehicleDataResponse) msg).getSpeed());
+        assertEquals(TestValues.MATCH, (Integer) VehicleDataHelper.RPM, ((GetVehicleDataResponse) msg).getRpm());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.EXTERNAL_TEMPERATURE, ((GetVehicleDataResponse) msg).getExternalTemperature());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL, ((GetVehicleDataResponse) msg).getFuelLevel());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.PRNDL_FINAL, ((GetVehicleDataResponse) msg).getPrndl());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.TIRE_PRESSURE, ((GetVehicleDataResponse) msg).getTirePressure());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_TORQUE, ((GetVehicleDataResponse) msg).getEngineTorque());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.ENGINE_OIL_LIFE, ((GetVehicleDataResponse) msg).getEngineOilLife());
+        assertEquals(TestValues.MATCH, (Integer) VehicleDataHelper.ODOMETER, ((GetVehicleDataResponse) msg).getOdometer());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.GPS, ((GetVehicleDataResponse) msg).getGps());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.FUEL_LEVEL_STATE, ((GetVehicleDataResponse) msg).getFuelLevelState());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.INSTANT_FUEL_CONSUMPTION, ((GetVehicleDataResponse) msg).getInstantFuelConsumption());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.BELT_STATUS, ((GetVehicleDataResponse) msg).getBeltStatus());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.BODY_INFORMATION, ((GetVehicleDataResponse) msg).getBodyInformation());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.DEVICE_STATUS, ((GetVehicleDataResponse) msg).getDeviceStatus());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.DRIVER_BRAKING, ((GetVehicleDataResponse) msg).getDriverBraking());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.WIPER_STATUS, ((GetVehicleDataResponse) msg).getWiperStatus());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.HEAD_LAMP_STATUS, ((GetVehicleDataResponse) msg).getHeadLampStatus());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.ACC_PEDAL_POSITION, ((GetVehicleDataResponse) msg).getAccPedalPosition());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.STEERING_WHEEL_ANGLE, ((GetVehicleDataResponse) msg).getSteeringWheelAngle());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.E_CALL_INFO, ((GetVehicleDataResponse) msg).getECallInfo());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.AIRBAG_STATUS, ((GetVehicleDataResponse) msg).getAirbagStatus());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.EMERGENCY_EVENT, ((GetVehicleDataResponse) msg).getEmergencyEvent());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.CLUSTER_MODE_STATUS, ((GetVehicleDataResponse) msg).getClusterModeStatus());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.MY_KEY, ((GetVehicleDataResponse) msg).getMyKey());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.TURN_SIGNAL, ((GetVehicleDataResponse) msg).getTurnSignal());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.ELECTRONIC_PARK_BRAKE_STATUS, ((GetVehicleDataResponse) msg).getElectronicParkBrakeStatus());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.WINDOW_STATUS_LIST, ((GetVehicleDataResponse) msg).getWindowStatus());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.GEAR_STATUS, ((GetVehicleDataResponse) msg).getGearStatus());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.HANDS_OFF_STEERING, ((GetVehicleDataResponse) msg).getHandsOffSteering());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.STABILITY_CONTROLS_STATUS, ((GetVehicleDataResponse) msg).getStabilityControlsStatus());
+        assertEquals(TestValues.MATCH, VehicleDataHelper.OEM_CUSTOM_VEHICLE_DATA_STATE, ((GetVehicleDataResponse) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
+
+        // Invalid/Null Tests
+        GetVehicleDataResponse msg = new GetVehicleDataResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getAccPedalPosition());
         assertNull(TestValues.NULL, msg.getAirbagStatus());
         assertNull(TestValues.NULL, msg.getBeltStatus());
         assertNull(TestValues.NULL, msg.getDriverBraking());
@@ -576,120 +560,120 @@ public class GetVehicleDataResponseTests extends BaseRpcTests{
         assertNull(TestValues.NULL, msg.getTurnSignal());
         assertNull(TestValues.NULL, msg.getElectronicParkBrakeStatus());
         assertNull(TestValues.NULL, msg.getGearStatus());
-		assertNull(TestValues.NULL, msg.getHandsOffSteering());
+        assertNull(TestValues.NULL, msg.getHandsOffSteering());
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getWindowStatus());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
     }
-    
 
-	/**
+
+    /**
      * Tests a valid JSON construction of this RPC message.
      */
-	@Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			GetVehicleDataResponse cmd = new GetVehicleDataResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_SPEED), cmd.getSpeed());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetVehicleDataResponse.KEY_RPM), cmd.getRpm());
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature());
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_FUEL_LEVEL), cmd.getFuelLevel());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_VIN), cmd.getVin());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_PRNDL), cmd.getPrndl().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleDataResponse.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering());
-			JSONObject tireStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_TIRE_PRESSURE);
-			TireStatus tireStatus = new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tireStatusObj));
-			assertTrue(TestValues.TRUE, Validator.validateTireStatus(tireStatus, cmd.getTirePressure()) );
-
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_TORQUE), cmd.getEngineTorque());
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife(), 0.0002);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetVehicleDataResponse.KEY_ODOMETER), cmd.getOdometer());
-			
-			JSONObject gpsDataObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_GPS);
-			GPSData gpsData = new GPSData(JsonRPCMarshaller.deserializeJSONObject(gpsDataObj));
-			assertTrue(TestValues.TRUE, Validator.validateGpsData(gpsData, cmd.getGps()) );
-			
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption());
-			
-			JSONObject beltStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_BELT_STATUS);
-			BeltStatus beltStatus = new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltStatusObj));
-			assertTrue(TestValues.TRUE, Validator.validateBeltStatus(beltStatus, cmd.getBeltStatus()) );
-			
-			JSONObject bodyInformationObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_BODY_INFORMATION);
-			BodyInformation bodyInformation = new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInformationObj));
-			assertTrue(TestValues.TRUE, Validator.validateBodyInformation(bodyInformation, cmd.getBodyInformation()) );
-			
-			JSONObject deviceStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_DEVICE_STATUS);
-			DeviceStatus deviceStatus = new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceStatusObj));
-			assertTrue(TestValues.TRUE, Validator.validateDeviceStatus(deviceStatus, cmd.getDeviceStatus()) );
-			
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_DRIVER_BRAKING), cmd.getDriverBraking().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_WIPER_STATUS), cmd.getWiperStatus().toString());
-			
-			JSONObject headLampStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS);
-			HeadLampStatus headLampStatus = new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampStatusObj));
-			assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus(headLampStatus, cmd.getHeadLampStatus()) );
-			
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition());
-			assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle());
-			
-			JSONObject eCallInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_E_CALL_INFO);
-			ECallInfo eCallInfo = new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(eCallInfoObj));
-			assertTrue(TestValues.TRUE, Validator.validateECallInfo(eCallInfo, cmd.getECallInfo()) );
-			
-			JSONObject airbagStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_AIRBAG_STATUS);
-			AirbagStatus airbagStatus = new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagStatusObj));
-			assertTrue(TestValues.TRUE, Validator.validateAirbagStatus(airbagStatus, cmd.getAirbagStatus()) );
-			
-			JSONObject emergencyEventObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_EMERGENCY_EVENT);
-			EmergencyEvent emergencyEvent = new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyEventObj));
-			assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent(emergencyEvent, cmd.getEmergencyEvent()) );
-			
-			JSONObject clusterModeStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS);
-			ClusterModeStatus clusterModeStatus = new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeStatusObj));
-			assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus(clusterModeStatus, cmd.getClusterModeStatus()) );
-
-			JSONObject gearStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_GEAR_STATUS);
-			GearStatus gearStatus = new GearStatus(JsonRPCMarshaller.deserializeJSONObject(gearStatusObj));
-			GearStatus cmdStatus = cmd.getGearStatus();
-			assertTrue(TestValues.TRUE, Validator.validateGearStatuses(gearStatus, cmdStatus));
-
-			JSONObject myKeyObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_MY_KEY);
-			MyKey myKey = new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObj));
-			assertTrue(TestValues.TRUE, Validator.validateMyKey(myKey, cmd.getMyKey()) );
-
-			JSONArray windowStatusArray = JsonUtils.readJsonArrayFromJsonObject(parameters, GetVehicleDataResponse.KEY_WINDOW_STATUS);
-
-			List<WindowStatus> windowStatus = new ArrayList<>();
-			for (int index = 0; index < windowStatusArray.length(); index++) {
-				WindowStatus status = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)windowStatusArray.get(index)) );
-				windowStatus.add(status);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateWindowStatuses(windowStatus, cmd.getWindowStatus()) );
-
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_TURN_SIGNAL), cmd.getTurnSignal().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-
-			JSONObject stabilityControlStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS);
-			StabilityControlsStatus stabilityControlsStatus = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(stabilityControlStatusObj));
-			assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(stabilityControlsStatus, cmd.getStabilityControlsStatus()));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
-    }    
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            GetVehicleDataResponse cmd = new GetVehicleDataResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_SPEED), cmd.getSpeed());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetVehicleDataResponse.KEY_RPM), cmd.getRpm());
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE), cmd.getExternalTemperature());
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_FUEL_LEVEL), cmd.getFuelLevel());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_VIN), cmd.getVin());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_PRNDL), cmd.getPrndl().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readBooleanFromJsonObject(parameters, GetVehicleDataResponse.KEY_HANDS_OFF_STEERING), cmd.getHandsOffSteering());
+            JSONObject tireStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_TIRE_PRESSURE);
+            TireStatus tireStatus = new TireStatus(JsonRPCMarshaller.deserializeJSONObject(tireStatusObj));
+            assertTrue(TestValues.TRUE, Validator.validateTireStatus(tireStatus, cmd.getTirePressure()));
+
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_TORQUE), cmd.getEngineTorque());
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ENGINE_OIL_LIFE), cmd.getEngineOilLife(), 0.0002);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, GetVehicleDataResponse.KEY_ODOMETER), cmd.getOdometer());
+
+            JSONObject gpsDataObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_GPS);
+            GPSData gpsData = new GPSData(JsonRPCMarshaller.deserializeJSONObject(gpsDataObj));
+            assertTrue(TestValues.TRUE, Validator.validateGpsData(gpsData, cmd.getGps()));
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_FUEL_LEVEL_STATE), cmd.getFuelLevelState().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION), cmd.getInstantFuelConsumption());
+
+            JSONObject beltStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_BELT_STATUS);
+            BeltStatus beltStatus = new BeltStatus(JsonRPCMarshaller.deserializeJSONObject(beltStatusObj));
+            assertTrue(TestValues.TRUE, Validator.validateBeltStatus(beltStatus, cmd.getBeltStatus()));
+
+            JSONObject bodyInformationObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_BODY_INFORMATION);
+            BodyInformation bodyInformation = new BodyInformation(JsonRPCMarshaller.deserializeJSONObject(bodyInformationObj));
+            assertTrue(TestValues.TRUE, Validator.validateBodyInformation(bodyInformation, cmd.getBodyInformation()));
+
+            JSONObject deviceStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_DEVICE_STATUS);
+            DeviceStatus deviceStatus = new DeviceStatus(JsonRPCMarshaller.deserializeJSONObject(deviceStatusObj));
+            assertTrue(TestValues.TRUE, Validator.validateDeviceStatus(deviceStatus, cmd.getDeviceStatus()));
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_DRIVER_BRAKING), cmd.getDriverBraking().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_WIPER_STATUS), cmd.getWiperStatus().toString());
+
+            JSONObject headLampStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_HEAD_LAMP_STATUS);
+            HeadLampStatus headLampStatus = new HeadLampStatus(JsonRPCMarshaller.deserializeJSONObject(headLampStatusObj));
+            assertTrue(TestValues.TRUE, Validator.validateHeadLampStatus(headLampStatus, cmd.getHeadLampStatus()));
+
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_ACC_PEDAL_POSITION), cmd.getAccPedalPosition());
+            assertEquals(TestValues.MATCH, JsonUtils.readDoubleFromJsonObject(parameters, GetVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE), cmd.getSteeringWheelAngle());
+
+            JSONObject eCallInfoObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_E_CALL_INFO);
+            ECallInfo eCallInfo = new ECallInfo(JsonRPCMarshaller.deserializeJSONObject(eCallInfoObj));
+            assertTrue(TestValues.TRUE, Validator.validateECallInfo(eCallInfo, cmd.getECallInfo()));
+
+            JSONObject airbagStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_AIRBAG_STATUS);
+            AirbagStatus airbagStatus = new AirbagStatus(JsonRPCMarshaller.deserializeJSONObject(airbagStatusObj));
+            assertTrue(TestValues.TRUE, Validator.validateAirbagStatus(airbagStatus, cmd.getAirbagStatus()));
+
+            JSONObject emergencyEventObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_EMERGENCY_EVENT);
+            EmergencyEvent emergencyEvent = new EmergencyEvent(JsonRPCMarshaller.deserializeJSONObject(emergencyEventObj));
+            assertTrue(TestValues.TRUE, Validator.validateEmergencyEvent(emergencyEvent, cmd.getEmergencyEvent()));
+
+            JSONObject clusterModeStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_CLUSTER_MODE_STATUS);
+            ClusterModeStatus clusterModeStatus = new ClusterModeStatus(JsonRPCMarshaller.deserializeJSONObject(clusterModeStatusObj));
+            assertTrue(TestValues.TRUE, Validator.validateClusterModeStatus(clusterModeStatus, cmd.getClusterModeStatus()));
+
+            JSONObject gearStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_GEAR_STATUS);
+            GearStatus gearStatus = new GearStatus(JsonRPCMarshaller.deserializeJSONObject(gearStatusObj));
+            GearStatus cmdStatus = cmd.getGearStatus();
+            assertTrue(TestValues.TRUE, Validator.validateGearStatuses(gearStatus, cmdStatus));
+
+            JSONObject myKeyObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_MY_KEY);
+            MyKey myKey = new MyKey(JsonRPCMarshaller.deserializeJSONObject(myKeyObj));
+            assertTrue(TestValues.TRUE, Validator.validateMyKey(myKey, cmd.getMyKey()));
+
+            JSONArray windowStatusArray = JsonUtils.readJsonArrayFromJsonObject(parameters, GetVehicleDataResponse.KEY_WINDOW_STATUS);
+
+            List<WindowStatus> windowStatus = new ArrayList<>();
+            for (int index = 0; index < windowStatusArray.length(); index++) {
+                WindowStatus status = new WindowStatus(JsonRPCMarshaller.deserializeJSONObject((JSONObject) windowStatusArray.get(index)));
+                windowStatus.add(status);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateWindowStatuses(windowStatus, cmd.getWindowStatus()));
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_TURN_SIGNAL), cmd.getTurnSignal().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, GetVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS), cmd.getElectronicParkBrakeStatus().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME), cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
+
+            JSONObject stabilityControlStatusObj = JsonUtils.readJsonObjectFromJsonObject(parameters, GetVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS);
+            StabilityControlsStatus stabilityControlsStatus = new StabilityControlsStatus(JsonRPCMarshaller.deserializeJSONObject(stabilityControlStatusObj));
+            assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(stabilityControlsStatus, cmd.getStabilityControlsStatus()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java
index 131aba5fa..8586f650f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetWayPointsResponseTests.java
@@ -78,10 +78,10 @@ public class GetWayPointsResponseTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
 
         // Test Values
-        List<LocationDetails> testWPs = ( (GetWayPointsResponse) msg ).getWayPoints();
+        List<LocationDetails> testWPs = ((GetWayPointsResponse) msg).getWayPoints();
 
         // Valid Tests
         assertEquals(TestValues.MATCH, waypoints, testWPs);
@@ -98,7 +98,7 @@ public class GetWayPointsResponseTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
@@ -118,11 +118,11 @@ public class GetWayPointsResponseTests extends BaseRpcTests {
             JSONArray locArray = JsonUtils.readJsonArrayFromJsonObject(parameters, GetWayPointsResponse.KEY_WAY_POINTS);
             List<LocationDetails> locationList = new ArrayList<LocationDetails>();
             for (int index = 0; index < locArray.length(); index++) {
-                LocationDetails det = new LocationDetails(JsonRPCMarshaller.deserializeJSONObject( (JSONObject) locArray.get(index)));
+                LocationDetails det = new LocationDetails(JsonRPCMarshaller.deserializeJSONObject((JSONObject) locArray.get(index)));
                 locationList.add(det);
             }
             List<LocationDetails> dets = cmd.getWayPoints();
-            assertEquals(TestValues.MATCH,  locationList.size(), dets.size());
+            assertEquals(TestValues.MATCH, locationList.size(), dets.size());
 
         } catch (JSONException e) {
             e.printStackTrace();
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
index 67b23ef2b..c90384567 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
@@ -26,13 +26,13 @@ import static junit.framework.TestCase.fail;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ListFilesResponse}
  */
-public class ListFilesResponseTests extends BaseRpcTests{
+public class ListFilesResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         ListFilesResponse msg = new ListFilesResponse();
 
         msg.setFilenames(TestValues.GENERAL_STRING_LIST);
@@ -42,43 +42,43 @@ public class ListFilesResponseTests extends BaseRpcTests{
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.LIST_FILES.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(ListFilesResponse.KEY_FILENAMES, JsonUtils.createJsonArray(TestValues.GENERAL_STRING_LIST));
             result.put(ListFilesResponse.KEY_SPACE_AVAILABLE, TestValues.GENERAL_INT);
-        }catch(JSONException e){
-        	fail(TestValues.JSON_FAIL);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
         }
 
         return result;
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Test Values
-        List<String> filenames = ( (ListFilesResponse) msg ).getFilenames();
-        int spaceAvailable = ( (ListFilesResponse) msg ).getSpaceAvailable();
-        
+    public void testRpcValues() {
+        // Test Values
+        List<String> filenames = ((ListFilesResponse) msg).getFilenames();
+        int spaceAvailable = ((ListFilesResponse) msg).getSpaceAvailable();
+
         // Valid Tests
         assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING_LIST.size(), filenames.size());
         assertTrue(TestValues.TRUE, Validator.validateStringList(TestValues.GENERAL_STRING_LIST, filenames));
         assertEquals(TestValues.MATCH, TestValues.GENERAL_INT, spaceAvailable);
-    
+
         // Invalid/Null Tests
         ListFilesResponse msg = new ListFilesResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -92,30 +92,30 @@ public class ListFilesResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ListFilesResponse cmd = new ListFilesResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			
-			List<String> fileNamesList = JsonUtils.readStringListFromJsonObject(parameters, ListFilesResponse.KEY_FILENAMES);
-			List<String> testNamesList = cmd.getFilenames();
-			assertEquals(TestValues.MATCH, fileNamesList.size(), testNamesList.size());
-			assertTrue(TestValues.TRUE, Validator.validateStringList(fileNamesList, testNamesList));
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ListFilesResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ListFilesResponse cmd = new ListFilesResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            List<String> fileNamesList = JsonUtils.readStringListFromJsonObject(parameters, ListFilesResponse.KEY_FILENAMES);
+            List<String> testNamesList = cmd.getFilenames();
+            assertEquals(TestValues.MATCH, fileNamesList.size(), testNamesList.size());
+            assertTrue(TestValues.TRUE, Validator.validateStringList(fileNamesList, testNamesList));
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, ListFilesResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java
index 2278a61a1..d464efbea 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAppServiceInteractionResponseTests.java
@@ -28,82 +28,82 @@ import static junit.framework.TestCase.fail;
  */
 public class PerformAppServiceInteractionResponseTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage(){
-
-		PerformAppServiceInteractionResponse msg = new PerformAppServiceInteractionResponse();
-
-		msg.setServiceSpecificResult(TestValues.GENERAL_STRING);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType(){
-		return FunctionID.PERFORM_APP_SERVICES_INTERACTION.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		JSONObject result = new JSONObject();
-
-		try{
-			result.put(PerformAppServiceInteractionResponse.KEY_SERVICE_SPECIFIC_RESULT, TestValues.GENERAL_STRING);
-		}catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		String serviceSpecificResult = ( (PerformAppServiceInteractionResponse) msg ).getServiceSpecificResult();
-
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceSpecificResult);
-
-		// Invalid/Null Tests
-		PerformAppServiceInteractionResponse msg = new PerformAppServiceInteractionResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getServiceSpecificResult());
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			PerformAppServiceInteractionResponse cmd = new PerformAppServiceInteractionResponse (hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteractionResponse.KEY_SERVICE_SPECIFIC_RESULT), cmd.getServiceSpecificResult());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+
+        PerformAppServiceInteractionResponse msg = new PerformAppServiceInteractionResponse();
+
+        msg.setServiceSpecificResult(TestValues.GENERAL_STRING);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.PERFORM_APP_SERVICES_INTERACTION.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(PerformAppServiceInteractionResponse.KEY_SERVICE_SPECIFIC_RESULT, TestValues.GENERAL_STRING);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        String serviceSpecificResult = ((PerformAppServiceInteractionResponse) msg).getServiceSpecificResult();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, serviceSpecificResult);
+
+        // Invalid/Null Tests
+        PerformAppServiceInteractionResponse msg = new PerformAppServiceInteractionResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getServiceSpecificResult());
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            PerformAppServiceInteractionResponse cmd = new PerformAppServiceInteractionResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformAppServiceInteractionResponse.KEY_SERVICE_SPECIFIC_RESULT), cmd.getServiceSpecificResult());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
index f3a0bd310..f37ed358b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
@@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.PerformAudioPassThruResponse}
  */
 public class PerformAudioPassThruResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new PerformAudioPassThruResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.PERFORM_AUDIO_PASS_THRU.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
-    
+
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	PerformAudioPassThruResponse msg = new PerformAudioPassThruResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        PerformAudioPassThruResponse msg = new PerformAudioPassThruResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
@@ -60,22 +60,22 @@ public class PerformAudioPassThruResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			PerformAudioPassThruResponse cmd = new PerformAudioPassThruResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            PerformAudioPassThruResponse cmd = new PerformAudioPassThruResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
index cc78069e3..3565dd901 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
@@ -23,97 +23,97 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.PerformInteractionResponse}
  */
 public class PerformInteractionResponseTest extends BaseRpcTests {
-    
-	@Override
-	protected RPCMessage createMessage() {
-		PerformInteractionResponse msg = new PerformInteractionResponse();
-
-		msg.setChoiceID(TestValues.GENERAL_INT);
-		msg.setTriggerSource(TestValues.GENERAL_TRIGGERSOURCE);
-		msg.setManualTextEntry(TestValues.GENERAL_STRING);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.PERFORM_INTERACTION.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(PerformInteractionResponse.KEY_CHOICE_ID, TestValues.GENERAL_INT);
-			result.put(PerformInteractionResponse.KEY_TRIGGER_SOURCE, TestValues.GENERAL_TRIGGERSOURCE);
-			result.put(PerformInteractionResponse.KEY_MANUAL_TEXT_ENTRY, TestValues.GENERAL_STRING);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {   
-    	// Test Values
-		Integer testId = ( (PerformInteractionResponse) msg).getChoiceID();
-		TriggerSource testSource = ( (PerformInteractionResponse) msg).getTriggerSource();
-		String testText = ( (PerformInteractionResponse) msg).getManualTextEntry();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testId);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_TRIGGERSOURCE, testSource);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText);
-	
-		// Invalid/Null Tests
-		PerformInteractionResponse msg = new PerformInteractionResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getChoiceID());
-		assertNull(TestValues.NULL, msg.getTriggerSource());
-		assertNull(TestValues.NULL, msg.getManualTextEntry());
-	}
+
+    @Override
+    protected RPCMessage createMessage() {
+        PerformInteractionResponse msg = new PerformInteractionResponse();
+
+        msg.setChoiceID(TestValues.GENERAL_INT);
+        msg.setTriggerSource(TestValues.GENERAL_TRIGGERSOURCE);
+        msg.setManualTextEntry(TestValues.GENERAL_STRING);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.PERFORM_INTERACTION.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(PerformInteractionResponse.KEY_CHOICE_ID, TestValues.GENERAL_INT);
+            result.put(PerformInteractionResponse.KEY_TRIGGER_SOURCE, TestValues.GENERAL_TRIGGERSOURCE);
+            result.put(PerformInteractionResponse.KEY_MANUAL_TEXT_ENTRY, TestValues.GENERAL_STRING);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        Integer testId = ((PerformInteractionResponse) msg).getChoiceID();
+        TriggerSource testSource = ((PerformInteractionResponse) msg).getTriggerSource();
+        String testText = ((PerformInteractionResponse) msg).getManualTextEntry();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testId);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_TRIGGERSOURCE, testSource);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testText);
+
+        // Invalid/Null Tests
+        PerformInteractionResponse msg = new PerformInteractionResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getChoiceID());
+        assertNull(TestValues.NULL, msg.getTriggerSource());
+        assertNull(TestValues.NULL, msg.getManualTextEntry());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			PerformInteractionResponse cmd = new PerformInteractionResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteractionResponse.KEY_MANUAL_TEXT_ENTRY), cmd.getManualTextEntry());
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteractionResponse.KEY_TRIGGER_SOURCE), cmd.getTriggerSource().toString());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteractionResponse.KEY_CHOICE_ID), cmd.getChoiceID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            PerformInteractionResponse cmd = new PerformInteractionResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteractionResponse.KEY_MANUAL_TEXT_ENTRY), cmd.getManualTextEntry());
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, PerformInteractionResponse.KEY_TRIGGER_SOURCE), cmd.getTriggerSource().toString());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PerformInteractionResponse.KEY_CHOICE_ID), cmd.getChoiceID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java
index 197aa13d4..aff5932f3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PublishAppServiceResponseTests.java
@@ -30,84 +30,84 @@ import static junit.framework.TestCase.fail;
  */
 public class PublishAppServiceResponseTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage(){
-
-		PublishAppServiceResponse msg = new PublishAppServiceResponse();
-
-		msg.setServiceRecord(TestValues.GENERAL_APPSERVICERECORD);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType(){
-		return FunctionID.PUBLISH_APP_SERVICE.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		JSONObject result = new JSONObject();
-
-		try{
-			result.put(PublishAppServiceResponse.KEY_APP_SERVICE_RECORD, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_APPSERVICERECORD.getStore()));
-		}catch(JSONException e){
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Test Values
-		AppServiceRecord testRecord = ( (PublishAppServiceResponse) msg ).getServiceRecord();
-
-		// Valid Tests
-		assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD, testRecord));
-
-		// Invalid/Null Tests
-		PublishAppServiceResponse msg = new PublishAppServiceResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getServiceRecord());
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			PublishAppServiceResponse cmd = new PublishAppServiceResponse (hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			JSONObject appServiceRecordObject = JsonUtils.readJsonObjectFromJsonObject(parameters, PublishAppServiceResponse.KEY_APP_SERVICE_RECORD);
-			AppServiceRecord recordTest = new AppServiceRecord(JsonRPCMarshaller.deserializeJSONObject(appServiceRecordObject));
-			assertTrue(TestValues.TRUE,  Validator.validateAppServiceRecord(recordTest, cmd.getServiceRecord()));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+
+        PublishAppServiceResponse msg = new PublishAppServiceResponse();
+
+        msg.setServiceRecord(TestValues.GENERAL_APPSERVICERECORD);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.PUBLISH_APP_SERVICE.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(PublishAppServiceResponse.KEY_APP_SERVICE_RECORD, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_APPSERVICERECORD.getStore()));
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        AppServiceRecord testRecord = ((PublishAppServiceResponse) msg).getServiceRecord();
+
+        // Valid Tests
+        assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(TestValues.GENERAL_APPSERVICERECORD, testRecord));
+
+        // Invalid/Null Tests
+        PublishAppServiceResponse msg = new PublishAppServiceResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getServiceRecord());
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            PublishAppServiceResponse cmd = new PublishAppServiceResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            JSONObject appServiceRecordObject = JsonUtils.readJsonObjectFromJsonObject(parameters, PublishAppServiceResponse.KEY_APP_SERVICE_RECORD);
+            AppServiceRecord recordTest = new AppServiceRecord(JsonRPCMarshaller.deserializeJSONObject(appServiceRecordObject));
+            assertTrue(TestValues.TRUE, Validator.validateAppServiceRecord(recordTest, cmd.getServiceRecord()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
index 6c34c9df4..8fd6c2046 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
@@ -22,85 +22,85 @@ import static junit.framework.TestCase.assertNull;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.PutFileResponse}
  */
 public class PutFileResponseTest extends BaseRpcTests {
-	
-	@Override
-	protected RPCMessage createMessage() {
-		PutFileResponse msg = new PutFileResponse();
-
-		msg.setSpaceAvailable(TestValues.GENERAL_INT);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.PUT_FILE.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(PutFileResponse.KEY_SPACE_AVAILABLE, TestValues.GENERAL_INT);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {   
-    	// Test Values
-		Integer testSpace = ( (PutFileResponse) msg ).getSpaceAvailable();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testSpace);
-	
-		// Invalid/Null Tests
-		PutFileResponse msg = new PutFileResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getSpaceAvailable());
-	}
+
+    @Override
+    protected RPCMessage createMessage() {
+        PutFileResponse msg = new PutFileResponse();
+
+        msg.setSpaceAvailable(TestValues.GENERAL_INT);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.PUT_FILE.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(PutFileResponse.KEY_SPACE_AVAILABLE, TestValues.GENERAL_INT);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        Integer testSpace = ((PutFileResponse) msg).getSpaceAvailable();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, testSpace);
+
+        // Invalid/Null Tests
+        PutFileResponse msg = new PutFileResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getSpaceAvailable());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			PutFileResponse cmd = new PutFileResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PutFileResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            PutFileResponse cmd = new PutFileResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, PutFileResponse.KEY_SPACE_AVAILABLE), cmd.getSpaceAvailable());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
index 3a62e344d..6e2ec0ffc 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
@@ -29,92 +29,92 @@ import static junit.framework.TestCase.fail;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ReadDIDResponse}
  */
 public class ReadDIDResponseTest extends BaseRpcTests {
-	
-	@Override
-	protected RPCMessage createMessage() {
-		ReadDIDResponse msg = new ReadDIDResponse();
-		
-		msg.setDidResult(TestValues.GENERAL_DIDRESULT_LIST);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.READ_DID.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {			
-			result.put(ReadDIDResponse.KEY_DID_RESULT, TestValues.JSON_DIDRESULTS);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
+
+    @Override
+    protected RPCMessage createMessage() {
+        ReadDIDResponse msg = new ReadDIDResponse();
+
+        msg.setDidResult(TestValues.GENERAL_DIDRESULT_LIST);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.READ_DID.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(ReadDIDResponse.KEY_DID_RESULT, TestValues.JSON_DIDRESULTS);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {  
-		// Test Values
-		List<DIDResult> testResults = ( (ReadDIDResponse) msg ).getDidResult();
-		
-		// Valid Tests
-		assertTrue("Did results didn't match input data.", Validator.validateDIDResults(TestValues.GENERAL_DIDRESULT_LIST, testResults));
-	
-		// Invalid/Null Tests
-		ReadDIDResponse msg = new ReadDIDResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getDidResult());
-	}
+    public void testRpcValues() {
+        // Test Values
+        List<DIDResult> testResults = ((ReadDIDResponse) msg).getDidResult();
+
+        // Valid Tests
+        assertTrue("Did results didn't match input data.", Validator.validateDIDResults(TestValues.GENERAL_DIDRESULT_LIST, testResults));
+
+        // Invalid/Null Tests
+        ReadDIDResponse msg = new ReadDIDResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getDidResult());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ReadDIDResponse cmd = new ReadDIDResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			
-			JSONArray didResultArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ReadDIDResponse.KEY_DID_RESULT);
-			List<DIDResult> didResultList = new ArrayList<DIDResult>();
-			for (int index = 0; index < didResultArray.length(); index++) {
-				DIDResult chunk = new DIDResult(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)didResultArray.get(index)) );
-				didResultList.add(chunk);
-			}
-			assertTrue(TestValues.MATCH,  Validator.validateDIDResults(didResultList, cmd.getDidResult()));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ReadDIDResponse cmd = new ReadDIDResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            JSONArray didResultArray = JsonUtils.readJsonArrayFromJsonObject(parameters, ReadDIDResponse.KEY_DID_RESULT);
+            List<DIDResult> didResultList = new ArrayList<DIDResult>();
+            for (int index = 0; index < didResultArray.length(); index++) {
+                DIDResult chunk = new DIDResult(JsonRPCMarshaller.deserializeJSONObject((JSONObject) didResultArray.get(index)));
+                didResultList.add(chunk);
+            }
+            assertTrue(TestValues.MATCH, Validator.validateDIDResults(didResultList, cmd.getDidResult()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
index 4e790a758..d95eb0594 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
@@ -39,240 +39,240 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.RegisterAppInterfaceResponse}
  */
 public class RegisterAppInterfaceResponseTest extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		RegisterAppInterfaceResponse msg = new RegisterAppInterfaceResponse();
-
-		msg.setSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION);
-		msg.setLanguage(TestValues.GENERAL_LANGUAGE);
-		msg.setHmiDisplayLanguage(TestValues.GENERAL_LANGUAGE);
-		msg.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES);
-		msg.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES);
-		msg.setVehicleType(TestValues.GENERAL_VEHICLETYPE);
-		msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST);
-		msg.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
-		msg.setAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST);
-		msg.setPcmStreamingCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES);
-		msg.setHmiZoneCapabilities(TestValues.GENERAL_HMIZONECAPABILITIES_LIST);
-		msg.setSpeechCapabilities(TestValues.GENERAL_SPEECHCAPABILITIES_LIST);
-		msg.setVrCapabilities(TestValues.GENERAL_VRCAPABILITIES_LIST);
-		msg.setPrerecordedSpeech(TestValues.GENERAL_PRERECORDEDSPEECH_LIST);
-		msg.setSupportedDiagModes(TestValues.GENERAL_INTEGER_LIST);
-		msg.setIconResumed(TestValues.GENERAL_BOOLEAN);
-
-		return msg;
-	}
-	
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
-	
-	@Override
-	protected String getCommandType() {
-		return FunctionID.REGISTER_APP_INTERFACE.toString();
-	}
-	
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {		
-			result.put(RegisterAppInterfaceResponse.KEY_LANGUAGE, TestValues.GENERAL_LANGUAGE);
-			result.put(RegisterAppInterfaceResponse.KEY_HMI_DISPLAY_LANGUAGE, TestValues.GENERAL_LANGUAGE);
-			result.put(RegisterAppInterfaceResponse.KEY_SUPPORTED_DIAG_MODES, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST));
-			result.put(RegisterAppInterfaceResponse.KEY_SDL_MSG_VERSION, TestValues.JSON_SDLMSGVERSION);
-			result.put(RegisterAppInterfaceResponse.KEY_VEHICLE_TYPE, TestValues.GENERAL_VEHICLETYPE.serializeJSON());
-			result.put(RegisterAppInterfaceResponse.KEY_PRESET_BANK_CAPABILITIES, TestValues.JSON_PRESETBANKCAPABILITIES);
-			result.put(RegisterAppInterfaceResponse.KEY_DISPLAY_CAPABILITIES, TestValues.JSON_DISPLAYCAPABILITIES);
-			result.put(RegisterAppInterfaceResponse.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES);
-			result.put(RegisterAppInterfaceResponse.KEY_SOFT_BUTTON_CAPABILITIES, TestValues.JSON_SOFTBUTTONCAPABILITIES);
-			result.put(RegisterAppInterfaceResponse.KEY_AUDIO_PASS_THRU_CAPABILITIES, TestValues.JSON_AUDIOPASSTHRUCAPABILITIES);
-			result.put(RegisterAppInterfaceResponse.KEY_PCM_STREAM_CAPABILITIES, TestValues.JSON_PCMSTREAMCAPABILITIES);
-			result.put(RegisterAppInterfaceResponse.KEY_SPEECH_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_SPEECHCAPABILITIES_LIST));
-			result.put(RegisterAppInterfaceResponse.KEY_VR_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_VRCAPABILITIES_LIST));
-			result.put(RegisterAppInterfaceResponse.KEY_HMI_ZONE_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_HMIZONECAPABILITIES_LIST));
-			result.put(RegisterAppInterfaceResponse.KEY_PRERECORDED_SPEECH, JsonUtils.createJsonArray(TestValues.GENERAL_PRERECORDEDSPEECH_LIST));
-			result.put(RegisterAppInterfaceResponse.KEY_ICON_RESUMED, TestValues.GENERAL_BOOLEAN);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () { 
-		// Test Values
-		List<Integer>            testSupportedDiagModes = ( (RegisterAppInterfaceResponse) msg ).getSupportedDiagModes();
-		List<PrerecordedSpeech>  testPrerecordedSpeech  = ( (RegisterAppInterfaceResponse) msg ).getPrerecordedSpeech();
-		List<VrCapabilities>     testVrCapabilities     = ( (RegisterAppInterfaceResponse) msg ).getVrCapabilities();
-		List<SpeechCapabilities> testSpeechCapabilities = ( (RegisterAppInterfaceResponse) msg ).getSpeechCapabilities();
-		List<HmiZoneCapabilities> testHmiZoneCapabilities = ( (RegisterAppInterfaceResponse) msg ).getHmiZoneCapabilities();
-		List<SoftButtonCapabilities> testSoftButtonCapabilities = ( (RegisterAppInterfaceResponse) msg ).getSoftButtonCapabilities();
-		List<ButtonCapabilities> testButtonCapabilities = ( (RegisterAppInterfaceResponse) msg ).getButtonCapabilities();
-		VehicleType testVehicleType = ( (RegisterAppInterfaceResponse) msg ).getVehicleType();
-		PresetBankCapabilities testPbc = ( (RegisterAppInterfaceResponse) msg ).getPresetBankCapabilities();
-		DisplayCapabilities testDc = ( (RegisterAppInterfaceResponse) msg ).getDisplayCapabilities();
-		Language testHmiLang = ( (RegisterAppInterfaceResponse) msg ).getHmiDisplayLanguage();
-		Language testLang = ( (RegisterAppInterfaceResponse) msg ).getLanguage();
-		SdlMsgVersion testMsgVersion = ( (RegisterAppInterfaceResponse) msg ).getSdlMsgVersion();
-		List<AudioPassThruCapabilities> testAptc = ( (RegisterAppInterfaceResponse) msg ).getAudioPassThruCapabilities();
-		AudioPassThruCapabilities testPcmStream = ( (RegisterAppInterfaceResponse) msg ).getPcmStreamingCapabilities();
-		Boolean testIconResumed = ( (RegisterAppInterfaceResponse) msg ).getIconResumed();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testSupportedDiagModes);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_PRERECORDEDSPEECH_LIST, testPrerecordedSpeech);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_VRCAPABILITIES_LIST, testVrCapabilities);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SPEECHCAPABILITIES_LIST, testSpeechCapabilities);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_HMIZONECAPABILITIES_LIST, testHmiZoneCapabilities);
-		assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST, testSoftButtonCapabilities));
-		assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, testButtonCapabilities));
-		assertTrue(TestValues.TRUE, Validator.validateVehicleType(TestValues.GENERAL_VEHICLETYPE, testVehicleType));
-		assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, testPbc));
-		assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, testDc));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testHmiLang);
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testLang);
-		assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION, testMsgVersion));
-		assertTrue(TestValues.TRUE, Validator.validateAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST, testAptc));
-		assertTrue(TestValues.TRUE, Validator.validatePcmStreamCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES, testPcmStream));
-		assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, testIconResumed);
-
-		// Invalid/Null Tests
-		RegisterAppInterfaceResponse msg = new RegisterAppInterfaceResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getSdlMsgVersion());
-		assertNull(TestValues.NULL, msg.getLanguage());
-		assertNull(TestValues.NULL, msg.getHmiDisplayLanguage());
-		assertNull(TestValues.NULL, msg.getDisplayCapabilities());
-		assertNull(TestValues.NULL, msg.getPresetBankCapabilities());
-		assertNull(TestValues.NULL, msg.getVehicleType());
-		assertNull(TestValues.NULL, msg.getButtonCapabilities());
-		assertNull(TestValues.NULL, msg.getSoftButtonCapabilities());
-		assertNull(TestValues.NULL, msg.getAudioPassThruCapabilities());
-		assertNull(TestValues.NULL, msg.getPcmStreamingCapabilities());
-		assertNull(TestValues.NULL, msg.getHmiZoneCapabilities());
-		assertNull(TestValues.NULL, msg.getSpeechCapabilities());
-		assertNull(TestValues.NULL, msg.getVrCapabilities());
-		assertNull(TestValues.NULL, msg.getPrerecordedSpeech());
-		assertNull(TestValues.NULL, msg.getSupportedDiagModes());
-	    assertNull(TestValues.NULL, msg.getIconResumed());
-	}
-	
+    @Override
+    protected RPCMessage createMessage() {
+        RegisterAppInterfaceResponse msg = new RegisterAppInterfaceResponse();
+
+        msg.setSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION);
+        msg.setLanguage(TestValues.GENERAL_LANGUAGE);
+        msg.setHmiDisplayLanguage(TestValues.GENERAL_LANGUAGE);
+        msg.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES);
+        msg.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES);
+        msg.setVehicleType(TestValues.GENERAL_VEHICLETYPE);
+        msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST);
+        msg.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
+        msg.setAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST);
+        msg.setPcmStreamingCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES);
+        msg.setHmiZoneCapabilities(TestValues.GENERAL_HMIZONECAPABILITIES_LIST);
+        msg.setSpeechCapabilities(TestValues.GENERAL_SPEECHCAPABILITIES_LIST);
+        msg.setVrCapabilities(TestValues.GENERAL_VRCAPABILITIES_LIST);
+        msg.setPrerecordedSpeech(TestValues.GENERAL_PRERECORDEDSPEECH_LIST);
+        msg.setSupportedDiagModes(TestValues.GENERAL_INTEGER_LIST);
+        msg.setIconResumed(TestValues.GENERAL_BOOLEAN);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.REGISTER_APP_INTERFACE.toString();
+    }
+
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(RegisterAppInterfaceResponse.KEY_LANGUAGE, TestValues.GENERAL_LANGUAGE);
+            result.put(RegisterAppInterfaceResponse.KEY_HMI_DISPLAY_LANGUAGE, TestValues.GENERAL_LANGUAGE);
+            result.put(RegisterAppInterfaceResponse.KEY_SUPPORTED_DIAG_MODES, JsonUtils.createJsonArray(TestValues.GENERAL_INTEGER_LIST));
+            result.put(RegisterAppInterfaceResponse.KEY_SDL_MSG_VERSION, TestValues.JSON_SDLMSGVERSION);
+            result.put(RegisterAppInterfaceResponse.KEY_VEHICLE_TYPE, TestValues.GENERAL_VEHICLETYPE.serializeJSON());
+            result.put(RegisterAppInterfaceResponse.KEY_PRESET_BANK_CAPABILITIES, TestValues.JSON_PRESETBANKCAPABILITIES);
+            result.put(RegisterAppInterfaceResponse.KEY_DISPLAY_CAPABILITIES, TestValues.JSON_DISPLAYCAPABILITIES);
+            result.put(RegisterAppInterfaceResponse.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES);
+            result.put(RegisterAppInterfaceResponse.KEY_SOFT_BUTTON_CAPABILITIES, TestValues.JSON_SOFTBUTTONCAPABILITIES);
+            result.put(RegisterAppInterfaceResponse.KEY_AUDIO_PASS_THRU_CAPABILITIES, TestValues.JSON_AUDIOPASSTHRUCAPABILITIES);
+            result.put(RegisterAppInterfaceResponse.KEY_PCM_STREAM_CAPABILITIES, TestValues.JSON_PCMSTREAMCAPABILITIES);
+            result.put(RegisterAppInterfaceResponse.KEY_SPEECH_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_SPEECHCAPABILITIES_LIST));
+            result.put(RegisterAppInterfaceResponse.KEY_VR_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_VRCAPABILITIES_LIST));
+            result.put(RegisterAppInterfaceResponse.KEY_HMI_ZONE_CAPABILITIES, JsonUtils.createJsonArray(TestValues.GENERAL_HMIZONECAPABILITIES_LIST));
+            result.put(RegisterAppInterfaceResponse.KEY_PRERECORDED_SPEECH, JsonUtils.createJsonArray(TestValues.GENERAL_PRERECORDEDSPEECH_LIST));
+            result.put(RegisterAppInterfaceResponse.KEY_ICON_RESUMED, TestValues.GENERAL_BOOLEAN);
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        List<Integer> testSupportedDiagModes = ((RegisterAppInterfaceResponse) msg).getSupportedDiagModes();
+        List<PrerecordedSpeech> testPrerecordedSpeech = ((RegisterAppInterfaceResponse) msg).getPrerecordedSpeech();
+        List<VrCapabilities> testVrCapabilities = ((RegisterAppInterfaceResponse) msg).getVrCapabilities();
+        List<SpeechCapabilities> testSpeechCapabilities = ((RegisterAppInterfaceResponse) msg).getSpeechCapabilities();
+        List<HmiZoneCapabilities> testHmiZoneCapabilities = ((RegisterAppInterfaceResponse) msg).getHmiZoneCapabilities();
+        List<SoftButtonCapabilities> testSoftButtonCapabilities = ((RegisterAppInterfaceResponse) msg).getSoftButtonCapabilities();
+        List<ButtonCapabilities> testButtonCapabilities = ((RegisterAppInterfaceResponse) msg).getButtonCapabilities();
+        VehicleType testVehicleType = ((RegisterAppInterfaceResponse) msg).getVehicleType();
+        PresetBankCapabilities testPbc = ((RegisterAppInterfaceResponse) msg).getPresetBankCapabilities();
+        DisplayCapabilities testDc = ((RegisterAppInterfaceResponse) msg).getDisplayCapabilities();
+        Language testHmiLang = ((RegisterAppInterfaceResponse) msg).getHmiDisplayLanguage();
+        Language testLang = ((RegisterAppInterfaceResponse) msg).getLanguage();
+        SdlMsgVersion testMsgVersion = ((RegisterAppInterfaceResponse) msg).getSdlMsgVersion();
+        List<AudioPassThruCapabilities> testAptc = ((RegisterAppInterfaceResponse) msg).getAudioPassThruCapabilities();
+        AudioPassThruCapabilities testPcmStream = ((RegisterAppInterfaceResponse) msg).getPcmStreamingCapabilities();
+        Boolean testIconResumed = ((RegisterAppInterfaceResponse) msg).getIconResumed();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_INTEGER_LIST, testSupportedDiagModes);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_PRERECORDEDSPEECH_LIST, testPrerecordedSpeech);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_VRCAPABILITIES_LIST, testVrCapabilities);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SPEECHCAPABILITIES_LIST, testSpeechCapabilities);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_HMIZONECAPABILITIES_LIST, testHmiZoneCapabilities);
+        assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST, testSoftButtonCapabilities));
+        assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, testButtonCapabilities));
+        assertTrue(TestValues.TRUE, Validator.validateVehicleType(TestValues.GENERAL_VEHICLETYPE, testVehicleType));
+        assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, testPbc));
+        assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, testDc));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testHmiLang);
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_LANGUAGE, testLang);
+        assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(TestValues.GENERAL_SDLMSGVERSION, testMsgVersion));
+        assertTrue(TestValues.TRUE, Validator.validateAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST, testAptc));
+        assertTrue(TestValues.TRUE, Validator.validatePcmStreamCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES, testPcmStream));
+        assertEquals(TestValues.MATCH, (Boolean) TestValues.GENERAL_BOOLEAN, testIconResumed);
+
+        // Invalid/Null Tests
+        RegisterAppInterfaceResponse msg = new RegisterAppInterfaceResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getSdlMsgVersion());
+        assertNull(TestValues.NULL, msg.getLanguage());
+        assertNull(TestValues.NULL, msg.getHmiDisplayLanguage());
+        assertNull(TestValues.NULL, msg.getDisplayCapabilities());
+        assertNull(TestValues.NULL, msg.getPresetBankCapabilities());
+        assertNull(TestValues.NULL, msg.getVehicleType());
+        assertNull(TestValues.NULL, msg.getButtonCapabilities());
+        assertNull(TestValues.NULL, msg.getSoftButtonCapabilities());
+        assertNull(TestValues.NULL, msg.getAudioPassThruCapabilities());
+        assertNull(TestValues.NULL, msg.getPcmStreamingCapabilities());
+        assertNull(TestValues.NULL, msg.getHmiZoneCapabilities());
+        assertNull(TestValues.NULL, msg.getSpeechCapabilities());
+        assertNull(TestValues.NULL, msg.getVrCapabilities());
+        assertNull(TestValues.NULL, msg.getPrerecordedSpeech());
+        assertNull(TestValues.NULL, msg.getSupportedDiagModes());
+        assertNull(TestValues.NULL, msg.getIconResumed());
+    }
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			RegisterAppInterfaceResponse cmd = new RegisterAppInterfaceResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			
-			JSONObject vehicleTypeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_VEHICLE_TYPE);
-			VehicleType vehicleType = new VehicleType(JsonRPCMarshaller.deserializeJSONObject(vehicleTypeObj));
-			assertTrue(TestValues.TRUE,  Validator.validateVehicleType(vehicleType, cmd.getVehicleType()));
-
-			JSONObject pcmStreamObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PCM_STREAM_CAPABILITIES);
-			AudioPassThruCapabilities pcmStreamCap = new AudioPassThruCapabilities(JsonRPCMarshaller.deserializeJSONObject(pcmStreamObj));
-			assertTrue(TestValues.TRUE,  Validator.validatePcmStreamCapabilities(pcmStreamCap, cmd.getPcmStreamingCapabilities()));
-
-			JSONArray speechCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SPEECH_CAPABILITIES);
-			for (int index = 0; index < speechCapabilitiesArray.length(); index++) {
-				SpeechCapabilities speechCapability = SpeechCapabilities.valueForString( speechCapabilitiesArray.get(index).toString() );
-				assertEquals(TestValues.MATCH, speechCapability, cmd.getSpeechCapabilities().get(index));
-			}
-			
-			JSONArray vrCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_VR_CAPABILITIES);
-			for (int index = 0; index < vrCapabilitiesArray.length(); index++) {
-				VrCapabilities vrCapability = VrCapabilities.valueForString( vrCapabilitiesArray.get(index).toString() );
-				assertEquals(TestValues.MATCH, vrCapability, cmd.getVrCapabilities().get(index));
-			}
-			
-			JSONArray audioPassThruCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_AUDIO_PASS_THRU_CAPABILITIES);
-			List<AudioPassThruCapabilities> audioPassThruCapabilitiesList = new ArrayList<AudioPassThruCapabilities>();
-			for (int index = 0; index < audioPassThruCapabilitiesArray.length(); index++) {
-				AudioPassThruCapabilities audioPassThruCapability = 
-						new AudioPassThruCapabilities(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)audioPassThruCapabilitiesArray.get(index) ));
-				audioPassThruCapabilitiesList.add(audioPassThruCapability);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateAudioPassThruCapabilities(audioPassThruCapabilitiesList, cmd.getAudioPassThruCapabilities() ));
-
-			JSONArray hmiZoneCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_HMI_ZONE_CAPABILITIES);
-			for (int index = 0; index < hmiZoneCapabilitiesArray.length(); index++) {
-				HmiZoneCapabilities hmiZoneCapability = HmiZoneCapabilities.valueForString( hmiZoneCapabilitiesArray.get(index).toString() );
-				assertEquals(TestValues.MATCH, hmiZoneCapability, cmd.getHmiZoneCapabilities().get(index));
-			}
-			
-			JSONArray prerecordedSpeechArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PRERECORDED_SPEECH);
-			for (int index = 0; index < prerecordedSpeechArray.length(); index++) {
-				PrerecordedSpeech prerecordedSpeech = PrerecordedSpeech.valueForString( prerecordedSpeechArray.get(index).toString() );
-				assertEquals(TestValues.MATCH, prerecordedSpeech, cmd.getPrerecordedSpeech().get(index));
-			}
-			
-			List<Integer> supportedDiagnosticModesList = JsonUtils.readIntegerListFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SUPPORTED_DIAG_MODES);
-			List<Integer> testDiagnosticModesList = cmd.getSupportedDiagModes();
-			assertEquals(TestValues.MATCH, supportedDiagnosticModesList.size(), testDiagnosticModesList.size());
-			assertTrue(TestValues.TRUE, Validator.validateIntegerList(supportedDiagnosticModesList, testDiagnosticModesList));
-			
-			JSONObject sdlMsgVersionObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SDL_MSG_VERSION);
-			SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(JsonRPCMarshaller.deserializeJSONObject(sdlMsgVersionObj));
-			assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(sdlMsgVersion, cmd.getSdlMsgVersion()) );
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_LANGUAGE), cmd.getLanguage().toString());
-			
-			JSONArray buttonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_BUTTON_CAPABILITIES);
-			List<ButtonCapabilities> buttonCapabilitiesList = new ArrayList<ButtonCapabilities>();
-			for (int index = 0; index < buttonCapabilitiesArray.length(); index++) {
-				ButtonCapabilities buttonCapability = new ButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)buttonCapabilitiesArray.get(index) ));
-				buttonCapabilitiesList.add(buttonCapability);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(buttonCapabilitiesList, cmd.getButtonCapabilities() ));
-			
-			JSONObject displayCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_DISPLAY_CAPABILITIES);
-			DisplayCapabilities displayCapabilities = new DisplayCapabilities(JsonRPCMarshaller.deserializeJSONObject(displayCapabilitiesObj));
-			assertTrue(TestValues.TRUE,  Validator.validateDisplayCapabilities(displayCapabilities, cmd.getDisplayCapabilities()) );
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_HMI_DISPLAY_LANGUAGE), cmd.getHmiDisplayLanguage().toString());
-			
-			JSONArray softButtonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SOFT_BUTTON_CAPABILITIES);
-			List<SoftButtonCapabilities> softButtonCapabilitiesList = new ArrayList<SoftButtonCapabilities>();
-			for (int index = 0; index < softButtonCapabilitiesArray.length(); index++) {
-				SoftButtonCapabilities softButtonCapability = 
-						new SoftButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonCapabilitiesArray.get(index) ));
-				softButtonCapabilitiesList.add(softButtonCapability);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(softButtonCapabilitiesList, cmd.getSoftButtonCapabilities() ));
-			
-			JSONObject presetBankCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PRESET_BANK_CAPABILITIES);
-			PresetBankCapabilities presetBankCapabilities = new PresetBankCapabilities(JsonRPCMarshaller.deserializeJSONObject(presetBankCapabilitiesObj));
-			assertTrue(TestValues.TRUE,  Validator.validatePresetBankCapabilities(presetBankCapabilities, cmd.getPresetBankCapabilities()) );
-
-			Boolean iconResumed = JsonUtils.readBooleanFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_ICON_RESUMED);
-			assertEquals(TestValues.MATCH, iconResumed, cmd.getIconResumed());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            RegisterAppInterfaceResponse cmd = new RegisterAppInterfaceResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            JSONObject vehicleTypeObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_VEHICLE_TYPE);
+            VehicleType vehicleType = new VehicleType(JsonRPCMarshaller.deserializeJSONObject(vehicleTypeObj));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleType(vehicleType, cmd.getVehicleType()));
+
+            JSONObject pcmStreamObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PCM_STREAM_CAPABILITIES);
+            AudioPassThruCapabilities pcmStreamCap = new AudioPassThruCapabilities(JsonRPCMarshaller.deserializeJSONObject(pcmStreamObj));
+            assertTrue(TestValues.TRUE, Validator.validatePcmStreamCapabilities(pcmStreamCap, cmd.getPcmStreamingCapabilities()));
+
+            JSONArray speechCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SPEECH_CAPABILITIES);
+            for (int index = 0; index < speechCapabilitiesArray.length(); index++) {
+                SpeechCapabilities speechCapability = SpeechCapabilities.valueForString(speechCapabilitiesArray.get(index).toString());
+                assertEquals(TestValues.MATCH, speechCapability, cmd.getSpeechCapabilities().get(index));
+            }
+
+            JSONArray vrCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_VR_CAPABILITIES);
+            for (int index = 0; index < vrCapabilitiesArray.length(); index++) {
+                VrCapabilities vrCapability = VrCapabilities.valueForString(vrCapabilitiesArray.get(index).toString());
+                assertEquals(TestValues.MATCH, vrCapability, cmd.getVrCapabilities().get(index));
+            }
+
+            JSONArray audioPassThruCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_AUDIO_PASS_THRU_CAPABILITIES);
+            List<AudioPassThruCapabilities> audioPassThruCapabilitiesList = new ArrayList<AudioPassThruCapabilities>();
+            for (int index = 0; index < audioPassThruCapabilitiesArray.length(); index++) {
+                AudioPassThruCapabilities audioPassThruCapability =
+                        new AudioPassThruCapabilities(JsonRPCMarshaller.deserializeJSONObject((JSONObject) audioPassThruCapabilitiesArray.get(index)));
+                audioPassThruCapabilitiesList.add(audioPassThruCapability);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateAudioPassThruCapabilities(audioPassThruCapabilitiesList, cmd.getAudioPassThruCapabilities()));
+
+            JSONArray hmiZoneCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_HMI_ZONE_CAPABILITIES);
+            for (int index = 0; index < hmiZoneCapabilitiesArray.length(); index++) {
+                HmiZoneCapabilities hmiZoneCapability = HmiZoneCapabilities.valueForString(hmiZoneCapabilitiesArray.get(index).toString());
+                assertEquals(TestValues.MATCH, hmiZoneCapability, cmd.getHmiZoneCapabilities().get(index));
+            }
+
+            JSONArray prerecordedSpeechArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PRERECORDED_SPEECH);
+            for (int index = 0; index < prerecordedSpeechArray.length(); index++) {
+                PrerecordedSpeech prerecordedSpeech = PrerecordedSpeech.valueForString(prerecordedSpeechArray.get(index).toString());
+                assertEquals(TestValues.MATCH, prerecordedSpeech, cmd.getPrerecordedSpeech().get(index));
+            }
+
+            List<Integer> supportedDiagnosticModesList = JsonUtils.readIntegerListFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SUPPORTED_DIAG_MODES);
+            List<Integer> testDiagnosticModesList = cmd.getSupportedDiagModes();
+            assertEquals(TestValues.MATCH, supportedDiagnosticModesList.size(), testDiagnosticModesList.size());
+            assertTrue(TestValues.TRUE, Validator.validateIntegerList(supportedDiagnosticModesList, testDiagnosticModesList));
+
+            JSONObject sdlMsgVersionObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SDL_MSG_VERSION);
+            SdlMsgVersion sdlMsgVersion = new SdlMsgVersion(JsonRPCMarshaller.deserializeJSONObject(sdlMsgVersionObj));
+            assertTrue(TestValues.TRUE, Validator.validateSdlMsgVersion(sdlMsgVersion, cmd.getSdlMsgVersion()));
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_LANGUAGE), cmd.getLanguage().toString());
+
+            JSONArray buttonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_BUTTON_CAPABILITIES);
+            List<ButtonCapabilities> buttonCapabilitiesList = new ArrayList<ButtonCapabilities>();
+            for (int index = 0; index < buttonCapabilitiesArray.length(); index++) {
+                ButtonCapabilities buttonCapability = new ButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject((JSONObject) buttonCapabilitiesArray.get(index)));
+                buttonCapabilitiesList.add(buttonCapability);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(buttonCapabilitiesList, cmd.getButtonCapabilities()));
+
+            JSONObject displayCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_DISPLAY_CAPABILITIES);
+            DisplayCapabilities displayCapabilities = new DisplayCapabilities(JsonRPCMarshaller.deserializeJSONObject(displayCapabilitiesObj));
+            assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(displayCapabilities, cmd.getDisplayCapabilities()));
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_HMI_DISPLAY_LANGUAGE), cmd.getHmiDisplayLanguage().toString());
+
+            JSONArray softButtonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_SOFT_BUTTON_CAPABILITIES);
+            List<SoftButtonCapabilities> softButtonCapabilitiesList = new ArrayList<SoftButtonCapabilities>();
+            for (int index = 0; index < softButtonCapabilitiesArray.length(); index++) {
+                SoftButtonCapabilities softButtonCapability =
+                        new SoftButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonCapabilitiesArray.get(index)));
+                softButtonCapabilitiesList.add(softButtonCapability);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(softButtonCapabilitiesList, cmd.getSoftButtonCapabilities()));
+
+            JSONObject presetBankCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_PRESET_BANK_CAPABILITIES);
+            PresetBankCapabilities presetBankCapabilities = new PresetBankCapabilities(JsonRPCMarshaller.deserializeJSONObject(presetBankCapabilitiesObj));
+            assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(presetBankCapabilities, cmd.getPresetBankCapabilities()));
+
+            Boolean iconResumed = JsonUtils.readBooleanFromJsonObject(parameters, RegisterAppInterfaceResponse.KEY_ICON_RESUMED);
+            assertEquals(TestValues.MATCH, iconResumed, cmd.getIconResumed());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java
index b2ba952b8..887d3822d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReleaseInteriorVehicleDataModuleResponseTests.java
@@ -22,43 +22,43 @@ import static junit.framework.TestCase.fail;
 
 
 public class ReleaseInteriorVehicleDataModuleResponseTests extends BaseRpcTests {
-	@Override
-	protected RPCMessage createMessage() {
-		ReleaseInteriorVehicleDataModuleResponse msg = new ReleaseInteriorVehicleDataModuleResponse();
-		return msg;
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        ReleaseInteriorVehicleDataModuleResponse msg = new ReleaseInteriorVehicleDataModuleResponse();
+        return msg;
+    }
 
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
 
-	@Override
-	protected String getCommandType() {
-		return FunctionID.RELEASE_INTERIOR_VEHICLE_MODULE.toString();
-	}
+    @Override
+    protected String getCommandType() {
+        return FunctionID.RELEASE_INTERIOR_VEHICLE_MODULE.toString();
+    }
 
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		return new JSONObject();
-	}
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        return new JSONObject();
+    }
 
-	@Test
-	public void testJsonConstructor() {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
 
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ReleaseInteriorVehicleDataModuleResponse cmd = new ReleaseInteriorVehicleDataModuleResponse(hash);
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ReleaseInteriorVehicleDataModuleResponse cmd = new ReleaseInteriorVehicleDataModuleResponse(hash);
 
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
 
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-	}
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
index 980d2d1ba..2c5c441e5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
@@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ResetGlobalPropertiesResponse}
  */
 public class ResetGlobalPropertiesResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new ResetGlobalPropertiesResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.RESET_GLOBAL_PROPERTIES.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	ResetGlobalPropertiesResponse msg = new ResetGlobalPropertiesResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        ResetGlobalPropertiesResponse msg = new ResetGlobalPropertiesResponse();
         assertNotNull(TestValues.NULL, msg);
         testNullBase(msg);
     }
@@ -60,23 +60,23 @@ public class ResetGlobalPropertiesResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ResetGlobalPropertiesResponse cmd = new ResetGlobalPropertiesResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-			
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ResetGlobalPropertiesResponse cmd = new ResetGlobalPropertiesResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
index 6ee9b0779..6e2129083 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
@@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ScrollableMessageResponse}
  */
 public class ScrollableMessageResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new ScrollableMessageResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SCROLLABLE_MESSAGE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	ScrollableMessageResponse msg = new ScrollableMessageResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        ScrollableMessageResponse msg = new ScrollableMessageResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
@@ -60,22 +60,22 @@ public class ScrollableMessageResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ScrollableMessageResponse cmd = new ScrollableMessageResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ScrollableMessageResponse cmd = new ScrollableMessageResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
index 0ba8ea411..a51fd9309 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
@@ -20,62 +20,62 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SendLocationResponse}
  */
 public class SendLocationResponseTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		SendLocationResponse msg = new SendLocationResponse();
-		return msg;
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        SendLocationResponse msg = new SendLocationResponse();
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
 
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SEND_LOCATION.toString();
+    }
 
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SEND_LOCATION.toString();
-	}
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        return new JSONObject();
+    }
 
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		return new JSONObject();
-	}
-	
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Invalid/Null Tests
         SendLocationResponse msg = new SendLocationResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
-	}
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-	public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SendLocationResponse cmd = new SendLocationResponse(hash);
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SendLocationResponse cmd = new SendLocationResponse(hash);
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
index b3a174c02..dc4255259 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
@@ -20,62 +20,62 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SetAppIconResponse}
  */
 public class SetAppIconResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new SetAppIconResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SET_APP_ICON.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	SetAppIconResponse msg = new SetAppIconResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        SetAppIconResponse msg = new SetAppIconResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
-    
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SetAppIconResponse cmd = new SetAppIconResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SetAppIconResponse cmd = new SetAppIconResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java
index f6558ab5a..2dea383ff 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetCloudAppPropertiesResponseTests.java
@@ -13,22 +13,22 @@ import static junit.framework.TestCase.assertNotNull;
 
 public class SetCloudAppPropertiesResponseTests extends BaseRpcTests {
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new SetCloudAppPropertiesResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SET_CLOUD_APP_PROPERTIES.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
@@ -36,7 +36,7 @@ public class SetCloudAppPropertiesResponseTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Invalid/Null Tests
         SetCloudAppPropertiesResponse msg = new SetCloudAppPropertiesResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
index 6985ad238..f7c08cd90 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
@@ -31,130 +31,130 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SetDisplayLayoutResponse}
  */
 public class SetDisplayLayoutResponseTest extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {		
-		SetDisplayLayoutResponse msg = new SetDisplayLayoutResponse();
-		
-		msg.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES);
-		msg.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES);
-		msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST);
-		msg.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SET_DISPLAY_LAYOUT.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-
-		try {
-			result.put(SetDisplayLayoutResponse.KEY_DISPLAY_CAPABILITIES, TestValues.GENERAL_DISPLAYCAPABILITIES.serializeJSON());
-			result.put(SetDisplayLayoutResponse.KEY_PRESET_BANK_CAPABILITIES, TestValues.JSON_PRESETBANKCAPABILITIES);
-			result.put(SetDisplayLayoutResponse.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES);
+    @Override
+    protected RPCMessage createMessage() {
+        SetDisplayLayoutResponse msg = new SetDisplayLayoutResponse();
+
+        msg.setDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES);
+        msg.setPresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES);
+        msg.setButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST);
+        msg.setSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SET_DISPLAY_LAYOUT.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
+        try {
+            result.put(SetDisplayLayoutResponse.KEY_DISPLAY_CAPABILITIES, TestValues.GENERAL_DISPLAYCAPABILITIES.serializeJSON());
+            result.put(SetDisplayLayoutResponse.KEY_PRESET_BANK_CAPABILITIES, TestValues.JSON_PRESETBANKCAPABILITIES);
+            result.put(SetDisplayLayoutResponse.KEY_BUTTON_CAPABILITIES, TestValues.JSON_BUTTONCAPABILITIES);
             result.put(SetDisplayLayoutResponse.KEY_SOFT_BUTTON_CAPABILITIES, TestValues.JSON_SOFTBUTTONCAPABILITIES);
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {
-    	// Test Values
-		DisplayCapabilities testDisplay      = ( (SetDisplayLayoutResponse) msg ).getDisplayCapabilities();
-		PresetBankCapabilities testPbc       = ( (SetDisplayLayoutResponse) msg ).getPresetBankCapabilities();
-		List<ButtonCapabilities> testBc      = ( (SetDisplayLayoutResponse) msg ).getButtonCapabilities();
-		List<SoftButtonCapabilities> testSbc = ( (SetDisplayLayoutResponse) msg ).getSoftButtonCapabilities();
-		
-		// Valid Tests
-		assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, testDisplay));
-		assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, testPbc));
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(), testBc.size());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.size(), testSbc.size());
-		for (int i = 0; i < TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(); i++) {
-			assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.get(i), testBc.get(i));
-		}
-		for (int i = 0; i < TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.size(); i++) {
-			assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.get(i), testSbc.get(i));
-		}
-	
-		// Invalid/Null Tests
-		SetDisplayLayoutResponse msg = new SetDisplayLayoutResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-
-		assertNull(TestValues.NULL, msg.getDisplayCapabilities());
-		assertNull(TestValues.NULL, msg.getPresetBankCapabilities());
-		assertNull(TestValues.NULL, msg.getButtonCapabilities());
-		assertNull(TestValues.NULL, msg.getSoftButtonCapabilities());
-	}
-	
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        DisplayCapabilities testDisplay = ((SetDisplayLayoutResponse) msg).getDisplayCapabilities();
+        PresetBankCapabilities testPbc = ((SetDisplayLayoutResponse) msg).getPresetBankCapabilities();
+        List<ButtonCapabilities> testBc = ((SetDisplayLayoutResponse) msg).getButtonCapabilities();
+        List<SoftButtonCapabilities> testSbc = ((SetDisplayLayoutResponse) msg).getSoftButtonCapabilities();
+
+        // Valid Tests
+        assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, testDisplay));
+        assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, testPbc));
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(), testBc.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.size(), testSbc.size());
+        for (int i = 0; i < TestValues.GENERAL_BUTTONCAPABILITIES_LIST.size(); i++) {
+            assertEquals(TestValues.MATCH, TestValues.GENERAL_BUTTONCAPABILITIES_LIST.get(i), testBc.get(i));
+        }
+        for (int i = 0; i < TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.size(); i++) {
+            assertEquals(TestValues.MATCH, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST.get(i), testSbc.get(i));
+        }
+
+        // Invalid/Null Tests
+        SetDisplayLayoutResponse msg = new SetDisplayLayoutResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+
+        assertNull(TestValues.NULL, msg.getDisplayCapabilities());
+        assertNull(TestValues.NULL, msg.getPresetBankCapabilities());
+        assertNull(TestValues.NULL, msg.getButtonCapabilities());
+        assertNull(TestValues.NULL, msg.getSoftButtonCapabilities());
+    }
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SetDisplayLayoutResponse cmd = new SetDisplayLayoutResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			JSONArray buttonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_BUTTON_CAPABILITIES);
-			List<ButtonCapabilities> buttonCapabilitiesList = new ArrayList<ButtonCapabilities>();
-			for (int index = 0; index < buttonCapabilitiesArray.length(); index++) {
-				ButtonCapabilities buttonCapability = new ButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)buttonCapabilitiesArray.get(index) ));
-				buttonCapabilitiesList.add(buttonCapability);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(buttonCapabilitiesList, cmd.getButtonCapabilities() ));
-			
-			JSONObject displayCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_DISPLAY_CAPABILITIES);
-			DisplayCapabilities displayCapabilities = new DisplayCapabilities(JsonRPCMarshaller.deserializeJSONObject(displayCapabilitiesObj));
-			assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(displayCapabilities, cmd.getDisplayCapabilities()) );
-			
-			JSONArray softButtonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_SOFT_BUTTON_CAPABILITIES);
-			List<SoftButtonCapabilities> softButtonCapabilitiesList = new ArrayList<SoftButtonCapabilities>();
-			for (int index = 0; index < softButtonCapabilitiesArray.length(); index++) {
-				SoftButtonCapabilities softButtonCapability = 
-						new SoftButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject( (JSONObject)softButtonCapabilitiesArray.get(index) ));
-				softButtonCapabilitiesList.add(softButtonCapability);
-			}
-			assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(softButtonCapabilitiesList, cmd.getSoftButtonCapabilities() ));
-			
-			JSONObject presetBankCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_PRESET_BANK_CAPABILITIES);
-			PresetBankCapabilities presetBankCapabilities = new PresetBankCapabilities(JsonRPCMarshaller.deserializeJSONObject(presetBankCapabilitiesObj));
-			assertTrue(TestValues.TRUE,  Validator.validatePresetBankCapabilities(presetBankCapabilities, cmd.getPresetBankCapabilities()) );
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
-    }	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SetDisplayLayoutResponse cmd = new SetDisplayLayoutResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            JSONArray buttonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_BUTTON_CAPABILITIES);
+            List<ButtonCapabilities> buttonCapabilitiesList = new ArrayList<ButtonCapabilities>();
+            for (int index = 0; index < buttonCapabilitiesArray.length(); index++) {
+                ButtonCapabilities buttonCapability = new ButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject((JSONObject) buttonCapabilitiesArray.get(index)));
+                buttonCapabilitiesList.add(buttonCapability);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateButtonCapabilities(buttonCapabilitiesList, cmd.getButtonCapabilities()));
+
+            JSONObject displayCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_DISPLAY_CAPABILITIES);
+            DisplayCapabilities displayCapabilities = new DisplayCapabilities(JsonRPCMarshaller.deserializeJSONObject(displayCapabilitiesObj));
+            assertTrue(TestValues.TRUE, Validator.validateDisplayCapabilities(displayCapabilities, cmd.getDisplayCapabilities()));
+
+            JSONArray softButtonCapabilitiesArray = JsonUtils.readJsonArrayFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_SOFT_BUTTON_CAPABILITIES);
+            List<SoftButtonCapabilities> softButtonCapabilitiesList = new ArrayList<SoftButtonCapabilities>();
+            for (int index = 0; index < softButtonCapabilitiesArray.length(); index++) {
+                SoftButtonCapabilities softButtonCapability =
+                        new SoftButtonCapabilities(JsonRPCMarshaller.deserializeJSONObject((JSONObject) softButtonCapabilitiesArray.get(index)));
+                softButtonCapabilitiesList.add(softButtonCapability);
+            }
+            assertTrue(TestValues.TRUE, Validator.validateSoftButtonCapabilities(softButtonCapabilitiesList, cmd.getSoftButtonCapabilities()));
+
+            JSONObject presetBankCapabilitiesObj = JsonUtils.readJsonObjectFromJsonObject(parameters, SetDisplayLayoutResponse.KEY_PRESET_BANK_CAPABILITIES);
+            PresetBankCapabilities presetBankCapabilities = new PresetBankCapabilities(JsonRPCMarshaller.deserializeJSONObject(presetBankCapabilitiesObj));
+            assertTrue(TestValues.TRUE, Validator.validatePresetBankCapabilities(presetBankCapabilities, cmd.getPresetBankCapabilities()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
index 04445f520..f4f336381 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
@@ -21,38 +21,38 @@ import static junit.framework.TestCase.assertNotNull;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SetGlobalPropertiesResponse}
  */
 public class SetGlobalPropertiesResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new SetGlobalPropertiesResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SET_GLOBAL_PROPERTIES.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	SetGlobalPropertiesResponse msg = new SetGlobalPropertiesResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        SetGlobalPropertiesResponse msg = new SetGlobalPropertiesResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
@@ -61,22 +61,22 @@ public class SetGlobalPropertiesResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SetGlobalPropertiesResponse cmd = new SetGlobalPropertiesResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SetGlobalPropertiesResponse cmd = new SetGlobalPropertiesResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java
index 17187b64b..d191ea4d7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetInteriorVehicleDataResponseTests.java
@@ -31,7 +31,7 @@ import static junit.framework.TestCase.fail;
 public class SetInteriorVehicleDataResponseTests extends BaseRpcTests {
 
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
 
         SetInteriorVehicleDataResponse msg = new SetInteriorVehicleDataResponse();
 
@@ -41,22 +41,22 @@ public class SetInteriorVehicleDataResponseTests extends BaseRpcTests {
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SET_INTERIOR_VEHICLE_DATA.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         JSONObject result = new JSONObject();
 
-        try{
+        try {
             result.put(SetInteriorVehicleDataResponse.KEY_MODULE_DATA, JsonRPCMarshaller.serializeHashtable(TestValues.GENERAL_MODULEDATA.getStore()));
-        }catch(JSONException e){
+        } catch (JSONException e) {
             fail(TestValues.JSON_FAIL);
         }
 
@@ -67,9 +67,9 @@ public class SetInteriorVehicleDataResponseTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Test Values
-        ModuleData testModuleData = ( (SetInteriorVehicleDataResponse) msg ).getModuleData();
+        ModuleData testModuleData = ((SetInteriorVehicleDataResponse) msg).getModuleData();
 
         // Valid Tests
         assertTrue(TestValues.TRUE, Validator.validateModuleData(TestValues.GENERAL_MODULEDATA, testModuleData));
@@ -86,13 +86,13 @@ public class SetInteriorVehicleDataResponseTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
         try {
             Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-            SetInteriorVehicleDataResponse cmd = new SetInteriorVehicleDataResponse (hash);
+            SetInteriorVehicleDataResponse cmd = new SetInteriorVehicleDataResponse(hash);
 
             JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
             assertNotNull(TestValues.NOT_NULL, body);
@@ -106,7 +106,7 @@ public class SetInteriorVehicleDataResponseTests extends BaseRpcTests {
             ModuleData testModuleData = new ModuleData(JsonRPCMarshaller.deserializeJSONObject((JSONObject) JsonUtils.readObjectFromJsonObject(parameters, SetInteriorVehicleDataResponse.KEY_MODULE_DATA)));
             ModuleData cmdModuleData = cmd.getModuleData();
 
-            assertTrue(TestValues.TRUE, Validator.validateModuleData(testModuleData, cmdModuleData) );
+            assertTrue(TestValues.TRUE, Validator.validateModuleData(testModuleData, cmdModuleData));
         } catch (JSONException e) {
             e.printStackTrace();
         }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
index 4d0b7b081..cfe157579 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
@@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SetMediaClockTimerResponse}
  */
 public class SetMediaClockTimerResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new SetMediaClockTimerResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SET_MEDIA_CLOCK_TIMER.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	SetMediaClockTimerResponse msg = new SetMediaClockTimerResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        SetMediaClockTimerResponse msg = new SetMediaClockTimerResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
@@ -60,22 +60,22 @@ public class SetMediaClockTimerResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SetMediaClockTimerResponse cmd = new SetMediaClockTimerResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}   	
-    }	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SetMediaClockTimerResponse cmd = new SetMediaClockTimerResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java
index 28cf0b436..b0e19efe4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowAppMenuResponseTests.java
@@ -56,58 +56,58 @@ import static junit.framework.TestCase.assertNotNull;
 
 public class ShowAppMenuResponseTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage(){
-		return new ShowAppMenuResponse();
-	}
-
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType(){
-		return FunctionID.SHOW_APP_MENU.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		return new JSONObject();
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Invalid/Null Tests
-		ShowAppMenuResponse msg = new ShowAppMenuResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ShowAppMenuResponse cmd = new ShowAppMenuResponse(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        return new ShowAppMenuResponse();
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SHOW_APP_MENU.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        return new JSONObject();
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        ShowAppMenuResponse msg = new ShowAppMenuResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ShowAppMenuResponse cmd = new ShowAppMenuResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
index 6beaa9e62..220c05828 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
@@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ShowConstantTbtResponse}
  */
 public class ShowConstantTbtResponseTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		ShowConstantTbtResponse msg = new ShowConstantTbtResponse();
-		return msg;
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        ShowConstantTbtResponse msg = new ShowConstantTbtResponse();
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
 
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SHOW_CONSTANT_TBT.toString();
+    }
 
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SHOW_CONSTANT_TBT.toString();
-	}
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        return new JSONObject();
+    }
 
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		return new JSONObject();
-	}
-	
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Invalid/Null Tests
         ShowConstantTbtResponse msg = new ShowConstantTbtResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
@@ -61,21 +61,21 @@ public class ShowConstantTbtResponseTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-	public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ShowConstantTbtResponse cmd = new ShowConstantTbtResponse(hash);
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}   	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ShowConstantTbtResponse cmd = new ShowConstantTbtResponse(hash);
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
index 2062c5fe1..f29b5cf15 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
@@ -21,38 +21,38 @@ import static junit.framework.TestCase.assertNotNull;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.ShowResponse}
  */
 public class ShowResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new ShowResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SHOW.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	ShowResponse msg = new ShowResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        ShowResponse msg = new ShowResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
@@ -61,22 +61,22 @@ public class ShowResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			ShowResponse cmd = new ShowResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            ShowResponse cmd = new ShowResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
index 4a200d106..78e9244f0 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
@@ -23,83 +23,83 @@ import static junit.framework.TestCase.fail;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SliderResponse}
  */
 public class SliderResponseTest extends BaseRpcTests {
-	
-	@Override
-	protected RPCMessage createMessage() {
-		SliderResponse msg = new SliderResponse();
 
-		msg.setSliderPosition(TestValues.GENERAL_INT);
+    @Override
+    protected RPCMessage createMessage() {
+        SliderResponse msg = new SliderResponse();
 
-		return msg;
-	}
+        msg.setSliderPosition(TestValues.GENERAL_INT);
 
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SLIDER.toString();
+    }
 
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SLIDER.toString();
-	}
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
 
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
+        try {
+            result.put(SliderResponse.KEY_SLIDER_POSITION, TestValues.GENERAL_INT);
 
-		try {
-			result.put(SliderResponse.KEY_SLIDER_POSITION, TestValues.GENERAL_INT);
-			
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
 
-		return result;
-	}
+        return result;
+    }
 
-	@Test
-	public void testPosition() {
-		Integer copy = ( (SliderResponse) msg ).getSliderPosition();
-		assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, copy);
-	}
+    @Test
+    public void testPosition() {
+        Integer copy = ((SliderResponse) msg).getSliderPosition();
+        assertEquals(TestValues.MATCH, (Integer) TestValues.GENERAL_INT, copy);
+    }
 
-	@Test
-	public void testNull() {
-		SliderResponse msg = new SliderResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
+    @Test
+    public void testNull() {
+        SliderResponse msg = new SliderResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
 
-		testNullBase(msg);
+        testNullBase(msg);
 
-		assertNull(TestValues.NULL, msg.getSliderPosition());
-	}
+        assertNull(TestValues.NULL, msg.getSliderPosition());
+    }
 
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SliderResponse cmd = new SliderResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, SliderResponse.KEY_SLIDER_POSITION), cmd.getSliderPosition());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SliderResponse cmd = new SliderResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(parameters, SliderResponse.KEY_SLIDER_POSITION), cmd.getSliderPosition());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
index 859cd8e30..a6f6effa8 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
@@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SpeakResponse}
  */
 public class SpeakResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new SpeakResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SPEAK.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	SpeakResponse msg = new SpeakResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        SpeakResponse msg = new SpeakResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
@@ -60,22 +60,22 @@ public class SpeakResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SpeakResponse cmd = new SpeakResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SpeakResponse cmd = new SpeakResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
index 4560784ca..c0eb4f664 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
@@ -21,38 +21,38 @@ import static junit.framework.TestCase.assertNotNull;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SubscribeButtonResponse}
  */
 public class SubscribeButtonResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new SubscribeButtonResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SUBSCRIBE_BUTTON.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	SubscribeButtonResponse msg = new SubscribeButtonResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        SubscribeButtonResponse msg = new SubscribeButtonResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
@@ -61,22 +61,22 @@ public class SubscribeButtonResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SubscribeButtonResponse cmd = new SubscribeButtonResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals("Correlation ID doesn't match input ID", JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SubscribeButtonResponse cmd = new SubscribeButtonResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals("Correlation ID doesn't match input ID", JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
index 1e486f7eb..6f9c9a45c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
@@ -27,197 +27,197 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SubscribeVehicleDataResponse}
  */
 public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse();
-
-		msg.setResultCode(TestValues.GENERAL_RESULT);
-		msg.setSpeed(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()));
-		msg.setRpm(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()));
-		msg.setExternalTemperature(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()));
-		msg.setFuelLevel(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()));
-		msg.setPrndl(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()));
-		msg.setTirePressure(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()));
-		msg.setEngineTorque(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()));
-		msg.setEngineOilLife(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()));
-		msg.setOdometer(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()));
-		msg.setGps(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()));
-		msg.setFuelLevelState(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()));
-		msg.setInstantFuelConsumption(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()));
-		msg.setBeltStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()));
-		msg.setBodyInformation(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()));
-		msg.setDeviceStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()));
-		msg.setDriverBraking(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()));
-		msg.setWiperStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()));
-		msg.setHeadLampStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()));
-		msg.setAccPedalPosition(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()));
-		msg.setSteeringWheelAngle(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()));
-		msg.setECallInfo(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()));
-		msg.setAirbagStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()));
-		msg.setEmergencyEvent(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()));
-		msg.setClusterModes(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()));
-		msg.setMyKey(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()));
-		msg.setFuelRange(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()));
-		msg.setTurnSignal(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()));
-		msg.setElectronicParkBrakeStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()));
-		msg.setGearStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()));
-		msg.setHandsOffSteering(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()));
-		msg.setWindowStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()));
-		msg.setStabilityControlsStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()));
-		msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA);
-
-		return msg;
-	}
-
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.SUBSCRIBE_VEHICLE_DATA.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-		
+    @Override
+    protected RPCMessage createMessage() {
+        SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse();
+
+        msg.setResultCode(TestValues.GENERAL_RESULT);
+        msg.setSpeed(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()));
+        msg.setRpm(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()));
+        msg.setExternalTemperature(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()));
+        msg.setFuelLevel(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()));
+        msg.setPrndl(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()));
+        msg.setTirePressure(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()));
+        msg.setEngineTorque(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()));
+        msg.setEngineOilLife(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()));
+        msg.setOdometer(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()));
+        msg.setGps(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()));
+        msg.setFuelLevelState(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()));
+        msg.setInstantFuelConsumption(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()));
+        msg.setBeltStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()));
+        msg.setBodyInformation(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()));
+        msg.setDeviceStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()));
+        msg.setDriverBraking(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()));
+        msg.setWiperStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()));
+        msg.setHeadLampStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()));
+        msg.setAccPedalPosition(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()));
+        msg.setSteeringWheelAngle(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()));
+        msg.setECallInfo(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()));
+        msg.setAirbagStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()));
+        msg.setEmergencyEvent(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()));
+        msg.setClusterModes(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()));
+        msg.setMyKey(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()));
+        msg.setFuelRange(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()));
+        msg.setTurnSignal(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()));
+        msg.setElectronicParkBrakeStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()));
+        msg.setGearStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()));
+        msg.setHandsOffSteering(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()));
+        msg.setWindowStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()));
+        msg.setStabilityControlsStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()));
+        msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.SUBSCRIBE_VEHICLE_DATA.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
         try {
-        	
-        	// Note: If the key values stored in SubscribeVehicleDataResponse
-        	// were to be in a list then this could be easily looped through
-        	// instead of individually set.
-
-			result.put(SubscribeVehicleDataResponse.KEY_RESULT_CODE, TestValues.GENERAL_RESULT);
-			result.put(SubscribeVehicleDataResponse.KEY_SPEED, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_RPM, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_PRNDL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_ODOMETER, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_GPS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_BELT_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_BODY_INFORMATION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_DEVICE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_WIPER_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_E_CALL_INFO, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODES, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_WINDOW_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_GEAR_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()).serializeJSON());
-	        result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA.serializeJSON());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-	
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {
-    	// Test Values
-		Result testResult                    = ( (SubscribeVehicleDataResponse) msg ).getResultCode();
-		VehicleDataResult testGps            = ( (SubscribeVehicleDataResponse) msg ).getGps();
-		VehicleDataResult testOdometer       = ( (SubscribeVehicleDataResponse) msg ).getOdometer();
-		VehicleDataResult testTirePressure   = ( (SubscribeVehicleDataResponse) msg ).getTirePressure();
-		VehicleDataResult testBeltStatus     = ( (SubscribeVehicleDataResponse) msg ).getBeltStatus();
-		VehicleDataResult testBodyInfo       = ( (SubscribeVehicleDataResponse) msg ).getBodyInformation();
-		VehicleDataResult testDeviceStatus   = ( (SubscribeVehicleDataResponse) msg ).getDeviceStatus();
-		VehicleDataResult testHeadLampStatus = ( (SubscribeVehicleDataResponse) msg ).getHeadLampStatus();
-		VehicleDataResult testECallInfo      = ( (SubscribeVehicleDataResponse) msg ).getECallInfo();
-		VehicleDataResult testAirbagStatus   = ( (SubscribeVehicleDataResponse) msg ).getAirbagStatus();
-		VehicleDataResult testEmergencyEvent = ( (SubscribeVehicleDataResponse) msg ).getEmergencyEvent();
-		VehicleDataResult testClusterMode    = ( (SubscribeVehicleDataResponse) msg ).getClusterModes();
-		VehicleDataResult testMyKey          = ( (SubscribeVehicleDataResponse) msg ).getMyKey();
-		VehicleDataResult testSpeed          = ( (SubscribeVehicleDataResponse) msg ).getSpeed();
-		VehicleDataResult testRpm            = ( (SubscribeVehicleDataResponse) msg ).getRpm();
-		VehicleDataResult testFuelLevel      = ( (SubscribeVehicleDataResponse) msg ).getFuelLevel();
-		VehicleDataResult testConsumption    = ( (SubscribeVehicleDataResponse) msg ).getInstantFuelConsumption();
-		VehicleDataResult testExternalTemp   = ( (SubscribeVehicleDataResponse) msg ).getExternalTemperature();
-		VehicleDataResult testEngineTorque   = ( (SubscribeVehicleDataResponse) msg ).getEngineTorque();
-		VehicleDataResult testEngineOilLife  = ( (SubscribeVehicleDataResponse) msg ).getEngineOilLife();
-		VehicleDataResult testAccPedal       = ( (SubscribeVehicleDataResponse) msg ).getAccPedalPosition();
-		VehicleDataResult testSteeringWheel  = ( (SubscribeVehicleDataResponse) msg ).getSteeringWheelAngle();
-		VehicleDataResult testFuelLevelState = ( (SubscribeVehicleDataResponse) msg ).getFuelLevelState();
-		VehicleDataResult testPrndl          = ( (SubscribeVehicleDataResponse) msg ).getPrndl();
-		VehicleDataResult testBraking        = ( (SubscribeVehicleDataResponse) msg ).getDriverBraking();
-		VehicleDataResult testWiperStatus    = ( (SubscribeVehicleDataResponse) msg ).getWiperStatus();
-		VehicleDataResult testFuelRange      = ( (SubscribeVehicleDataResponse) msg ).getFuelRange();
-		VehicleDataResult testTurnSignal     = ( (SubscribeVehicleDataResponse) msg ).getTurnSignal();
-		VehicleDataResult testEBrakeStatus   = ( (SubscribeVehicleDataResponse) msg ).getElectronicParkBrakeStatus();
-		VehicleDataResult testHOffSteering   = ( (SubscribeVehicleDataResponse) msg ).getHandsOffSteering();
-		VehicleDataResult testWindowStatus   = ( (SubscribeVehicleDataResponse) msg ).getWindowStatus();
-		VehicleDataResult testGearStatus     = ( (SubscribeVehicleDataResponse) msg ).getGearStatus();
-		VehicleDataResult testStabilityControlStatus = ( (SubscribeVehicleDataResponse) msg ).getStabilityControlsStatus();
-		VehicleDataResult testOEMCustomVehicleData   = ( (SubscribeVehicleDataResponse) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
-		
-		// Valid Tests
-		assertTrue(TestValues.TRUE, testResult.equals(TestValues.GENERAL_RESULT));
-		assertTrue(TestValues.TRUE, testGps.getDataType().equals(VehicleDataType.VEHICLEDATA_GPS));
-		assertTrue(TestValues.TRUE, testOdometer.getDataType().equals(VehicleDataType.VEHICLEDATA_ODOMETER));
-		assertTrue(TestValues.TRUE, testTirePressure.getDataType().equals(VehicleDataType.VEHICLEDATA_TIREPRESSURE));
-	    assertTrue(TestValues.TRUE, testBeltStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_BELTSTATUS));
-	    assertTrue(TestValues.TRUE, testBodyInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_BODYINFO));
-	    assertTrue(TestValues.TRUE, testDeviceStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_DEVICESTATUS));
-	    assertTrue(TestValues.TRUE, testHeadLampStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS));
-	    assertTrue(TestValues.TRUE, testECallInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_ECALLINFO));
-	    assertTrue(TestValues.TRUE, testAirbagStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS));
-	    assertTrue(TestValues.TRUE, testEmergencyEvent.getDataType().equals(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT));
-	    assertTrue(TestValues.TRUE, testClusterMode.getDataType().equals(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS));
-	    assertTrue(TestValues.TRUE, testMyKey.getDataType().equals(VehicleDataType.VEHICLEDATA_MYKEY));
-	    assertTrue(TestValues.TRUE, testSpeed.getDataType().equals(VehicleDataType.VEHICLEDATA_SPEED));
-	    assertTrue(TestValues.TRUE, testRpm.getDataType().equals(VehicleDataType.VEHICLEDATA_RPM));
-	    assertTrue(TestValues.TRUE, testFuelLevel.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL));
-	    assertTrue(TestValues.TRUE, testConsumption.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION));
-	    assertTrue(TestValues.TRUE, testExternalTemp.getDataType().equals(VehicleDataType.VEHICLEDATA_EXTERNTEMP));
-	    assertTrue(TestValues.TRUE, testEngineTorque.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINETORQUE));
-	    assertTrue(TestValues.TRUE, testEngineOilLife.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE));
-	    assertTrue(TestValues.TRUE, testAccPedal.getDataType().equals(VehicleDataType.VEHICLEDATA_ACCPEDAL));
-	    assertTrue(TestValues.TRUE, testSteeringWheel.getDataType().equals(VehicleDataType.VEHICLEDATA_STEERINGWHEEL));
-	    assertTrue(TestValues.TRUE, testFuelLevelState.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE));
-	    assertTrue(TestValues.TRUE, testPrndl.getDataType().equals(VehicleDataType.VEHICLEDATA_PRNDL));
-	    assertTrue(TestValues.TRUE, testBraking.getDataType().equals(VehicleDataType.VEHICLEDATA_BRAKING));
-	    assertTrue(TestValues.TRUE, testWiperStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WIPERSTATUS));
-	    assertTrue(TestValues.TRUE, testFuelRange.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELRANGE));
-	    assertTrue(TestValues.TRUE, testTurnSignal.getDataType().equals(VehicleDataType.VEHICLEDATA_TURNSIGNAL));
-	    assertTrue(TestValues.TRUE, testEBrakeStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS));
-	    assertTrue(TestValues.TRUE, testHOffSteering.getDataType().equals(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING));
-	    assertTrue(TestValues.TRUE, testGearStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_GEARSTATUS));
-	    assertTrue(TestValues.TRUE, testWindowStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WINDOWSTATUS));
-	    assertTrue(TestValues.TRUE, testStabilityControlStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS));
-	    assertTrue(TestValues.TRUE, testOEMCustomVehicleData.getOEMCustomVehicleDataType().equals(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-   
+
+            // Note: If the key values stored in SubscribeVehicleDataResponse
+            // were to be in a list then this could be easily looped through
+            // instead of individually set.
+
+            result.put(SubscribeVehicleDataResponse.KEY_RESULT_CODE, TestValues.GENERAL_RESULT);
+            result.put(SubscribeVehicleDataResponse.KEY_SPEED, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_RPM, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_PRNDL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ODOMETER, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_GPS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_BELT_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_BODY_INFORMATION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_DEVICE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_WIPER_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_E_CALL_INFO, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODES, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_WINDOW_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_GEAR_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()).serializeJSON());
+            result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA.serializeJSON());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        Result testResult = ((SubscribeVehicleDataResponse) msg).getResultCode();
+        VehicleDataResult testGps = ((SubscribeVehicleDataResponse) msg).getGps();
+        VehicleDataResult testOdometer = ((SubscribeVehicleDataResponse) msg).getOdometer();
+        VehicleDataResult testTirePressure = ((SubscribeVehicleDataResponse) msg).getTirePressure();
+        VehicleDataResult testBeltStatus = ((SubscribeVehicleDataResponse) msg).getBeltStatus();
+        VehicleDataResult testBodyInfo = ((SubscribeVehicleDataResponse) msg).getBodyInformation();
+        VehicleDataResult testDeviceStatus = ((SubscribeVehicleDataResponse) msg).getDeviceStatus();
+        VehicleDataResult testHeadLampStatus = ((SubscribeVehicleDataResponse) msg).getHeadLampStatus();
+        VehicleDataResult testECallInfo = ((SubscribeVehicleDataResponse) msg).getECallInfo();
+        VehicleDataResult testAirbagStatus = ((SubscribeVehicleDataResponse) msg).getAirbagStatus();
+        VehicleDataResult testEmergencyEvent = ((SubscribeVehicleDataResponse) msg).getEmergencyEvent();
+        VehicleDataResult testClusterMode = ((SubscribeVehicleDataResponse) msg).getClusterModes();
+        VehicleDataResult testMyKey = ((SubscribeVehicleDataResponse) msg).getMyKey();
+        VehicleDataResult testSpeed = ((SubscribeVehicleDataResponse) msg).getSpeed();
+        VehicleDataResult testRpm = ((SubscribeVehicleDataResponse) msg).getRpm();
+        VehicleDataResult testFuelLevel = ((SubscribeVehicleDataResponse) msg).getFuelLevel();
+        VehicleDataResult testConsumption = ((SubscribeVehicleDataResponse) msg).getInstantFuelConsumption();
+        VehicleDataResult testExternalTemp = ((SubscribeVehicleDataResponse) msg).getExternalTemperature();
+        VehicleDataResult testEngineTorque = ((SubscribeVehicleDataResponse) msg).getEngineTorque();
+        VehicleDataResult testEngineOilLife = ((SubscribeVehicleDataResponse) msg).getEngineOilLife();
+        VehicleDataResult testAccPedal = ((SubscribeVehicleDataResponse) msg).getAccPedalPosition();
+        VehicleDataResult testSteeringWheel = ((SubscribeVehicleDataResponse) msg).getSteeringWheelAngle();
+        VehicleDataResult testFuelLevelState = ((SubscribeVehicleDataResponse) msg).getFuelLevelState();
+        VehicleDataResult testPrndl = ((SubscribeVehicleDataResponse) msg).getPrndl();
+        VehicleDataResult testBraking = ((SubscribeVehicleDataResponse) msg).getDriverBraking();
+        VehicleDataResult testWiperStatus = ((SubscribeVehicleDataResponse) msg).getWiperStatus();
+        VehicleDataResult testFuelRange = ((SubscribeVehicleDataResponse) msg).getFuelRange();
+        VehicleDataResult testTurnSignal = ((SubscribeVehicleDataResponse) msg).getTurnSignal();
+        VehicleDataResult testEBrakeStatus = ((SubscribeVehicleDataResponse) msg).getElectronicParkBrakeStatus();
+        VehicleDataResult testHOffSteering = ((SubscribeVehicleDataResponse) msg).getHandsOffSteering();
+        VehicleDataResult testWindowStatus = ((SubscribeVehicleDataResponse) msg).getWindowStatus();
+        VehicleDataResult testGearStatus = ((SubscribeVehicleDataResponse) msg).getGearStatus();
+        VehicleDataResult testStabilityControlStatus = ((SubscribeVehicleDataResponse) msg).getStabilityControlsStatus();
+        VehicleDataResult testOEMCustomVehicleData = ((SubscribeVehicleDataResponse) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
+
+        // Valid Tests
+        assertTrue(TestValues.TRUE, testResult.equals(TestValues.GENERAL_RESULT));
+        assertTrue(TestValues.TRUE, testGps.getDataType().equals(VehicleDataType.VEHICLEDATA_GPS));
+        assertTrue(TestValues.TRUE, testOdometer.getDataType().equals(VehicleDataType.VEHICLEDATA_ODOMETER));
+        assertTrue(TestValues.TRUE, testTirePressure.getDataType().equals(VehicleDataType.VEHICLEDATA_TIREPRESSURE));
+        assertTrue(TestValues.TRUE, testBeltStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_BELTSTATUS));
+        assertTrue(TestValues.TRUE, testBodyInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_BODYINFO));
+        assertTrue(TestValues.TRUE, testDeviceStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_DEVICESTATUS));
+        assertTrue(TestValues.TRUE, testHeadLampStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS));
+        assertTrue(TestValues.TRUE, testECallInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_ECALLINFO));
+        assertTrue(TestValues.TRUE, testAirbagStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS));
+        assertTrue(TestValues.TRUE, testEmergencyEvent.getDataType().equals(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT));
+        assertTrue(TestValues.TRUE, testClusterMode.getDataType().equals(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS));
+        assertTrue(TestValues.TRUE, testMyKey.getDataType().equals(VehicleDataType.VEHICLEDATA_MYKEY));
+        assertTrue(TestValues.TRUE, testSpeed.getDataType().equals(VehicleDataType.VEHICLEDATA_SPEED));
+        assertTrue(TestValues.TRUE, testRpm.getDataType().equals(VehicleDataType.VEHICLEDATA_RPM));
+        assertTrue(TestValues.TRUE, testFuelLevel.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL));
+        assertTrue(TestValues.TRUE, testConsumption.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION));
+        assertTrue(TestValues.TRUE, testExternalTemp.getDataType().equals(VehicleDataType.VEHICLEDATA_EXTERNTEMP));
+        assertTrue(TestValues.TRUE, testEngineTorque.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINETORQUE));
+        assertTrue(TestValues.TRUE, testEngineOilLife.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE));
+        assertTrue(TestValues.TRUE, testAccPedal.getDataType().equals(VehicleDataType.VEHICLEDATA_ACCPEDAL));
+        assertTrue(TestValues.TRUE, testSteeringWheel.getDataType().equals(VehicleDataType.VEHICLEDATA_STEERINGWHEEL));
+        assertTrue(TestValues.TRUE, testFuelLevelState.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE));
+        assertTrue(TestValues.TRUE, testPrndl.getDataType().equals(VehicleDataType.VEHICLEDATA_PRNDL));
+        assertTrue(TestValues.TRUE, testBraking.getDataType().equals(VehicleDataType.VEHICLEDATA_BRAKING));
+        assertTrue(TestValues.TRUE, testWiperStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WIPERSTATUS));
+        assertTrue(TestValues.TRUE, testFuelRange.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELRANGE));
+        assertTrue(TestValues.TRUE, testTurnSignal.getDataType().equals(VehicleDataType.VEHICLEDATA_TURNSIGNAL));
+        assertTrue(TestValues.TRUE, testEBrakeStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS));
+        assertTrue(TestValues.TRUE, testHOffSteering.getDataType().equals(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING));
+        assertTrue(TestValues.TRUE, testGearStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_GEARSTATUS));
+        assertTrue(TestValues.TRUE, testWindowStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WINDOWSTATUS));
+        assertTrue(TestValues.TRUE, testStabilityControlStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS));
+        assertTrue(TestValues.TRUE, testOEMCustomVehicleData.getOEMCustomVehicleDataType().equals(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
+
         // Invalid/Null Tests
-		SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse();
-        assertNotNull("Null object creation failed.", msg);        
+        SubscribeVehicleDataResponse msg = new SubscribeVehicleDataResponse();
+        assertNotNull("Null object creation failed.", msg);
         testNullBase(msg);
 
-		assertNull(TestValues.NULL, msg.getResultCode());
+        assertNull(TestValues.NULL, msg.getResultCode());
         assertNull(TestValues.NULL, msg.getAccPedalPosition());
         assertNull(TestValues.NULL, msg.getAirbagStatus());
         assertNull(TestValues.NULL, msg.getBeltStatus());
@@ -252,161 +252,161 @@ public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
     }
-	
+
     /**
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SubscribeVehicleDataResponse cmd = new SubscribeVehicleDataResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			JSONObject speed = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_SPEED);
-			VehicleDataResult referenceSpeed = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(speed));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSpeed, cmd.getSpeed()));
-			
-			JSONObject rpm = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_RPM);
-			VehicleDataResult referenceRpm = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(rpm));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceRpm, cmd.getRpm()));
-			
-			JSONObject fuelLevel = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_LEVEL);
-			VehicleDataResult referenceFuelLevel = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevel));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevel, cmd.getFuelLevel()));
-			
-			JSONObject externalTemperature = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE);
-			VehicleDataResult referenceExternalTemperature = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(externalTemperature));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceExternalTemperature, cmd.getExternalTemperature()));
-			
-			JSONObject prndl = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_PRNDL);
-			VehicleDataResult referencePrndl = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(prndl));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referencePrndl, cmd.getPrndl()));
-			
-			JSONObject tirePressure = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE);
-			VehicleDataResult referenceTirePressure = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(tirePressure));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTirePressure, cmd.getTirePressure()));
-
-			JSONObject engineTorque = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE);
-			VehicleDataResult referenceEngineTorque = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineTorque));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineTorque, cmd.getEngineTorque()));
-
-			JSONObject engineOilLife = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE);
-			VehicleDataResult referenceEngineOilLife = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineOilLife));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineOilLife, cmd.getEngineOilLife()));
-
-			JSONObject odometer = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ODOMETER);
-			VehicleDataResult referenceOdometer = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(odometer));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOdometer, cmd.getOdometer()));
-			
-			JSONObject gps = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_GPS);
-			VehicleDataResult referenceGps = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gps));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGps, cmd.getGps()));
-			
-			JSONObject fuelLevelState = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE);
-			VehicleDataResult referenceFuelLevelState = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevelState));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevelState, cmd.getFuelLevelState()));
-			
-			JSONObject fuelConsumption = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION);
-			VehicleDataResult referenceFuelConsumption = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelConsumption));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelConsumption, cmd.getInstantFuelConsumption()));
-			
-			JSONObject beltStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_BELT_STATUS);
-			VehicleDataResult referenceBeltStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(beltStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBeltStatus, cmd.getBeltStatus()));
-			
-			JSONObject bodyInformation = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_BODY_INFORMATION);
-			VehicleDataResult referenceBodyInformation = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(bodyInformation));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBodyInformation, cmd.getBodyInformation()));
-			
-			JSONObject deviceStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_DEVICE_STATUS);
-			VehicleDataResult referenceDeviceStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(deviceStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDeviceStatus, cmd.getDeviceStatus()));
-			
-			JSONObject driverBraking = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING);
-			VehicleDataResult referenceDriverBraking = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(driverBraking));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDriverBraking, cmd.getDriverBraking()));
-			
-			JSONObject wiperStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_WIPER_STATUS);
-			VehicleDataResult referenceWiperStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(wiperStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWiperStatus, cmd.getWiperStatus()));
-			
-			JSONObject headLampStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS);
-			VehicleDataResult referenceHeadLampStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(headLampStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHeadLampStatus, cmd.getHeadLampStatus()));
-			
-			JSONObject accPedalPosition = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION);
-			VehicleDataResult referenceAccPedalPosition = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(accPedalPosition));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAccPedalPosition, cmd.getAccPedalPosition()));
-			
-			JSONObject steeringWheelAngle = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE);
-			VehicleDataResult referenceSteeringWheelAngle = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(steeringWheelAngle));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSteeringWheelAngle, cmd.getSteeringWheelAngle()));
-			
-			JSONObject eCallInfo = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_E_CALL_INFO);
-			VehicleDataResult referenceECallInfo = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eCallInfo));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceECallInfo, cmd.getECallInfo()));
-			
-			JSONObject airbagStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS);
-			VehicleDataResult referenceAirbagStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(airbagStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAirbagStatus, cmd.getAirbagStatus()));
-			
-			JSONObject emergencyEvent = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT);
-			VehicleDataResult referenceEmergencyEvent = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(emergencyEvent));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEmergencyEvent, cmd.getEmergencyEvent()));
-			
-			JSONObject clusterModes = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_CLUSTER_MODES);
-			VehicleDataResult referenceClusterModes = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModes));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModes, cmd.getClusterModes()));
-			
-			JSONObject myKey = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_MY_KEY);
-			VehicleDataResult referenceMyKey = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(myKey));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceMyKey, cmd.getMyKey()));
-
-			JSONObject fuelRange = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_RANGE);
-			VehicleDataResult referenceFuelRange = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelRange));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelRange, cmd.getFuelRange()));
-
-			JSONObject turnSignal = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_TURN_SIGNAL);
-			VehicleDataResult referenceTurnSignal = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(turnSignal));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTurnSignal, cmd.getTurnSignal()));
-
-			JSONObject electronicParkBrakeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS);
-			VehicleDataResult referenceEBrakeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(electronicParkBrakeStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEBrakeStatus, cmd.getElectronicParkBrakeStatus()));
-
-			JSONObject handsOffSteering = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING);
-			VehicleDataResult referenceHandsOffSteering = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(handsOffSteering));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHandsOffSteering, cmd.getHandsOffSteering()));
-
-			JSONObject windowStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_WINDOW_STATUS);
-			VehicleDataResult referenceWindowStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(windowStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWindowStatus, cmd.getWindowStatus()));
-
-			JSONObject gearStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_GEAR_STATUS);
-			VehicleDataResult referenceGearStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gearStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGearStatus, cmd.getGearStatus()));
-
-			JSONObject stabilityControlStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS);
-			VehicleDataResult referenceStabilityControlStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(stabilityControlStatus));
-			assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(referenceStabilityControlStatus, cmd.getStabilityControlsStatus()));
-
-			JSONObject oemCustomVehicleDataName = JsonUtils.readJsonObjectFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
-			VehicleDataResult referenceOemCustomData = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(oemCustomVehicleDataName));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOemCustomData, cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SubscribeVehicleDataResponse cmd = new SubscribeVehicleDataResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            JSONObject speed = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_SPEED);
+            VehicleDataResult referenceSpeed = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(speed));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSpeed, cmd.getSpeed()));
+
+            JSONObject rpm = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_RPM);
+            VehicleDataResult referenceRpm = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(rpm));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceRpm, cmd.getRpm()));
+
+            JSONObject fuelLevel = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_LEVEL);
+            VehicleDataResult referenceFuelLevel = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevel));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevel, cmd.getFuelLevel()));
+
+            JSONObject externalTemperature = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE);
+            VehicleDataResult referenceExternalTemperature = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(externalTemperature));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceExternalTemperature, cmd.getExternalTemperature()));
+
+            JSONObject prndl = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_PRNDL);
+            VehicleDataResult referencePrndl = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(prndl));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referencePrndl, cmd.getPrndl()));
+
+            JSONObject tirePressure = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE);
+            VehicleDataResult referenceTirePressure = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(tirePressure));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTirePressure, cmd.getTirePressure()));
+
+            JSONObject engineTorque = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE);
+            VehicleDataResult referenceEngineTorque = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineTorque));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineTorque, cmd.getEngineTorque()));
+
+            JSONObject engineOilLife = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE);
+            VehicleDataResult referenceEngineOilLife = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineOilLife));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineOilLife, cmd.getEngineOilLife()));
+
+            JSONObject odometer = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ODOMETER);
+            VehicleDataResult referenceOdometer = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(odometer));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOdometer, cmd.getOdometer()));
+
+            JSONObject gps = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_GPS);
+            VehicleDataResult referenceGps = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gps));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGps, cmd.getGps()));
+
+            JSONObject fuelLevelState = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE);
+            VehicleDataResult referenceFuelLevelState = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevelState));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevelState, cmd.getFuelLevelState()));
+
+            JSONObject fuelConsumption = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION);
+            VehicleDataResult referenceFuelConsumption = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelConsumption));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelConsumption, cmd.getInstantFuelConsumption()));
+
+            JSONObject beltStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_BELT_STATUS);
+            VehicleDataResult referenceBeltStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(beltStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBeltStatus, cmd.getBeltStatus()));
+
+            JSONObject bodyInformation = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_BODY_INFORMATION);
+            VehicleDataResult referenceBodyInformation = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(bodyInformation));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBodyInformation, cmd.getBodyInformation()));
+
+            JSONObject deviceStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_DEVICE_STATUS);
+            VehicleDataResult referenceDeviceStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(deviceStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDeviceStatus, cmd.getDeviceStatus()));
+
+            JSONObject driverBraking = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING);
+            VehicleDataResult referenceDriverBraking = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(driverBraking));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDriverBraking, cmd.getDriverBraking()));
+
+            JSONObject wiperStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_WIPER_STATUS);
+            VehicleDataResult referenceWiperStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(wiperStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWiperStatus, cmd.getWiperStatus()));
+
+            JSONObject headLampStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS);
+            VehicleDataResult referenceHeadLampStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(headLampStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHeadLampStatus, cmd.getHeadLampStatus()));
+
+            JSONObject accPedalPosition = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION);
+            VehicleDataResult referenceAccPedalPosition = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(accPedalPosition));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAccPedalPosition, cmd.getAccPedalPosition()));
+
+            JSONObject steeringWheelAngle = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE);
+            VehicleDataResult referenceSteeringWheelAngle = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(steeringWheelAngle));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSteeringWheelAngle, cmd.getSteeringWheelAngle()));
+
+            JSONObject eCallInfo = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_E_CALL_INFO);
+            VehicleDataResult referenceECallInfo = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eCallInfo));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceECallInfo, cmd.getECallInfo()));
+
+            JSONObject airbagStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS);
+            VehicleDataResult referenceAirbagStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(airbagStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAirbagStatus, cmd.getAirbagStatus()));
+
+            JSONObject emergencyEvent = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT);
+            VehicleDataResult referenceEmergencyEvent = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(emergencyEvent));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEmergencyEvent, cmd.getEmergencyEvent()));
+
+            JSONObject clusterModes = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_CLUSTER_MODES);
+            VehicleDataResult referenceClusterModes = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModes));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModes, cmd.getClusterModes()));
+
+            JSONObject myKey = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_MY_KEY);
+            VehicleDataResult referenceMyKey = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(myKey));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceMyKey, cmd.getMyKey()));
+
+            JSONObject fuelRange = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_FUEL_RANGE);
+            VehicleDataResult referenceFuelRange = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelRange));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelRange, cmd.getFuelRange()));
+
+            JSONObject turnSignal = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_TURN_SIGNAL);
+            VehicleDataResult referenceTurnSignal = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(turnSignal));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTurnSignal, cmd.getTurnSignal()));
+
+            JSONObject electronicParkBrakeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS);
+            VehicleDataResult referenceEBrakeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(electronicParkBrakeStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEBrakeStatus, cmd.getElectronicParkBrakeStatus()));
+
+            JSONObject handsOffSteering = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING);
+            VehicleDataResult referenceHandsOffSteering = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(handsOffSteering));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHandsOffSteering, cmd.getHandsOffSteering()));
+
+            JSONObject windowStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_WINDOW_STATUS);
+            VehicleDataResult referenceWindowStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(windowStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWindowStatus, cmd.getWindowStatus()));
+
+            JSONObject gearStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_GEAR_STATUS);
+            VehicleDataResult referenceGearStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gearStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGearStatus, cmd.getGearStatus()));
+
+            JSONObject stabilityControlStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS);
+            VehicleDataResult referenceStabilityControlStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(stabilityControlStatus));
+            assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(referenceStabilityControlStatus, cmd.getStabilityControlsStatus()));
+
+            JSONObject oemCustomVehicleDataName = JsonUtils.readJsonObjectFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
+            VehicleDataResult referenceOemCustomData = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(oemCustomVehicleDataName));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOemCustomData, cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java
index 8a156d12f..3434b12b8 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeWaypointsResponseTests.java
@@ -25,22 +25,22 @@ import static junit.framework.TestCase.assertNotNull;
 
 public class SubscribeWaypointsResponseTests extends BaseRpcTests {
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new SubscribeWayPointsResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SUBSCRIBE_WAY_POINTS.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
@@ -48,7 +48,7 @@ public class SubscribeWaypointsResponseTests extends BaseRpcTests {
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Invalid/Null Tests
         SubscribeWayPointsResponse msg = new SubscribeWayPointsResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
@@ -59,7 +59,7 @@ public class SubscribeWaypointsResponseTests extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
index 4fb706980..7e2827d40 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
@@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.SystemRequestResponse}
  */
 public class SystemRequestResponseTest extends BaseRpcTests {
-	
-	@Override
-    protected RPCMessage createMessage(){
+
+    @Override
+    protected RPCMessage createMessage() {
         return new SystemRequestResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.SYSTEM_REQUEST.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	SystemRequestResponse msg = new SystemRequestResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        SystemRequestResponse msg = new SystemRequestResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
@@ -60,22 +60,22 @@ public class SystemRequestResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			SystemRequestResponse cmd = new SystemRequestResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            SystemRequestResponse cmd = new SystemRequestResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java
index 474c05cd6..ccbe562f9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnpublishAppServiceResponseTests.java
@@ -60,58 +60,58 @@ import static junit.framework.TestCase.assertNotNull;
  */
 public class UnpublishAppServiceResponseTests extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage(){
-		return new UnpublishAppServiceResponse();
-	}
-
-	@Override
-	protected String getMessageType(){
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType(){
-		return FunctionID.UNPUBLISH_APP_SERVICE.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion){
-		return new JSONObject();
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-	public void testRpcValues () {
-		// Invalid/Null Tests
-		UnpublishAppServiceResponse msg = new UnpublishAppServiceResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-		testNullBase(msg);
-	}
-
-	/**
-	 * Tests a valid JSON construction of this RPC message.
-	 */
-	@Test
-	public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			UnpublishAppServiceResponse cmd = new UnpublishAppServiceResponse(hash);
-
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
+    @Override
+    protected RPCMessage createMessage() {
+        return new UnpublishAppServiceResponse();
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.UNPUBLISH_APP_SERVICE.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        return new JSONObject();
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        UnpublishAppServiceResponse msg = new UnpublishAppServiceResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+    }
+
+    /**
+     * Tests a valid JSON construction of this RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            UnpublishAppServiceResponse cmd = new UnpublishAppServiceResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
index 02d0623c5..a6fc526f3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
@@ -20,38 +20,38 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.UnregisterAppInterfaceResponse}
  */
 public class UnregisterAppInterfaceResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new UnregisterAppInterfaceResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.UNREGISTER_APP_INTERFACE.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	UnregisterAppInterfaceResponse msg = new UnregisterAppInterfaceResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        UnregisterAppInterfaceResponse msg = new UnregisterAppInterfaceResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
@@ -60,22 +60,22 @@ public class UnregisterAppInterfaceResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			UnregisterAppInterfaceResponse cmd = new UnregisterAppInterfaceResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            UnregisterAppInterfaceResponse cmd = new UnregisterAppInterfaceResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
index 348ffd95d..55d7b1e51 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
@@ -21,38 +21,38 @@ import static junit.framework.TestCase.assertNotNull;
 
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.UnsubscribeButtonResponse}
  */
 public class UnsubscribeButtonResponseTest extends BaseRpcTests {
 
-	@Override
-    protected RPCMessage createMessage(){
+    @Override
+    protected RPCMessage createMessage() {
         return new UnsubscribeButtonResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.UNSUBSCRIBE_BUTTON.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-    public void testRpcValues () {   
-    	// Invalid/Null Tests
-    	UnsubscribeButtonResponse msg = new UnsubscribeButtonResponse();
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        UnsubscribeButtonResponse msg = new UnsubscribeButtonResponse();
         assertNotNull(TestValues.NOT_NULL, msg);
         testNullBase(msg);
     }
@@ -61,22 +61,22 @@ public class UnsubscribeButtonResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			UnsubscribeButtonResponse cmd = new UnsubscribeButtonResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}    	
-    }    
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            UnsubscribeButtonResponse cmd = new UnsubscribeButtonResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
index f4f61fde3..1d5504b08 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
@@ -29,199 +29,199 @@ import static junit.framework.TestCase.assertTrue;
 import static junit.framework.TestCase.fail;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.UnsubscribeVehicleDataResponse}
  */
 public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
 
-	@Override
-	protected RPCMessage createMessage() {
-		UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse();
-
-		msg.setResultCode(TestValues.GENERAL_RESULT);
-		msg.setSpeed(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()));
-		msg.setRpm(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()));
-		msg.setExternalTemperature(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()));
-		msg.setFuelLevel(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()));
-		msg.setPrndl(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()));
-		msg.setTirePressure(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()));
-		msg.setEngineTorque(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()));
-		msg.setEngineOilLife(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()));
-		msg.setOdometer(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()));
-		msg.setGps(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()));
-		msg.setFuelLevelState(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()));
-		msg.setInstantFuelConsumption(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()));
-		msg.setBeltStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()));
-		msg.setBodyInformation(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()));
-		msg.setDeviceStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()));
-		msg.setDriverBraking(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()));
-		msg.setWiperStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()));
-		msg.setHeadLampStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()));
-		msg.setAccPedalPosition(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()));
-		msg.setSteeringWheelAngle(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()));
-		msg.setECallInfo(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()));
-		msg.setAirbagStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()));
-		msg.setEmergencyEvent(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()));
-		msg.setClusterModes(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()));
-		msg.setMyKey(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()));
-		msg.setFuelRange(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()));
-		msg.setTurnSignal(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()));
-		msg.setElectronicParkBrakeStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()));
-		msg.setWindowStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()));
-		msg.setHandsOffSteering(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()));
-		msg.setGearStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()));
-		msg.setStabilityControlsStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()));
-		msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA);
-
-		return msg;
-	}
-	
-	@Override
-	protected String getMessageType() {
-		return RPCMessage.KEY_RESPONSE;
-	}
-
-	@Override
-	protected String getCommandType() {
-		return FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString();
-	}
-
-	@Override
-	protected JSONObject getExpectedParameters(int sdlVersion) {
-		JSONObject result = new JSONObject();
-		
+    @Override
+    protected RPCMessage createMessage() {
+        UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse();
+
+        msg.setResultCode(TestValues.GENERAL_RESULT);
+        msg.setSpeed(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()));
+        msg.setRpm(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()));
+        msg.setExternalTemperature(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()));
+        msg.setFuelLevel(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()));
+        msg.setPrndl(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()));
+        msg.setTirePressure(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()));
+        msg.setEngineTorque(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()));
+        msg.setEngineOilLife(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()));
+        msg.setOdometer(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()));
+        msg.setGps(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()));
+        msg.setFuelLevelState(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()));
+        msg.setInstantFuelConsumption(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()));
+        msg.setBeltStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()));
+        msg.setBodyInformation(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()));
+        msg.setDeviceStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()));
+        msg.setDriverBraking(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()));
+        msg.setWiperStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()));
+        msg.setHeadLampStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()));
+        msg.setAccPedalPosition(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()));
+        msg.setSteeringWheelAngle(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()));
+        msg.setECallInfo(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()));
+        msg.setAirbagStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()));
+        msg.setEmergencyEvent(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()));
+        msg.setClusterModes(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()));
+        msg.setMyKey(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()));
+        msg.setFuelRange(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()));
+        msg.setTurnSignal(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()));
+        msg.setElectronicParkBrakeStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()));
+        msg.setWindowStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()));
+        msg.setHandsOffSteering(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()));
+        msg.setGearStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()));
+        msg.setStabilityControlsStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()));
+        msg.setOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA);
+
+        return msg;
+    }
+
+    @Override
+    protected String getMessageType() {
+        return RPCMessage.KEY_RESPONSE;
+    }
+
+    @Override
+    protected String getCommandType() {
+        return FunctionID.UNSUBSCRIBE_VEHICLE_DATA.toString();
+    }
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
+        JSONObject result = new JSONObject();
+
         try {
 
-        	// Note: If the key values stored in SubscribeVehicleDataResponse
-        	// were to be in a list then this could be easily looped through
-        	// instead of individually set.
-
-			result.put(SubscribeVehicleDataResponse.KEY_RESULT_CODE, TestValues.GENERAL_RESULT);
-			result.put(SubscribeVehicleDataResponse.KEY_SPEED, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_RPM, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_PRNDL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_ODOMETER, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_GPS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_BELT_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_BODY_INFORMATION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_DEVICE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_WIPER_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_E_CALL_INFO, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODES, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON());
-			result.put(SubscribeVehicleDataResponse.KEY_GEAR_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()).serializeJSON());
-			result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()).serializeJSON());
-	        result.put(SubscribeVehicleDataResponse.KEY_WINDOW_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()).serializeJSON());
-	        result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA.serializeJSON());
-		} catch (JSONException e) {
-			fail(TestValues.JSON_FAIL);
-		}
-
-		return result;
-	}
-
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {
-    	// Test Values
-		Result testResult                    = ( (UnsubscribeVehicleDataResponse) msg ).getResultCode();
-		VehicleDataResult testGps            = ( (UnsubscribeVehicleDataResponse) msg ).getGps();
-		VehicleDataResult testOdometer       = ( (UnsubscribeVehicleDataResponse) msg ).getOdometer();
-		VehicleDataResult testTirePressure   = ( (UnsubscribeVehicleDataResponse) msg ).getTirePressure();
-		VehicleDataResult testBeltStatus     = ( (UnsubscribeVehicleDataResponse) msg ).getBeltStatus();
-		VehicleDataResult testBodyInfo       = ( (UnsubscribeVehicleDataResponse) msg ).getBodyInformation();
-		VehicleDataResult testDeviceStatus   = ( (UnsubscribeVehicleDataResponse) msg ).getDeviceStatus();
-		VehicleDataResult testHeadLampStatus = ( (UnsubscribeVehicleDataResponse) msg ).getHeadLampStatus();
-		VehicleDataResult testECallInfo      = ( (UnsubscribeVehicleDataResponse) msg ).getECallInfo();
-		VehicleDataResult testAirbagStatus   = ( (UnsubscribeVehicleDataResponse) msg ).getAirbagStatus();
-		VehicleDataResult testEmergencyEvent = ( (UnsubscribeVehicleDataResponse) msg ).getEmergencyEvent();
-		VehicleDataResult testClusterMode    = ( (UnsubscribeVehicleDataResponse) msg ).getClusterModes();
-		VehicleDataResult testMyKey          = ( (UnsubscribeVehicleDataResponse) msg ).getMyKey();
-		VehicleDataResult testSpeed          = ( (UnsubscribeVehicleDataResponse) msg ).getSpeed();
-		VehicleDataResult testRpm            = ( (UnsubscribeVehicleDataResponse) msg ).getRpm();
-		VehicleDataResult testFuelLevel      = ( (UnsubscribeVehicleDataResponse) msg ).getFuelLevel();
-		VehicleDataResult testConsumption    = ( (UnsubscribeVehicleDataResponse) msg ).getInstantFuelConsumption();
-		VehicleDataResult testExternalTemp   = ( (UnsubscribeVehicleDataResponse) msg ).getExternalTemperature();
-		VehicleDataResult testEngineTorque   = ( (UnsubscribeVehicleDataResponse) msg ).getEngineTorque();
-		VehicleDataResult testEngineOilLife  = ( (UnsubscribeVehicleDataResponse) msg ).getEngineOilLife();
-		VehicleDataResult testAccPedal       = ( (UnsubscribeVehicleDataResponse) msg ).getAccPedalPosition();
-		VehicleDataResult testSteeringWheel  = ( (UnsubscribeVehicleDataResponse) msg ).getSteeringWheelAngle();
-		VehicleDataResult testFuelLevelState = ( (UnsubscribeVehicleDataResponse) msg ).getFuelLevelState();
-		VehicleDataResult testPrndl          = ( (UnsubscribeVehicleDataResponse) msg ).getPrndl();
-		VehicleDataResult testBraking        = ( (UnsubscribeVehicleDataResponse) msg ).getDriverBraking();
-		VehicleDataResult testWiperStatus    = ( (UnsubscribeVehicleDataResponse) msg ).getWiperStatus();
-		VehicleDataResult testFuelRange      = ( (UnsubscribeVehicleDataResponse) msg ).getFuelRange();
-		VehicleDataResult testTurnSignal     = ( (UnsubscribeVehicleDataResponse) msg ).getTurnSignal();
-		VehicleDataResult testEBrakeStatus   = ( (UnsubscribeVehicleDataResponse) msg ).getElectronicParkBrakeStatus();
-		VehicleDataResult testHOffSteering   = ( (UnsubscribeVehicleDataResponse) msg ).getHandsOffSteering();
-		VehicleDataResult testGearStatus     = ( (UnsubscribeVehicleDataResponse) msg ).getGearStatus();
-		VehicleDataResult testWindowStatus   = ( (UnsubscribeVehicleDataResponse) msg ).getWindowStatus();
-		VehicleDataResult testStabilityControlStatus   = ( (UnsubscribeVehicleDataResponse) msg ).getStabilityControlsStatus();
-		VehicleDataResult testOemCustomData   = ( (UnsubscribeVehicleDataResponse) msg ).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
-		
-		// Valid Tests
-		assertTrue(TestValues.TRUE, testResult.equals(TestValues.GENERAL_RESULT));
-		assertTrue(TestValues.TRUE, testGps.getDataType().equals(VehicleDataType.VEHICLEDATA_GPS));
-		assertTrue(TestValues.TRUE, testOdometer.getDataType().equals(VehicleDataType.VEHICLEDATA_ODOMETER));
-		assertTrue(TestValues.TRUE, testTirePressure.getDataType().equals(VehicleDataType.VEHICLEDATA_TIREPRESSURE));
-	    assertTrue(TestValues.TRUE, testBeltStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_BELTSTATUS));
-	    assertTrue(TestValues.TRUE, testBodyInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_BODYINFO));
-	    assertTrue(TestValues.TRUE, testDeviceStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_DEVICESTATUS));
-	    assertTrue(TestValues.TRUE, testHeadLampStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS));
-	    assertTrue(TestValues.TRUE, testECallInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_ECALLINFO));
-	    assertTrue(TestValues.TRUE, testAirbagStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS));
-	    assertTrue(TestValues.TRUE, testEmergencyEvent.getDataType().equals(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT));
-	    assertTrue(TestValues.TRUE, testClusterMode.getDataType().equals(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS));
-	    assertTrue(TestValues.TRUE, testMyKey.getDataType().equals(VehicleDataType.VEHICLEDATA_MYKEY));
-	    assertTrue(TestValues.TRUE, testSpeed.getDataType().equals(VehicleDataType.VEHICLEDATA_SPEED));
-	    assertTrue(TestValues.TRUE, testRpm.getDataType().equals(VehicleDataType.VEHICLEDATA_RPM));
-	    assertTrue(TestValues.TRUE, testFuelLevel.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL));
-	    assertTrue(TestValues.TRUE, testConsumption.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION));
-	    assertTrue(TestValues.TRUE, testExternalTemp.getDataType().equals(VehicleDataType.VEHICLEDATA_EXTERNTEMP));
-	    assertTrue(TestValues.TRUE, testEngineTorque.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINETORQUE));
-	    assertTrue(TestValues.TRUE, testEngineOilLife.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE));
-	    assertTrue(TestValues.TRUE, testAccPedal.getDataType().equals(VehicleDataType.VEHICLEDATA_ACCPEDAL));
-	    assertTrue(TestValues.TRUE, testSteeringWheel.getDataType().equals(VehicleDataType.VEHICLEDATA_STEERINGWHEEL));
-	    assertTrue(TestValues.TRUE, testFuelLevelState.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE));
-	    assertTrue(TestValues.TRUE, testPrndl.getDataType().equals(VehicleDataType.VEHICLEDATA_PRNDL));
-	    assertTrue(TestValues.TRUE, testBraking.getDataType().equals(VehicleDataType.VEHICLEDATA_BRAKING));
-	    assertTrue(TestValues.TRUE, testWiperStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WIPERSTATUS));
-	    assertTrue(TestValues.TRUE, testFuelRange.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELRANGE));
-	    assertTrue(TestValues.TRUE, testTurnSignal.getDataType().equals(VehicleDataType.VEHICLEDATA_TURNSIGNAL));
-	    assertTrue(TestValues.TRUE, testEBrakeStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS));
-	    assertTrue(TestValues.TRUE, testHOffSteering.getDataType().equals(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING));
-	    assertTrue(TestValues.TRUE, testWindowStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WINDOWSTATUS));
-	    assertTrue(TestValues.TRUE, testStabilityControlStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS));
-	    assertTrue(TestValues.TRUE, testOemCustomData.getOEMCustomVehicleDataType().equals(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
-		assertTrue(TestValues.TRUE, testGearStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_GEARSTATUS));
+            // Note: If the key values stored in SubscribeVehicleDataResponse
+            // were to be in a list then this could be easily looped through
+            // instead of individually set.
+
+            result.put(SubscribeVehicleDataResponse.KEY_RESULT_CODE, TestValues.GENERAL_RESULT);
+            result.put(SubscribeVehicleDataResponse.KEY_SPEED, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_SPEED.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_RPM, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_RPM.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EXTERNTEMP.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_PRNDL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_PRNDL.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_TIRE_PRESSURE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TIREPRESSURE.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ENGINE_TORQUE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINETORQUE.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ODOMETER, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ODOMETER.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_GPS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GPS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_BELT_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BELTSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_BODY_INFORMATION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BODYINFO.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_DEVICE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_DEVICESTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_DRIVER_BRAKING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_BRAKING.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_WIPER_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WIPERSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ACCPEDAL.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STEERINGWHEEL.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_E_CALL_INFO, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODES, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_GEAR_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_GEARSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING.ordinal()).serializeJSON());
+            result.put(SubscribeVehicleDataResponse.KEY_WINDOW_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_WINDOWSTATUS.ordinal()).serializeJSON());
+            result.put(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA.serializeJSON());
+        } catch (JSONException e) {
+            fail(TestValues.JSON_FAIL);
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testRpcValues() {
+        // Test Values
+        Result testResult = ((UnsubscribeVehicleDataResponse) msg).getResultCode();
+        VehicleDataResult testGps = ((UnsubscribeVehicleDataResponse) msg).getGps();
+        VehicleDataResult testOdometer = ((UnsubscribeVehicleDataResponse) msg).getOdometer();
+        VehicleDataResult testTirePressure = ((UnsubscribeVehicleDataResponse) msg).getTirePressure();
+        VehicleDataResult testBeltStatus = ((UnsubscribeVehicleDataResponse) msg).getBeltStatus();
+        VehicleDataResult testBodyInfo = ((UnsubscribeVehicleDataResponse) msg).getBodyInformation();
+        VehicleDataResult testDeviceStatus = ((UnsubscribeVehicleDataResponse) msg).getDeviceStatus();
+        VehicleDataResult testHeadLampStatus = ((UnsubscribeVehicleDataResponse) msg).getHeadLampStatus();
+        VehicleDataResult testECallInfo = ((UnsubscribeVehicleDataResponse) msg).getECallInfo();
+        VehicleDataResult testAirbagStatus = ((UnsubscribeVehicleDataResponse) msg).getAirbagStatus();
+        VehicleDataResult testEmergencyEvent = ((UnsubscribeVehicleDataResponse) msg).getEmergencyEvent();
+        VehicleDataResult testClusterMode = ((UnsubscribeVehicleDataResponse) msg).getClusterModes();
+        VehicleDataResult testMyKey = ((UnsubscribeVehicleDataResponse) msg).getMyKey();
+        VehicleDataResult testSpeed = ((UnsubscribeVehicleDataResponse) msg).getSpeed();
+        VehicleDataResult testRpm = ((UnsubscribeVehicleDataResponse) msg).getRpm();
+        VehicleDataResult testFuelLevel = ((UnsubscribeVehicleDataResponse) msg).getFuelLevel();
+        VehicleDataResult testConsumption = ((UnsubscribeVehicleDataResponse) msg).getInstantFuelConsumption();
+        VehicleDataResult testExternalTemp = ((UnsubscribeVehicleDataResponse) msg).getExternalTemperature();
+        VehicleDataResult testEngineTorque = ((UnsubscribeVehicleDataResponse) msg).getEngineTorque();
+        VehicleDataResult testEngineOilLife = ((UnsubscribeVehicleDataResponse) msg).getEngineOilLife();
+        VehicleDataResult testAccPedal = ((UnsubscribeVehicleDataResponse) msg).getAccPedalPosition();
+        VehicleDataResult testSteeringWheel = ((UnsubscribeVehicleDataResponse) msg).getSteeringWheelAngle();
+        VehicleDataResult testFuelLevelState = ((UnsubscribeVehicleDataResponse) msg).getFuelLevelState();
+        VehicleDataResult testPrndl = ((UnsubscribeVehicleDataResponse) msg).getPrndl();
+        VehicleDataResult testBraking = ((UnsubscribeVehicleDataResponse) msg).getDriverBraking();
+        VehicleDataResult testWiperStatus = ((UnsubscribeVehicleDataResponse) msg).getWiperStatus();
+        VehicleDataResult testFuelRange = ((UnsubscribeVehicleDataResponse) msg).getFuelRange();
+        VehicleDataResult testTurnSignal = ((UnsubscribeVehicleDataResponse) msg).getTurnSignal();
+        VehicleDataResult testEBrakeStatus = ((UnsubscribeVehicleDataResponse) msg).getElectronicParkBrakeStatus();
+        VehicleDataResult testHOffSteering = ((UnsubscribeVehicleDataResponse) msg).getHandsOffSteering();
+        VehicleDataResult testGearStatus = ((UnsubscribeVehicleDataResponse) msg).getGearStatus();
+        VehicleDataResult testWindowStatus = ((UnsubscribeVehicleDataResponse) msg).getWindowStatus();
+        VehicleDataResult testStabilityControlStatus = ((UnsubscribeVehicleDataResponse) msg).getStabilityControlsStatus();
+        VehicleDataResult testOemCustomData = ((UnsubscribeVehicleDataResponse) msg).getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
+
+        // Valid Tests
+        assertTrue(TestValues.TRUE, testResult.equals(TestValues.GENERAL_RESULT));
+        assertTrue(TestValues.TRUE, testGps.getDataType().equals(VehicleDataType.VEHICLEDATA_GPS));
+        assertTrue(TestValues.TRUE, testOdometer.getDataType().equals(VehicleDataType.VEHICLEDATA_ODOMETER));
+        assertTrue(TestValues.TRUE, testTirePressure.getDataType().equals(VehicleDataType.VEHICLEDATA_TIREPRESSURE));
+        assertTrue(TestValues.TRUE, testBeltStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_BELTSTATUS));
+        assertTrue(TestValues.TRUE, testBodyInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_BODYINFO));
+        assertTrue(TestValues.TRUE, testDeviceStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_DEVICESTATUS));
+        assertTrue(TestValues.TRUE, testHeadLampStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_HEADLAMPSTATUS));
+        assertTrue(TestValues.TRUE, testECallInfo.getDataType().equals(VehicleDataType.VEHICLEDATA_ECALLINFO));
+        assertTrue(TestValues.TRUE, testAirbagStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS));
+        assertTrue(TestValues.TRUE, testEmergencyEvent.getDataType().equals(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT));
+        assertTrue(TestValues.TRUE, testClusterMode.getDataType().equals(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS));
+        assertTrue(TestValues.TRUE, testMyKey.getDataType().equals(VehicleDataType.VEHICLEDATA_MYKEY));
+        assertTrue(TestValues.TRUE, testSpeed.getDataType().equals(VehicleDataType.VEHICLEDATA_SPEED));
+        assertTrue(TestValues.TRUE, testRpm.getDataType().equals(VehicleDataType.VEHICLEDATA_RPM));
+        assertTrue(TestValues.TRUE, testFuelLevel.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL));
+        assertTrue(TestValues.TRUE, testConsumption.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELCONSUMPTION));
+        assertTrue(TestValues.TRUE, testExternalTemp.getDataType().equals(VehicleDataType.VEHICLEDATA_EXTERNTEMP));
+        assertTrue(TestValues.TRUE, testEngineTorque.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINETORQUE));
+        assertTrue(TestValues.TRUE, testEngineOilLife.getDataType().equals(VehicleDataType.VEHICLEDATA_ENGINEOILLIFE));
+        assertTrue(TestValues.TRUE, testAccPedal.getDataType().equals(VehicleDataType.VEHICLEDATA_ACCPEDAL));
+        assertTrue(TestValues.TRUE, testSteeringWheel.getDataType().equals(VehicleDataType.VEHICLEDATA_STEERINGWHEEL));
+        assertTrue(TestValues.TRUE, testFuelLevelState.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELLEVEL_STATE));
+        assertTrue(TestValues.TRUE, testPrndl.getDataType().equals(VehicleDataType.VEHICLEDATA_PRNDL));
+        assertTrue(TestValues.TRUE, testBraking.getDataType().equals(VehicleDataType.VEHICLEDATA_BRAKING));
+        assertTrue(TestValues.TRUE, testWiperStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WIPERSTATUS));
+        assertTrue(TestValues.TRUE, testFuelRange.getDataType().equals(VehicleDataType.VEHICLEDATA_FUELRANGE));
+        assertTrue(TestValues.TRUE, testTurnSignal.getDataType().equals(VehicleDataType.VEHICLEDATA_TURNSIGNAL));
+        assertTrue(TestValues.TRUE, testEBrakeStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_ELECTRONICPARKBRAKESTATUS));
+        assertTrue(TestValues.TRUE, testHOffSteering.getDataType().equals(VehicleDataType.VEHICLEDATA_HANDSOFFSTEERING));
+        assertTrue(TestValues.TRUE, testWindowStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_WINDOWSTATUS));
+        assertTrue(TestValues.TRUE, testStabilityControlStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_STABILITYCONTROLSSTATUS));
+        assertTrue(TestValues.TRUE, testOemCustomData.getOEMCustomVehicleDataType().equals(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
+        assertTrue(TestValues.TRUE, testGearStatus.getDataType().equals(VehicleDataType.VEHICLEDATA_GEARSTATUS));
 
         // Invalid/Null Tests
-		UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse();
-        assertNotNull("Null object creation failed.", msg);        
+        UnsubscribeVehicleDataResponse msg = new UnsubscribeVehicleDataResponse();
+        assertNotNull("Null object creation failed.", msg);
         testNullBase(msg);
 
-		assertNull(TestValues.NULL, msg.getResultCode());
-		assertNull(TestValues.NULL, msg.getAccPedalPosition());
+        assertNull(TestValues.NULL, msg.getResultCode());
+        assertNull(TestValues.NULL, msg.getAccPedalPosition());
         assertNull(TestValues.NULL, msg.getAirbagStatus());
         assertNull(TestValues.NULL, msg.getBeltStatus());
         assertNull(TestValues.NULL, msg.getDriverBraking());
@@ -249,9 +249,9 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
         assertNull(TestValues.NULL, msg.getFuelRange());
         assertNull(TestValues.NULL, msg.getTurnSignal());
         assertNull(TestValues.NULL, msg.getElectronicParkBrakeStatus());
-		assertNull(TestValues.NULL, msg.getGearStatus());
-		assertNull(TestValues.NULL, msg.getHandsOffSteering());
-		assertNull(TestValues.NULL, msg.getWindowStatus());
+        assertNull(TestValues.NULL, msg.getGearStatus());
+        assertNull(TestValues.NULL, msg.getHandsOffSteering());
+        assertNull(TestValues.NULL, msg.getWindowStatus());
         assertNull(TestValues.NULL, msg.getHandsOffSteering());
         assertNull(TestValues.NULL, msg.getStabilityControlsStatus());
         assertNull(TestValues.NULL, msg.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME));
@@ -261,156 +261,156 @@ public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
-    	JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
-    	assertNotNull(TestValues.NOT_NULL, commandJson);
-    	
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			UnsubscribeVehicleDataResponse cmd = new UnsubscribeVehicleDataResponse(hash);
-			
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-
-			JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
-
-			JSONObject speed = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_SPEED);
-			VehicleDataResult referenceSpeed = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(speed));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSpeed, cmd.getSpeed()));
-			
-			JSONObject rpm = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_RPM);
-			VehicleDataResult referenceRpm = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(rpm));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceRpm, cmd.getRpm()));
-			
-			JSONObject fuelLevel = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_LEVEL);
-			VehicleDataResult referenceFuelLevel = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevel));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevel, cmd.getFuelLevel()));
-			
-			JSONObject externalTemperature = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE);
-			VehicleDataResult referenceExternalTemperature = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(externalTemperature));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceExternalTemperature, cmd.getExternalTemperature()));
-			
-			JSONObject prndl = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_PRNDL);
-			VehicleDataResult referencePrndl = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(prndl));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referencePrndl, cmd.getPrndl()));
-			
-			JSONObject tirePressure = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_TIRE_PRESSURE);
-			VehicleDataResult referenceTirePressure = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(tirePressure));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTirePressure, cmd.getTirePressure()));
-
-			JSONObject engineTorque = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ENGINE_TORQUE);
-			VehicleDataResult referenceEngineTorque = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineTorque));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineTorque, cmd.getEngineTorque()));
-
-			JSONObject engineOilLife = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE);
-			VehicleDataResult referenceEngineOilLife = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineOilLife));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineOilLife, cmd.getEngineOilLife()));
-
-			JSONObject odometer = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ODOMETER);
-			VehicleDataResult referenceOdometer = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(odometer));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOdometer, cmd.getOdometer()));
-			
-			JSONObject gps = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_GPS);
-			VehicleDataResult referenceGps = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gps));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGps, cmd.getGps()));
-			
-			JSONObject fuelLevelState = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE);
-			VehicleDataResult referenceFuelLevelState = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevelState));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevelState, cmd.getFuelLevelState()));
-			
-			JSONObject fuelConsumption = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION);
-			VehicleDataResult referenceFuelConsumption = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelConsumption));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelConsumption, cmd.getInstantFuelConsumption()));
-			
-			JSONObject beltStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_BELT_STATUS);
-			VehicleDataResult referenceBeltStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(beltStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBeltStatus, cmd.getBeltStatus()));
-			
-			JSONObject bodyInformation = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_BODY_INFORMATION);
-			VehicleDataResult referenceBodyInformation = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(bodyInformation));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBodyInformation, cmd.getBodyInformation()));
-			
-			JSONObject deviceStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_DEVICE_STATUS);
-			VehicleDataResult referenceDeviceStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(deviceStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDeviceStatus, cmd.getDeviceStatus()));
-			
-			JSONObject driverBraking = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_DRIVER_BRAKING);
-			VehicleDataResult referenceDriverBraking = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(driverBraking));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDriverBraking, cmd.getDriverBraking()));
-			
-			JSONObject wiperStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_WIPER_STATUS);
-			VehicleDataResult referenceWiperStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(wiperStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWiperStatus, cmd.getWiperStatus()));
-			
-			JSONObject headLampStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS);
-			VehicleDataResult referenceHeadLampStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(headLampStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHeadLampStatus, cmd.getHeadLampStatus()));
-			
-			JSONObject accPedalPosition = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION);
-			VehicleDataResult referenceAccPedalPosition = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(accPedalPosition));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAccPedalPosition, cmd.getAccPedalPosition()));
-			
-			JSONObject steeringWheelAngle = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE);
-			VehicleDataResult referenceSteeringWheelAngle = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(steeringWheelAngle));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSteeringWheelAngle, cmd.getSteeringWheelAngle()));
-			
-			JSONObject eCallInfo = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_E_CALL_INFO);
-			VehicleDataResult referenceECallInfo = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eCallInfo));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceECallInfo, cmd.getECallInfo()));
-			
-			JSONObject airbagStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_AIRBAG_STATUS);
-			VehicleDataResult referenceAirbagStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(airbagStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAirbagStatus, cmd.getAirbagStatus()));
-			
-			JSONObject emergencyEvent = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT);
-			VehicleDataResult referenceEmergencyEvent = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(emergencyEvent));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEmergencyEvent, cmd.getEmergencyEvent()));
-			
-			JSONObject clusterModes = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_CLUSTER_MODES);
-			VehicleDataResult referenceClusterModes = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModes));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModes, cmd.getClusterModes()));
-			
-			JSONObject myKey = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_MY_KEY);
-			VehicleDataResult referenceMyKey = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(myKey));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceMyKey, cmd.getMyKey()));
-
-			JSONObject fuelRange = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_RANGE);
-			VehicleDataResult referenceFuelRange = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelRange));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelRange, cmd.getFuelRange()));
-
-			JSONObject turnSignal = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_TURN_SIGNAL);
-			VehicleDataResult referenceTurnSignal = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(turnSignal));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTurnSignal, cmd.getTurnSignal()));
-
-			JSONObject eBrakeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS);
-			VehicleDataResult referenceEBrakeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eBrakeStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEBrakeStatus, cmd.getElectronicParkBrakeStatus()));
-
-			JSONObject handsOffSteering = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING);
-			VehicleDataResult referenceHandsOffSteering = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(handsOffSteering));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHandsOffSteering, cmd.getHandsOffSteering()));
-
-			JSONObject gearStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_GEAR_STATUS);
-			VehicleDataResult referenceGearStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gearStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGearStatus, cmd.getGearStatus()));
-
-			JSONObject windowStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_WINDOW_STATUS);
-			VehicleDataResult referenceWindowStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(windowStatus));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWindowStatus, cmd.getWindowStatus()));
-
-			JSONObject oemCustomData = JsonUtils.readJsonObjectFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
-			VehicleDataResult referenceOemCustomData = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(oemCustomData));
-			assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOemCustomData, cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)));
-
-			JSONObject stabilityControlsStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS);
-			VehicleDataResult referenceStabilityControlStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(stabilityControlsStatus));
-			assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(referenceStabilityControlStatus, cmd.getStabilityControlsStatus()));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            UnsubscribeVehicleDataResponse cmd = new UnsubscribeVehicleDataResponse(hash);
+
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+
+            JSONObject parameters = JsonUtils.readJsonObjectFromJsonObject(body, RPCMessage.KEY_PARAMETERS);
+
+            JSONObject speed = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_SPEED);
+            VehicleDataResult referenceSpeed = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(speed));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSpeed, cmd.getSpeed()));
+
+            JSONObject rpm = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_RPM);
+            VehicleDataResult referenceRpm = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(rpm));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceRpm, cmd.getRpm()));
+
+            JSONObject fuelLevel = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_LEVEL);
+            VehicleDataResult referenceFuelLevel = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevel));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevel, cmd.getFuelLevel()));
+
+            JSONObject externalTemperature = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_EXTERNAL_TEMPERATURE);
+            VehicleDataResult referenceExternalTemperature = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(externalTemperature));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceExternalTemperature, cmd.getExternalTemperature()));
+
+            JSONObject prndl = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_PRNDL);
+            VehicleDataResult referencePrndl = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(prndl));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referencePrndl, cmd.getPrndl()));
+
+            JSONObject tirePressure = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_TIRE_PRESSURE);
+            VehicleDataResult referenceTirePressure = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(tirePressure));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTirePressure, cmd.getTirePressure()));
+
+            JSONObject engineTorque = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ENGINE_TORQUE);
+            VehicleDataResult referenceEngineTorque = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineTorque));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineTorque, cmd.getEngineTorque()));
+
+            JSONObject engineOilLife = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ENGINE_OIL_LIFE);
+            VehicleDataResult referenceEngineOilLife = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(engineOilLife));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEngineOilLife, cmd.getEngineOilLife()));
+
+            JSONObject odometer = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ODOMETER);
+            VehicleDataResult referenceOdometer = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(odometer));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOdometer, cmd.getOdometer()));
+
+            JSONObject gps = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_GPS);
+            VehicleDataResult referenceGps = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gps));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGps, cmd.getGps()));
+
+            JSONObject fuelLevelState = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_LEVEL_STATE);
+            VehicleDataResult referenceFuelLevelState = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelLevelState));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelLevelState, cmd.getFuelLevelState()));
+
+            JSONObject fuelConsumption = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_INSTANT_FUEL_CONSUMPTION);
+            VehicleDataResult referenceFuelConsumption = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelConsumption));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelConsumption, cmd.getInstantFuelConsumption()));
+
+            JSONObject beltStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_BELT_STATUS);
+            VehicleDataResult referenceBeltStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(beltStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBeltStatus, cmd.getBeltStatus()));
+
+            JSONObject bodyInformation = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_BODY_INFORMATION);
+            VehicleDataResult referenceBodyInformation = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(bodyInformation));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceBodyInformation, cmd.getBodyInformation()));
+
+            JSONObject deviceStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_DEVICE_STATUS);
+            VehicleDataResult referenceDeviceStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(deviceStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDeviceStatus, cmd.getDeviceStatus()));
+
+            JSONObject driverBraking = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_DRIVER_BRAKING);
+            VehicleDataResult referenceDriverBraking = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(driverBraking));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceDriverBraking, cmd.getDriverBraking()));
+
+            JSONObject wiperStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_WIPER_STATUS);
+            VehicleDataResult referenceWiperStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(wiperStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWiperStatus, cmd.getWiperStatus()));
+
+            JSONObject headLampStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_HEAD_LAMP_STATUS);
+            VehicleDataResult referenceHeadLampStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(headLampStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHeadLampStatus, cmd.getHeadLampStatus()));
+
+            JSONObject accPedalPosition = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ACC_PEDAL_POSITION);
+            VehicleDataResult referenceAccPedalPosition = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(accPedalPosition));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAccPedalPosition, cmd.getAccPedalPosition()));
+
+            JSONObject steeringWheelAngle = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_STEERING_WHEEL_ANGLE);
+            VehicleDataResult referenceSteeringWheelAngle = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(steeringWheelAngle));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceSteeringWheelAngle, cmd.getSteeringWheelAngle()));
+
+            JSONObject eCallInfo = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_E_CALL_INFO);
+            VehicleDataResult referenceECallInfo = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eCallInfo));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceECallInfo, cmd.getECallInfo()));
+
+            JSONObject airbagStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_AIRBAG_STATUS);
+            VehicleDataResult referenceAirbagStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(airbagStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceAirbagStatus, cmd.getAirbagStatus()));
+
+            JSONObject emergencyEvent = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT);
+            VehicleDataResult referenceEmergencyEvent = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(emergencyEvent));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEmergencyEvent, cmd.getEmergencyEvent()));
+
+            JSONObject clusterModes = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_CLUSTER_MODES);
+            VehicleDataResult referenceClusterModes = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModes));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModes, cmd.getClusterModes()));
+
+            JSONObject myKey = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_MY_KEY);
+            VehicleDataResult referenceMyKey = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(myKey));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceMyKey, cmd.getMyKey()));
+
+            JSONObject fuelRange = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_FUEL_RANGE);
+            VehicleDataResult referenceFuelRange = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(fuelRange));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceFuelRange, cmd.getFuelRange()));
+
+            JSONObject turnSignal = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_TURN_SIGNAL);
+            VehicleDataResult referenceTurnSignal = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(turnSignal));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceTurnSignal, cmd.getTurnSignal()));
+
+            JSONObject eBrakeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_ELECTRONIC_PARK_BRAKE_STATUS);
+            VehicleDataResult referenceEBrakeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(eBrakeStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEBrakeStatus, cmd.getElectronicParkBrakeStatus()));
+
+            JSONObject handsOffSteering = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_HANDS_OFF_STEERING);
+            VehicleDataResult referenceHandsOffSteering = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(handsOffSteering));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceHandsOffSteering, cmd.getHandsOffSteering()));
+
+            JSONObject gearStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_GEAR_STATUS);
+            VehicleDataResult referenceGearStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(gearStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceGearStatus, cmd.getGearStatus()));
+
+            JSONObject windowStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_WINDOW_STATUS);
+            VehicleDataResult referenceWindowStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(windowStatus));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceWindowStatus, cmd.getWindowStatus()));
+
+            JSONObject oemCustomData = JsonUtils.readJsonObjectFromJsonObject(parameters, TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME);
+            VehicleDataResult referenceOemCustomData = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(oemCustomData));
+            assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceOemCustomData, cmd.getOEMCustomVehicleData(TestValues.GENERAL_OEM_CUSTOM_VEHICLE_DATA_NAME)));
+
+            JSONObject stabilityControlsStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_STABILITY_CONTROLS_STATUS);
+            VehicleDataResult referenceStabilityControlStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(stabilityControlsStatus));
+            assertTrue(TestValues.TRUE, Validator.validateStabilityControlStatus(referenceStabilityControlStatus, cmd.getStabilityControlsStatus()));
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
     }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java
index 5cf058392..070a6e631 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java
@@ -25,24 +25,24 @@ import static junit.framework.TestCase.assertNotNull;
  * Created by austinkirk on 6/7/17.
  */
 
-public class UnsubscribeWayPointsResponseTests extends BaseRpcTests{
+public class UnsubscribeWayPointsResponseTests extends BaseRpcTests {
     @Override
-    protected RPCMessage createMessage(){
+    protected RPCMessage createMessage() {
         return new UnsubscribeWayPointsResponse();
     }
 
     @Override
-    protected String getMessageType(){
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
 
     @Override
-    protected String getCommandType(){
+    protected String getCommandType() {
         return FunctionID.UNSUBSCRIBE_WAY_POINTS.toString();
     }
 
     @Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
     }
 
@@ -50,7 +50,7 @@ public class UnsubscribeWayPointsResponseTests extends BaseRpcTests{
      * Tests the expected values of the RPC message.
      */
     @Test
-    public void testRpcValues () {
+    public void testRpcValues() {
         // Invalid/Null Tests
         UnsubscribeWayPointsResponse msg = new UnsubscribeWayPointsResponse();
         msg.setWayPoints(TestValues.GENERAL_LOCATIONDETAILS_LIST);
@@ -66,7 +66,7 @@ public class UnsubscribeWayPointsResponseTests extends BaseRpcTests{
      * Tests a valid JSON construction of this RPC message.
      */
     @Test
-    public void testJsonConstructor () {
+    public void testJsonConstructor() {
         JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
         assertNotNull(TestValues.NOT_NULL, commandJson);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
index 8280e56aa..e44a86419 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
@@ -20,61 +20,61 @@ import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.proxy.rpc.UpdateTurnListResponse}
  */
 public class UpdateTurnListResponseTests extends BaseRpcTests {
-	
-	@Override
-    protected RPCMessage createMessage(){
-		return new UpdateTurnListResponse();
-	}
-	
-	@Override
-    protected String getMessageType(){
+
+    @Override
+    protected RPCMessage createMessage() {
+        return new UpdateTurnListResponse();
+    }
+
+    @Override
+    protected String getMessageType() {
         return RPCMessage.KEY_RESPONSE;
     }
-	 
-	@Override
-    protected String getCommandType(){
+
+    @Override
+    protected String getCommandType() {
         return FunctionID.UPDATE_TURN_LIST.toString();
     }
-	
-	@Override
-    protected JSONObject getExpectedParameters(int sdlVersion){
+
+    @Override
+    protected JSONObject getExpectedParameters(int sdlVersion) {
         return new JSONObject();
-	}
-	
-	/**
-	 * Tests the expected values of the RPC message.
-	 */
-	@Test
-    public void testRpcValues () {   
-		// Invalid/Null Tests
-		UpdateTurnListResponse msg = new UpdateTurnListResponse();
-		assertNotNull(TestValues.NOT_NULL, msg);
-	    testNullBase(msg);
-	 }
-	 
+    }
+
     /**
-	 * Tests the expected values of the RPC message.
-	 */
+     * Tests the expected values of the RPC message.
+     */
     @Test
-	 public void testJsonConstructor () {
-		JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
-		assertNotNull(TestValues.NOT_NULL, commandJson);
-		
-		try {
-			Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
-			UpdateTurnListResponse cmd = new UpdateTurnListResponse(hash);
-			JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
-			assertNotNull(TestValues.NOT_NULL, body);
-			
-			// Test everything in the json body.
-			assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
-			assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	 }
+    public void testRpcValues() {
+        // Invalid/Null Tests
+        UpdateTurnListResponse msg = new UpdateTurnListResponse();
+        assertNotNull(TestValues.NOT_NULL, msg);
+        testNullBase(msg);
+    }
+
+    /**
+     * Tests the expected values of the RPC message.
+     */
+    @Test
+    public void testJsonConstructor() {
+        JSONObject commandJson = JsonFileReader.readId(getInstrumentation().getTargetContext(), getCommandType(), getMessageType());
+        assertNotNull(TestValues.NOT_NULL, commandJson);
+
+        try {
+            Hashtable<String, Object> hash = JsonRPCMarshaller.deserializeJSONObject(commandJson);
+            UpdateTurnListResponse cmd = new UpdateTurnListResponse(hash);
+            JSONObject body = JsonUtils.readJsonObjectFromJsonObject(commandJson, getMessageType());
+            assertNotNull(TestValues.NOT_NULL, body);
+
+            // Test everything in the json body.
+            assertEquals(TestValues.MATCH, JsonUtils.readStringFromJsonObject(body, RPCMessage.KEY_FUNCTION_NAME), cmd.getFunctionName());
+            assertEquals(TestValues.MATCH, JsonUtils.readIntegerFromJsonObject(body, RPCMessage.KEY_CORRELATION_ID), cmd.getCorrelationID());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
index f2648c7e2..4406ad800 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
@@ -2,9 +2,9 @@ package com.smartdevicelink.test.security;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.security.SdlSecurityBase;
+import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.test.TestValues;
 import com.smartdevicelink.test.streaming.MockInterfaceBroker;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
@@ -22,98 +22,98 @@ import static junit.framework.TestCase.assertNotNull;
 @RunWith(AndroidJUnit4.class)
 public class SdlSecurityBaseTest {
 
-	private class MockSdlSecurityBase extends SdlSecurityBase {
-
-		@Override
-		public void initialize() {
-			
-		}
-
-		@Override
-		public Integer runHandshake(byte[] inputData, byte[] outputData) {
-			return null;
-		}
-
-		@Override
-		public Integer encryptData(byte[] inputData, byte[] outputData) {
-			return null;
-		}
-
-		@Override
-		public Integer decryptData(byte[] inputData, byte[] outputData) {
-			return null;
-		}
-
-		@Override
-		public void shutDown() {
-			
-		}
-		
-	    public SdlSession getSdlSession() {
-	    	return session;
-	    }
-	    
-	    public void setStartServiceList(List<SessionType> list) {
-	    	startServiceList = list;
-	    }
-	}
-
-	@Test
-	public void testMakeListSetAndGet(){
-		List<String> makeList = new ArrayList<String>();
-		MockSdlSecurityBase mockSdlSecurityBase = new MockSdlSecurityBase();
-		
-		String MAKE_1 = "SDL1";
-		String MAKE_2 = "SDL2";
-    	makeList.add(MAKE_1);
-    	makeList.add(MAKE_2);
-
-    	mockSdlSecurityBase.setMakeList(makeList);
-    	
-    	assertNotNull(TestValues.NOT_NULL, makeList);
-    	assertEquals(TestValues.MATCH, makeList, mockSdlSecurityBase.getMakeList());
-	}
-
-	@Test
-	public void testHandleInitResult() {
-		byte testWiproVersion = (byte) 0x0B;
-		boolean testInitResult = true;
-		MockInterfaceBroker interfaceBroker = new MockInterfaceBroker();
-		MultiplexTransportConfig transportConfig = new MultiplexTransportConfig(getInstrumentation().getTargetContext(),"19216801");
-		MockSdlSecurityBase mockSdlSecurityBase = new MockSdlSecurityBase();
-		
-		SdlSession testSdlSession = new SdlSession(interfaceBroker, transportConfig);
-
-		assertNotNull(TestValues.NOT_NULL, mockSdlSecurityBase);
-		assertNotNull(TestValues.NOT_NULL, testSdlSession);
-		
-		testSdlSession.setSdlSecurity(mockSdlSecurityBase);
-
-		mockSdlSecurityBase.handleSdlSession(testSdlSession);
-		
-		assertEquals(TestValues.MATCH, mockSdlSecurityBase.getSdlSession(), testSdlSession);
-		assertEquals(TestValues.MATCH, mockSdlSecurityBase.getSdlSession().getSessionId(), testSdlSession.getSessionId());
-		
-		mockSdlSecurityBase.handleInitResult(testInitResult);
-		
-		assertEquals(TestValues.MATCH, testInitResult, mockSdlSecurityBase.getInitSuccess());
-	}
-
-	@Test
-	public void testStartServiceListSetAndGet() {
-		List<SessionType> startServiceList = new ArrayList<SessionType>();
-		MockSdlSecurityBase mockSdlSecurityBase = new MockSdlSecurityBase();
-		
-		startServiceList.add(SessionType.RPC);
-		startServiceList.add(SessionType.NAV);
-		startServiceList.add(SessionType.PCM);
-		startServiceList.add(SessionType.CONTROL);
-
-    	assertNotNull(TestValues.NOT_NULL, startServiceList);
-    	
-    	mockSdlSecurityBase.setStartServiceList(startServiceList);
-    	
-    	assertEquals(TestValues.MATCH, startServiceList, mockSdlSecurityBase.getServiceList());
-	}
+    private class MockSdlSecurityBase extends SdlSecurityBase {
+
+        @Override
+        public void initialize() {
+
+        }
+
+        @Override
+        public Integer runHandshake(byte[] inputData, byte[] outputData) {
+            return null;
+        }
+
+        @Override
+        public Integer encryptData(byte[] inputData, byte[] outputData) {
+            return null;
+        }
+
+        @Override
+        public Integer decryptData(byte[] inputData, byte[] outputData) {
+            return null;
+        }
+
+        @Override
+        public void shutDown() {
+
+        }
+
+        public SdlSession getSdlSession() {
+            return session;
+        }
+
+        public void setStartServiceList(List<SessionType> list) {
+            startServiceList = list;
+        }
+    }
+
+    @Test
+    public void testMakeListSetAndGet() {
+        List<String> makeList = new ArrayList<String>();
+        MockSdlSecurityBase mockSdlSecurityBase = new MockSdlSecurityBase();
+
+        String MAKE_1 = "SDL1";
+        String MAKE_2 = "SDL2";
+        makeList.add(MAKE_1);
+        makeList.add(MAKE_2);
+
+        mockSdlSecurityBase.setMakeList(makeList);
+
+        assertNotNull(TestValues.NOT_NULL, makeList);
+        assertEquals(TestValues.MATCH, makeList, mockSdlSecurityBase.getMakeList());
+    }
+
+    @Test
+    public void testHandleInitResult() {
+        byte testWiproVersion = (byte) 0x0B;
+        boolean testInitResult = true;
+        MockInterfaceBroker interfaceBroker = new MockInterfaceBroker();
+        MultiplexTransportConfig transportConfig = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "19216801");
+        MockSdlSecurityBase mockSdlSecurityBase = new MockSdlSecurityBase();
+
+        SdlSession testSdlSession = new SdlSession(interfaceBroker, transportConfig);
+
+        assertNotNull(TestValues.NOT_NULL, mockSdlSecurityBase);
+        assertNotNull(TestValues.NOT_NULL, testSdlSession);
+
+        testSdlSession.setSdlSecurity(mockSdlSecurityBase);
+
+        mockSdlSecurityBase.handleSdlSession(testSdlSession);
+
+        assertEquals(TestValues.MATCH, mockSdlSecurityBase.getSdlSession(), testSdlSession);
+        assertEquals(TestValues.MATCH, mockSdlSecurityBase.getSdlSession().getSessionId(), testSdlSession.getSessionId());
+
+        mockSdlSecurityBase.handleInitResult(testInitResult);
+
+        assertEquals(TestValues.MATCH, testInitResult, mockSdlSecurityBase.getInitSuccess());
+    }
+
+    @Test
+    public void testStartServiceListSetAndGet() {
+        List<SessionType> startServiceList = new ArrayList<SessionType>();
+        MockSdlSecurityBase mockSdlSecurityBase = new MockSdlSecurityBase();
+
+        startServiceList.add(SessionType.RPC);
+        startServiceList.add(SessionType.NAV);
+        startServiceList.add(SessionType.PCM);
+        startServiceList.add(SessionType.CONTROL);
+
+        assertNotNull(TestValues.NOT_NULL, startServiceList);
+
+        mockSdlSecurityBase.setStartServiceList(startServiceList);
+
+        assertEquals(TestValues.MATCH, startServiceList, mockSdlSecurityBase.getServiceList());
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
index dbec1301e..7fde73e3b 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
@@ -1,8 +1,8 @@
 package com.smartdevicelink.test.streaming;
 
-import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.RPCRequest;
+import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.streaming.IStreamListener;
 import com.smartdevicelink.test.TestValues;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
@@ -18,52 +18,52 @@ import java.io.InputStream;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.streaming.AbstractPacketizer}
  */
 public class AbstractPacketizerTests extends TestCase {
-		
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.streaming.AbstractPacketizer#AbstractPacketizer(IStreamListener, InputStream, RPCRequest, SessionType, byte, Version, SdlSession)} 
-	 * {@link com.smartdevicelink.streaming.AbstractPacketizer#AbstractPacketizer(IStreamListener, InputStream, RPCRequest, SessionType, byte, Version, SdlSession)}
-	 */
-	public void testConstructors () {
-		
-		// Test Values
-		byte            testSessionId    = (byte) 0x0A;
-		SessionType     testSessionType  = SessionType.RPC;
-		SdlSession      testSdlSession  = null;
-		InputStream     testInputStream  = null;
-		MockPacketizer  testPacketizer1  = null;
-		MockPacketizer  testPacketizer2  = null;
-		IStreamListener testListener     = new MockStreamListener();
-		try {
-			testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
-			MockInterfaceBroker interfaceBroker = new MockInterfaceBroker();
-			MultiplexTransportConfig transportConfig = new MultiplexTransportConfig(getInstrumentation().getTargetContext(),"19216801");
-			testSdlSession = new SdlSession(interfaceBroker, transportConfig);
-			testPacketizer1 = new MockPacketizer(testListener, testInputStream, testSessionType, testSessionId, testSdlSession);
-			testPacketizer2 = new MockPacketizer(null, null, null, testSessionId, testSdlSession);
 
-			// Valid Tests
-			assertNotNull(TestValues.NOT_NULL, testPacketizer1);
-			assertNotNull(TestValues.NOT_NULL, testPacketizer2);
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.streaming.AbstractPacketizer#AbstractPacketizer(IStreamListener, InputStream, RPCRequest, SessionType, byte, Version, SdlSession)}
+     * {@link com.smartdevicelink.streaming.AbstractPacketizer#AbstractPacketizer(IStreamListener, InputStream, RPCRequest, SessionType, byte, Version, SdlSession)}
+     */
+    public void testConstructors() {
+
+        // Test Values
+        byte testSessionId = (byte) 0x0A;
+        SessionType testSessionType = SessionType.RPC;
+        SdlSession testSdlSession = null;
+        InputStream testInputStream = null;
+        MockPacketizer testPacketizer1 = null;
+        MockPacketizer testPacketizer2 = null;
+        IStreamListener testListener = new MockStreamListener();
+        try {
+            testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
+            MockInterfaceBroker interfaceBroker = new MockInterfaceBroker();
+            MultiplexTransportConfig transportConfig = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "19216801");
+            testSdlSession = new SdlSession(interfaceBroker, transportConfig);
+            testPacketizer1 = new MockPacketizer(testListener, testInputStream, testSessionType, testSessionId, testSdlSession);
+            testPacketizer2 = new MockPacketizer(null, null, null, testSessionId, testSdlSession);
+
+            // Valid Tests
+            assertNotNull(TestValues.NOT_NULL, testPacketizer1);
+            assertNotNull(TestValues.NOT_NULL, testPacketizer2);
+
+            assertEquals(TestValues.MATCH, testListener, testPacketizer1.getListener());
+            assertEquals(TestValues.MATCH, testInputStream, testPacketizer1.getInputStream());
+            assertEquals(TestValues.MATCH, testSessionType, testPacketizer1.getSessionType());
+            assertEquals(TestValues.MATCH, testSessionId, testPacketizer1.getSessionId());
+
+            // Invalid/Null Tests
+            assertNull(TestValues.NULL, testPacketizer2.getListener());
+            assertNull(TestValues.NULL, testPacketizer2.getInputStream());
+            assertNull(TestValues.NULL, testPacketizer2.getSessionType());
 
-			assertEquals(TestValues.MATCH, testListener, testPacketizer1.getListener());
-			assertEquals(TestValues.MATCH, testInputStream, testPacketizer1.getInputStream());
-			assertEquals(TestValues.MATCH, testSessionType, testPacketizer1.getSessionType());
-			assertEquals(TestValues.MATCH, testSessionId, testPacketizer1.getSessionId());
-						
-			// Invalid/Null Tests
-			assertNull(TestValues.NULL, testPacketizer2.getListener());
-			assertNull(TestValues.NULL, testPacketizer2.getInputStream());
-			assertNull(TestValues.NULL, testPacketizer2.getSessionType());
-			
-		} catch (IOException e) {
-			e.printStackTrace();
-			fail("IOException was thrown.");
-		}
-	}
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail("IOException was thrown.");
+        }
+    }
 }
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java
index 14905fa7d..364e6c976 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockInterfaceBroker.java
@@ -1,7 +1,7 @@
 package com.smartdevicelink.test.streaming;
 
-import com.smartdevicelink.session.ISdlSessionListener;
 import com.smartdevicelink.proxy.RPCMessage;
+import com.smartdevicelink.session.ISdlSessionListener;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.util.Version;
 
@@ -10,30 +10,31 @@ import com.smartdevicelink.util.Version;
  * {@link com.smartdevicelink.streaming.AbstractPacketizer}
  */
 public class MockInterfaceBroker implements ISdlSessionListener {
-	public MockInterfaceBroker () { }
+    public MockInterfaceBroker() {
+    }
 
-	@Override
-	public void onTransportDisconnected(String info, boolean availablePrimary, BaseTransportConfig transportConfig) {
+    @Override
+    public void onTransportDisconnected(String info, boolean availablePrimary, BaseTransportConfig transportConfig) {
 
-	}
+    }
 
-	@Override
-	public void onRPCMessageReceived(RPCMessage rpcMessage) {
+    @Override
+    public void onRPCMessageReceived(RPCMessage rpcMessage) {
 
-	}
+    }
 
-	@Override
-	public void onSessionStarted(int sessionID, Version version) {
+    @Override
+    public void onSessionStarted(int sessionID, Version version) {
 
-	}
+    }
 
-	@Override
-	public void onSessionEnded(int sessionID) {
+    @Override
+    public void onSessionEnded(int sessionID) {
 
-	}
+    }
 
-	@Override
-	public void onAuthTokenReceived(String authToken, int sessionID) {
+    @Override
+    public void onAuthTokenReceived(String authToken, int sessionID) {
 
-	}
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
index 77eae6cba..bad0f688c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
@@ -1,7 +1,7 @@
 package com.smartdevicelink.test.streaming;
 
-import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.protocol.enums.SessionType;
+import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.streaming.AbstractPacketizer;
 import com.smartdevicelink.streaming.IStreamListener;
 
@@ -13,16 +13,39 @@ import java.io.InputStream;
  * {@link com.smartdevicelink.streaming.AbstractPacketizer}
  */
 public class MockPacketizer extends AbstractPacketizer {
-	public MockPacketizer (IStreamListener l, InputStream i, SessionType s, byte sid, SdlSession sdlsession) throws IOException { super (l, i, s, sid, sdlsession); }
+    public MockPacketizer(IStreamListener l, InputStream i, SessionType s, byte sid, SdlSession sdlsession) throws IOException {
+        super(l, i, s, sid, sdlsession);
+    }
+
+    @Override
+    public void start() throws IOException {
+    }
+
+    @Override
+    public void stop() {
+    }
+
+    public IStreamListener getListener() {
+        return _streamListener;
+    }
+
+    public InputStream getInputStream() {
+        return is;
+    }
+
+    public SessionType getSessionType() {
+        return _serviceType;
+    }
 
-	@Override public void start() throws IOException { }
-	@Override public void stop() { }
+    public byte getSessionId() {
+        return _rpcSessionID;
+    }
 
-	public IStreamListener getListener () { return _streamListener; }
-	public InputStream getInputStream  () { return is;              }
-	public SessionType getSessionType  () { return _serviceType;    }
-	public byte getSessionId           () { return _rpcSessionID;   }
+    @Override
+    public void pause() {
+    }
 
-	@Override public void pause() { }
-	@Override public void resume() { }
+    @Override
+    public void resume() {
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockStreamListener.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockStreamListener.java
index 0081c65ea..8bd0d70d5 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockStreamListener.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockStreamListener.java
@@ -8,6 +8,10 @@ import com.smartdevicelink.streaming.IStreamListener;
  * {@link com.smartdevicelink.streaming.AbstractPacketizer}
  */
 public class MockStreamListener implements IStreamListener {
-	public MockStreamListener () { }
-	@Override public void sendStreamPacket(ProtocolMessage pm) { }
+    public MockStreamListener() {
+    }
+
+    @Override
+    public void sendStreamPacket(ProtocolMessage pm) {
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
index d6d2083af..ededb3e03 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
@@ -1,11 +1,11 @@
 package com.smartdevicelink.test.streaming;
 
-import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.protocol.ProtocolMessage;
 import com.smartdevicelink.protocol.enums.SessionType;
-import com.smartdevicelink.streaming.video.IVideoStreamListener;
+import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.streaming.IStreamListener;
 import com.smartdevicelink.streaming.StreamPacketizer;
+import com.smartdevicelink.streaming.video.IVideoStreamListener;
 import com.smartdevicelink.test.TestValues;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
 
@@ -22,482 +22,490 @@ import java.util.Arrays;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.streaming.StreamPacketizer}
  */
 public class StreamPacketizerTests extends TestCase {
 
-	private static final byte WIPRO_VERSION = 0x0B;
-	private static final byte SESSION_ID = 0x0A;
-
-	private final byte[][] SAMPLE_H264_VIDEO_STREAM = {
-			// one byte array represents a frame
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x67, 0x42, (byte)0xC0, 0x0A, (byte)0xA6, 0x11, 0x11, (byte)0xE8,
-					0x40, 0x00, 0x00, (byte)0xFA, 0x40, 0x00, 0x3A, (byte)0x98,
-					0x23, (byte)0xC4, (byte)0x89, (byte)0x84, 0x60,
-					0x00, 0x00, 0x00, 0x01,
-					0x68, (byte)0xC8, 0x42, 0x0F, 0x13, 0x20,
-					0x00, 0x00, 0x01,
-					0x65, (byte)0x88, (byte)0x82, 0x07, 0x67, 0x39, 0x31, 0x40,
-					0x00, 0x5E, 0x0A, (byte)0xFB, (byte)0xEF, (byte)0xAE, (byte)0xBA, (byte)0xEB,
-					(byte)0xAE, (byte)0xBA, (byte)0xEB, (byte)0xC0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, 0x1C, 0x0E, (byte)0xCE, 0x71, (byte)0xB0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, 0x2A, 0x03, (byte)0xB3, (byte)0x9C, 0x6C},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, 0x3B, 0x03, (byte)0xB3, (byte)0x9C, 0x6C},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, 0x49, 0x00, (byte)0xEC, (byte)0xE7, 0x1B},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, 0x59, 0x40, (byte)0xEC, (byte)0xE7, 0x1B},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, 0x69, (byte)0x80, (byte)0xEC, (byte)0xE7, 0x1B},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, 0x79, (byte)0xC0, (byte)0xEC, (byte)0xE7, 0x1B},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, (byte)0x88, (byte)0x80, 0x3B, 0x39, (byte)0xC6, (byte)0xC0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, (byte)0x98, (byte)0x90, 0x3B, 0x39, (byte)0xC6, (byte)0xC0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, (byte)0xA8, (byte)0xA0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, (byte)0xB8, (byte)0xB0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, (byte)0xC8, (byte)0xC0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, (byte)0xD8, (byte)0xD0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, (byte)0xE8, (byte)0xE0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, (byte)0xF8, (byte)0xF0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, 0x00, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, 0x10, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, 0x20, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, 0x30, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, 0x40, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, 0x50, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, 0x60, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, 0x70, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, (byte)0x80, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, (byte)0x90, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, (byte)0xA0, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, (byte)0xB0, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, (byte)0xC0, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9B, (byte)0xD0, 0x1D, (byte)0x9C, (byte)0xE3, 0x60},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x67, 0x42, (byte)0xC0, 0x0A, (byte)0xA6, 0x11, 0x11, (byte)0xE8,
-					0x40, 0x00, 0x00, (byte)0xFA, 0x40, 0x00, 0x3A, (byte)0x98,
-					0x23, (byte)0xC4, (byte)0x89, (byte)0x84, 0x60,
-					0x00, 0x00, 0x00, 0x01,
-					0x68, (byte)0xC8, 0x42, 0x0F, 0x13, 0x20,
-					0x00, 0x00, 0x01,
-					0x65, (byte)0x88, (byte)0x81, 0x00, (byte)0x8E, 0x73, (byte)0x93, 0x14,
-					0x00, 0x06, (byte)0xA4, 0x2F, (byte)0xBE, (byte)0xFA, (byte)0xEB, (byte)0xAE,
-					(byte)0xBA, (byte)0xEB, (byte)0xAE, (byte)0xBC},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, 0x1C, 0x0D, (byte)0xCE, 0x71, (byte)0xB0},
-			new byte[]{0x00, 0x00, 0x00, 0x01,
-					0x41, (byte)0x9A, 0x2A, 0x03, 0x33, (byte)0x9C, 0x6C},
-	};
-
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.streaming.StreamPacketizer#StreamPacketizer(IStreamListener, InputStream, SessionType, byte, SdlSession)}
-	 */
-	public void testConstructor () {
-		
-		// Test Values
-		byte            testSessionId   = (byte) 0x0A;
-		SessionType     testSessionType = SessionType.RPC;
-		InputStream     testInputStream = null;
-		byte            testWiproVersion = (byte) 0x0B;
-		IStreamListener testListener    = new MockStreamListener();
-		MockInterfaceBroker interfaceBroker = new MockInterfaceBroker();
-		MultiplexTransportConfig transportConfig = new MultiplexTransportConfig(getInstrumentation().getTargetContext(),"19216801");
-		SdlSession testSdlSession = new SdlSession(interfaceBroker, transportConfig);
-		try {
-			testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
-			StreamPacketizer testStreamPacketizer = new StreamPacketizer(testListener, testInputStream, testSessionType, testSessionId, testSdlSession);
-			assertNotNull(TestValues.NOT_NULL, testStreamPacketizer);
-						
-			// NOTE: Cannot test thread handling methods currently.
-			
-		} catch (IOException e) {
-			fail("IOException was thrown.");
-		}
-	}
-
-	/**
-	 * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendFrame(byte[], int, int, long)}
-	 */
-	public void testSendFrameInterfaceWithArray() {
-		StreamReceiver mockReceiver = new StreamReceiver();
-		SdlSession session = createTestSession();
-		StreamPacketizer packetizer = null;
-		try {
-			packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithArray(SAMPLE_H264_VIDEO_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertTrue(mockReceiver.verify(SAMPLE_H264_VIDEO_STREAM));
-	}
-
-	/**
-	 * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendFrame(byte[], int, int, long)}
-	 * with offset parameter
-	 */
-	public void testSendFrameInterfaceWithArrayOffset() {
-		StreamReceiver mockReceiver = new StreamReceiver();
-		SdlSession session = createTestSession();
-		StreamPacketizer packetizer = null;
-		try {
-			packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithArrayOffset(SAMPLE_H264_VIDEO_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertTrue(mockReceiver.verify(SAMPLE_H264_VIDEO_STREAM));
-	}
-
-	/**
-	 * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendFrame(ByteBuffer, long)}
-	 */
-	public void testSendFrameInterfaceWithByteBuffer() {
-		StreamReceiver mockReceiver = new StreamReceiver();
-		SdlSession session = createTestSession();
-		StreamPacketizer packetizer = null;
-		try {
-			packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithByteBuffer(SAMPLE_H264_VIDEO_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertTrue(mockReceiver.verify(SAMPLE_H264_VIDEO_STREAM));
-	}
-
-	/**
-	 * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendFrame(ByteBuffer, long)}
-	 * with direct ByteBuffer
-	 */
-	public void testSendFrameInterfaceWithDirectByteBuffer() {
-		StreamReceiver mockReceiver = new StreamReceiver();
-		SdlSession session = createTestSession();
-		StreamPacketizer packetizer = null;
-		try {
-			packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithDirectByteBuffer(SAMPLE_H264_VIDEO_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertTrue(mockReceiver.verify(SAMPLE_H264_VIDEO_STREAM));
-	}
-
-	/**
-	 * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendAudio(byte[], int, int, long)}
-	 */
-	public void testSendAudioInterfaceWithArray() {
-		// assume 100 data of 16kHz / 16bits audio for 10 msecs
-		int dataCount = 100;
-		byte[][] sampleAudio = new byte[dataCount][];
-		for (int i = 0; i < dataCount; i++) {
-			sampleAudio[i] = new byte[4 * 160];
-			Arrays.fill(sampleAudio[i], (byte)0);
-		}
-
-		StreamReceiver mockReceiver = new StreamReceiver();
-		SdlSession session = createTestSession();
-		StreamPacketizer packetizer = null;
-		try {
-			packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithArray(sampleAudio);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertTrue(mockReceiver.verify(sampleAudio));
-	}
-
-	/**
-	 * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendAudio(byte[], int, int, long)}
-	 */
-	public void testSendAudioInterfaceWithArrayOffset() {
-		// assume 100 data of 16kHz / 16bits audio for 10 msecs
-		int dataCount = 100;
-		byte[][] sampleAudio = new byte[dataCount][];
-		for (int i = 0; i < dataCount; i++) {
-			sampleAudio[i] = new byte[4 * 160];
-			Arrays.fill(sampleAudio[i], (byte)0);
-		}
-
-		StreamReceiver mockReceiver = new StreamReceiver();
-		SdlSession session = createTestSession();
-		StreamPacketizer packetizer = null;
-		try {
-			packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithArrayOffset(sampleAudio);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertTrue(mockReceiver.verify(sampleAudio));
-	}
-
-	public void testSendAudioInterfaceWithByteBuffer() {
-		// assume 100 data of 16kHz / 16bits audio for 10 msecs
-		int dataCount = 100;
-		byte[][] sampleAudio = new byte[dataCount][];
-		for (int i = 0; i < dataCount; i++) {
-			sampleAudio[i] = new byte[4 * 160];
-			Arrays.fill(sampleAudio[i], (byte)0);
-		}
-
-		StreamReceiver mockReceiver = new StreamReceiver();
-		SdlSession session = createTestSession();
-		StreamPacketizer packetizer = null;
-		try {
-			packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithByteBuffer(sampleAudio);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertTrue(mockReceiver.verify(sampleAudio));
-	}
-
-	public void testSendAudioInterfaceWithDirectByteBuffer() {
-		// assume 100 data of 16kHz / 16bits audio for 10 msecs
-		int dataCount = 100;
-		byte[][] sampleAudio = new byte[dataCount][];
-		for (int i = 0; i < dataCount; i++) {
-			sampleAudio[i] = new byte[4 * 160];
-			Arrays.fill(sampleAudio[i], (byte)0);
-		}
-
-		StreamReceiver mockReceiver = new StreamReceiver();
-		SdlSession session = createTestSession();
-		StreamPacketizer packetizer = null;
-		try {
-			packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithDirectByteBuffer(sampleAudio);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertTrue(mockReceiver.verify(sampleAudio));
-	}
-
-
-	private SdlSession createTestSession() {
-		return new SdlSession(new MockInterfaceBroker(),  new MultiplexTransportConfig(getInstrumentation().getTargetContext(),"19216801"));
-	}
-
-	private class StreamReceiver implements IStreamListener {
-		private ByteArrayOutputStream mReceiveBuffer;
-
-		StreamReceiver() {
-			mReceiveBuffer = new ByteArrayOutputStream();
-		}
-
-		@Override
-		public void sendStreamPacket(ProtocolMessage pm) {
-			try {
-				mReceiveBuffer.write(pm.getData());
-			} catch (IOException e) {
-				fail();
-			}
-		}
-
-		boolean verify(byte[][] expectedStream) {
-			ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-			for (byte[] frame : expectedStream) {
-				try {
-					buffer.write(frame);
-				} catch (IOException e) {
-					fail();
-				}
-			}
-			boolean result = Arrays.equals(buffer.toByteArray(), mReceiveBuffer.toByteArray());
-			try {
-				buffer.close();
-			} catch (IOException e) {
-				fail();
-			}
-			return result;
-		}
-	}
-
-	private class MockVideoApp {
-		private IVideoStreamListener mListener;
-
-		MockVideoApp(IVideoStreamListener listener) {
-			mListener = listener;
-		}
-
-		void inputByteStreamWithArray(byte[][] stream) {
-			for (byte[] data : stream) {
-				mListener.sendFrame(data, 0, data.length, -1);
-			}
-		}
-
-		void inputByteStreamWithArrayOffset(byte[][] stream) {
-			int dummyOffset = 0;
-			for (byte[] data : stream) {
-				// to test 'offset' param, create a buffer with a dummy offset
-				byte[] buffer = new byte[dummyOffset + data.length];
-				System.arraycopy(data, 0, buffer, dummyOffset, data.length);
-
-				mListener.sendFrame(buffer, dummyOffset, data.length, -1);
-				dummyOffset++;
-			}
-		}
-
-		void inputByteStreamWithByteBuffer(byte[][] stream) {
-			int dummyOffset = 0;
-			for (byte[] data : stream) {
-				// add a dummy offset inside byteBuffer for testing
-				ByteBuffer byteBuffer = ByteBuffer.allocate(dummyOffset + data.length);
-				byteBuffer.position(dummyOffset);
-
-				byteBuffer.put(data);
-				byteBuffer.flip();
-				byteBuffer.position(dummyOffset);
-
-				mListener.sendFrame(byteBuffer, -1);
-				dummyOffset++;
-			}
-		}
-
-		void inputByteStreamWithDirectByteBuffer(byte[][] stream) {
-			int dummyOffset = 0;
-			for (byte[] data : stream) {
-				// add a dummy offset inside byteBuffer for testing
-				ByteBuffer byteBuffer = ByteBuffer.allocateDirect(dummyOffset + data.length);
-				byteBuffer.position(dummyOffset);
-
-				byteBuffer.put(data);
-				byteBuffer.flip();
-				byteBuffer.position(dummyOffset);
-
-				mListener.sendFrame(byteBuffer, -1);
-				dummyOffset++;
-			}
-		}
-	}
+    private static final byte WIPRO_VERSION = 0x0B;
+    private static final byte SESSION_ID = 0x0A;
+
+    private final byte[][] SAMPLE_H264_VIDEO_STREAM = {
+            // one byte array represents a frame
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x67, 0x42, (byte) 0xC0, 0x0A, (byte) 0xA6, 0x11, 0x11, (byte) 0xE8,
+                    0x40, 0x00, 0x00, (byte) 0xFA, 0x40, 0x00, 0x3A, (byte) 0x98,
+                    0x23, (byte) 0xC4, (byte) 0x89, (byte) 0x84, 0x60,
+                    0x00, 0x00, 0x00, 0x01,
+                    0x68, (byte) 0xC8, 0x42, 0x0F, 0x13, 0x20,
+                    0x00, 0x00, 0x01,
+                    0x65, (byte) 0x88, (byte) 0x82, 0x07, 0x67, 0x39, 0x31, 0x40,
+                    0x00, 0x5E, 0x0A, (byte) 0xFB, (byte) 0xEF, (byte) 0xAE, (byte) 0xBA, (byte) 0xEB,
+                    (byte) 0xAE, (byte) 0xBA, (byte) 0xEB, (byte) 0xC0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, 0x1C, 0x0E, (byte) 0xCE, 0x71, (byte) 0xB0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, 0x2A, 0x03, (byte) 0xB3, (byte) 0x9C, 0x6C},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, 0x3B, 0x03, (byte) 0xB3, (byte) 0x9C, 0x6C},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, 0x49, 0x00, (byte) 0xEC, (byte) 0xE7, 0x1B},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, 0x59, 0x40, (byte) 0xEC, (byte) 0xE7, 0x1B},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, 0x69, (byte) 0x80, (byte) 0xEC, (byte) 0xE7, 0x1B},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, 0x79, (byte) 0xC0, (byte) 0xEC, (byte) 0xE7, 0x1B},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, (byte) 0x88, (byte) 0x80, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, (byte) 0x98, (byte) 0x90, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, (byte) 0xA8, (byte) 0xA0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, (byte) 0xB8, (byte) 0xB0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, (byte) 0xC8, (byte) 0xC0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, (byte) 0xD8, (byte) 0xD0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, (byte) 0xE8, (byte) 0xE0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, (byte) 0xF8, (byte) 0xF0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, 0x00, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, 0x10, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, 0x20, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, 0x30, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, 0x40, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, 0x50, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, 0x60, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, 0x70, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, (byte) 0x80, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, (byte) 0x90, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, (byte) 0xA0, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, (byte) 0xB0, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, (byte) 0xC0, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9B, (byte) 0xD0, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x67, 0x42, (byte) 0xC0, 0x0A, (byte) 0xA6, 0x11, 0x11, (byte) 0xE8,
+                    0x40, 0x00, 0x00, (byte) 0xFA, 0x40, 0x00, 0x3A, (byte) 0x98,
+                    0x23, (byte) 0xC4, (byte) 0x89, (byte) 0x84, 0x60,
+                    0x00, 0x00, 0x00, 0x01,
+                    0x68, (byte) 0xC8, 0x42, 0x0F, 0x13, 0x20,
+                    0x00, 0x00, 0x01,
+                    0x65, (byte) 0x88, (byte) 0x81, 0x00, (byte) 0x8E, 0x73, (byte) 0x93, 0x14,
+                    0x00, 0x06, (byte) 0xA4, 0x2F, (byte) 0xBE, (byte) 0xFA, (byte) 0xEB, (byte) 0xAE,
+                    (byte) 0xBA, (byte) 0xEB, (byte) 0xAE, (byte) 0xBC},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, 0x1C, 0x0D, (byte) 0xCE, 0x71, (byte) 0xB0},
+            new byte[]{0x00, 0x00, 0x00, 0x01,
+                    0x41, (byte) 0x9A, 0x2A, 0x03, 0x33, (byte) 0x9C, 0x6C},
+    };
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.streaming.StreamPacketizer#StreamPacketizer(IStreamListener, InputStream, SessionType, byte, SdlSession)}
+     */
+    public void testConstructor() {
+
+        // Test Values
+        byte testSessionId = (byte) 0x0A;
+        SessionType testSessionType = SessionType.RPC;
+        InputStream testInputStream = null;
+        byte testWiproVersion = (byte) 0x0B;
+        IStreamListener testListener = new MockStreamListener();
+        MockInterfaceBroker interfaceBroker = new MockInterfaceBroker();
+        MultiplexTransportConfig transportConfig = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "19216801");
+        SdlSession testSdlSession = new SdlSession(interfaceBroker, transportConfig);
+        try {
+            testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
+            StreamPacketizer testStreamPacketizer = new StreamPacketizer(testListener, testInputStream, testSessionType, testSessionId, testSdlSession);
+            assertNotNull(TestValues.NOT_NULL, testStreamPacketizer);
+
+            // NOTE: Cannot test thread handling methods currently.
+
+        } catch (IOException e) {
+            fail("IOException was thrown.");
+        }
+    }
+
+    /**
+     * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendFrame(byte[], int, int, long)}
+     */
+    public void testSendFrameInterfaceWithArray() {
+        StreamReceiver mockReceiver = new StreamReceiver();
+        SdlSession session = createTestSession();
+        StreamPacketizer packetizer = null;
+        try {
+            packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithArray(SAMPLE_H264_VIDEO_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertTrue(mockReceiver.verify(SAMPLE_H264_VIDEO_STREAM));
+    }
+
+    /**
+     * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendFrame(byte[], int, int, long)}
+     * with offset parameter
+     */
+    public void testSendFrameInterfaceWithArrayOffset() {
+        StreamReceiver mockReceiver = new StreamReceiver();
+        SdlSession session = createTestSession();
+        StreamPacketizer packetizer = null;
+        try {
+            packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithArrayOffset(SAMPLE_H264_VIDEO_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertTrue(mockReceiver.verify(SAMPLE_H264_VIDEO_STREAM));
+    }
+
+    /**
+     * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendFrame(ByteBuffer, long)}
+     */
+    public void testSendFrameInterfaceWithByteBuffer() {
+        StreamReceiver mockReceiver = new StreamReceiver();
+        SdlSession session = createTestSession();
+        StreamPacketizer packetizer = null;
+        try {
+            packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithByteBuffer(SAMPLE_H264_VIDEO_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertTrue(mockReceiver.verify(SAMPLE_H264_VIDEO_STREAM));
+    }
+
+    /**
+     * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendFrame(ByteBuffer, long)}
+     * with direct ByteBuffer
+     */
+    public void testSendFrameInterfaceWithDirectByteBuffer() {
+        StreamReceiver mockReceiver = new StreamReceiver();
+        SdlSession session = createTestSession();
+        StreamPacketizer packetizer = null;
+        try {
+            packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithDirectByteBuffer(SAMPLE_H264_VIDEO_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertTrue(mockReceiver.verify(SAMPLE_H264_VIDEO_STREAM));
+    }
+
+    /**
+     * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendAudio(byte[], int, int, long)}
+     */
+    public void testSendAudioInterfaceWithArray() {
+        // assume 100 data of 16kHz / 16bits audio for 10 msecs
+        int dataCount = 100;
+        byte[][] sampleAudio = new byte[dataCount][];
+        for (int i = 0; i < dataCount; i++) {
+            sampleAudio[i] = new byte[4 * 160];
+            Arrays.fill(sampleAudio[i], (byte) 0);
+        }
+
+        StreamReceiver mockReceiver = new StreamReceiver();
+        SdlSession session = createTestSession();
+        StreamPacketizer packetizer = null;
+        try {
+            packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithArray(sampleAudio);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertTrue(mockReceiver.verify(sampleAudio));
+    }
+
+    /**
+     * Test for {@link com.smartdevicelink.streaming.StreamPacketizer#sendAudio(byte[], int, int, long)}
+     */
+    public void testSendAudioInterfaceWithArrayOffset() {
+        // assume 100 data of 16kHz / 16bits audio for 10 msecs
+        int dataCount = 100;
+        byte[][] sampleAudio = new byte[dataCount][];
+        for (int i = 0; i < dataCount; i++) {
+            sampleAudio[i] = new byte[4 * 160];
+            Arrays.fill(sampleAudio[i], (byte) 0);
+        }
+
+        StreamReceiver mockReceiver = new StreamReceiver();
+        SdlSession session = createTestSession();
+        StreamPacketizer packetizer = null;
+        try {
+            packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithArrayOffset(sampleAudio);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertTrue(mockReceiver.verify(sampleAudio));
+    }
+
+    public void testSendAudioInterfaceWithByteBuffer() {
+        // assume 100 data of 16kHz / 16bits audio for 10 msecs
+        int dataCount = 100;
+        byte[][] sampleAudio = new byte[dataCount][];
+        for (int i = 0; i < dataCount; i++) {
+            sampleAudio[i] = new byte[4 * 160];
+            Arrays.fill(sampleAudio[i], (byte) 0);
+        }
+
+        StreamReceiver mockReceiver = new StreamReceiver();
+        SdlSession session = createTestSession();
+        StreamPacketizer packetizer = null;
+        try {
+            packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithByteBuffer(sampleAudio);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertTrue(mockReceiver.verify(sampleAudio));
+    }
+
+    public void testSendAudioInterfaceWithDirectByteBuffer() {
+        // assume 100 data of 16kHz / 16bits audio for 10 msecs
+        int dataCount = 100;
+        byte[][] sampleAudio = new byte[dataCount][];
+        for (int i = 0; i < dataCount; i++) {
+            sampleAudio[i] = new byte[4 * 160];
+            Arrays.fill(sampleAudio[i], (byte) 0);
+        }
+
+        StreamReceiver mockReceiver = new StreamReceiver();
+        SdlSession session = createTestSession();
+        StreamPacketizer packetizer = null;
+        try {
+            packetizer = new StreamPacketizer(mockReceiver, null, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithDirectByteBuffer(sampleAudio);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertTrue(mockReceiver.verify(sampleAudio));
+    }
+
+
+    private SdlSession createTestSession() {
+        return new SdlSession(new MockInterfaceBroker(), new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "19216801"));
+    }
+
+    private class StreamReceiver implements IStreamListener {
+        private ByteArrayOutputStream mReceiveBuffer;
+
+        StreamReceiver() {
+            mReceiveBuffer = new ByteArrayOutputStream();
+        }
+
+        @Override
+        public void sendStreamPacket(ProtocolMessage pm) {
+            try {
+                mReceiveBuffer.write(pm.getData());
+            } catch (IOException e) {
+                fail();
+            }
+        }
+
+        boolean verify(byte[][] expectedStream) {
+            ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+            for (byte[] frame : expectedStream) {
+                try {
+                    buffer.write(frame);
+                } catch (IOException e) {
+                    fail();
+                }
+            }
+            boolean result = Arrays.equals(buffer.toByteArray(), mReceiveBuffer.toByteArray());
+            try {
+                buffer.close();
+            } catch (IOException e) {
+                fail();
+            }
+            return result;
+        }
+    }
+
+    private class MockVideoApp {
+        private IVideoStreamListener mListener;
+
+        MockVideoApp(IVideoStreamListener listener) {
+            mListener = listener;
+        }
+
+        void inputByteStreamWithArray(byte[][] stream) {
+            for (byte[] data : stream) {
+                mListener.sendFrame(data, 0, data.length, -1);
+            }
+        }
+
+        void inputByteStreamWithArrayOffset(byte[][] stream) {
+            int dummyOffset = 0;
+            for (byte[] data : stream) {
+                // to test 'offset' param, create a buffer with a dummy offset
+                byte[] buffer = new byte[dummyOffset + data.length];
+                System.arraycopy(data, 0, buffer, dummyOffset, data.length);
+
+                mListener.sendFrame(buffer, dummyOffset, data.length, -1);
+                dummyOffset++;
+            }
+        }
+
+        void inputByteStreamWithByteBuffer(byte[][] stream) {
+            int dummyOffset = 0;
+            for (byte[] data : stream) {
+                // add a dummy offset inside byteBuffer for testing
+                ByteBuffer byteBuffer = ByteBuffer.allocate(dummyOffset + data.length);
+                byteBuffer.position(dummyOffset);
+
+                byteBuffer.put(data);
+                byteBuffer.flip();
+                byteBuffer.position(dummyOffset);
+
+                mListener.sendFrame(byteBuffer, -1);
+                dummyOffset++;
+            }
+        }
+
+        void inputByteStreamWithDirectByteBuffer(byte[][] stream) {
+            int dummyOffset = 0;
+            for (byte[] data : stream) {
+                // add a dummy offset inside byteBuffer for testing
+                ByteBuffer byteBuffer = ByteBuffer.allocateDirect(dummyOffset + data.length);
+                byteBuffer.position(dummyOffset);
+
+                byteBuffer.put(data);
+                byteBuffer.flip();
+                byteBuffer.position(dummyOffset);
+
+                mListener.sendFrame(byteBuffer, -1);
+                dummyOffset++;
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java
index 5dfe36e19..70a175d46 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/RTPH264PacketizerTest.java
@@ -33,11 +33,11 @@ package com.smartdevicelink.test.streaming.video;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.protocol.ProtocolMessage;
 import com.smartdevicelink.protocol.enums.SessionType;
-import com.smartdevicelink.streaming.video.IVideoStreamListener;
+import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.streaming.IStreamListener;
+import com.smartdevicelink.streaming.video.IVideoStreamListener;
 import com.smartdevicelink.streaming.video.RTPH264Packetizer;
 import com.smartdevicelink.test.streaming.MockInterfaceBroker;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
@@ -62,840 +62,852 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat
 @RunWith(AndroidJUnit4.class)
 public class RTPH264PacketizerTest extends TestCase {
 
-	private static final int FRAME_LENGTH_LEN = 2;
-	private static final int RTP_HEADER_LEN = 12;
-
-	private static final byte WIPRO_VERSION = 0x0B;
-	private static final byte SESSION_ID = 0x0A;
-
-	private class ByteStreamNALUnit {
-		byte[] startCode;
-		byte[] nalUnit;
-		int frameNum;
-
-		ByteStreamNALUnit(byte[] startCode, byte[] nalUnit, int frameNum) {
-			this.startCode = startCode;
-			this.nalUnit = nalUnit;
-			this.frameNum = frameNum;
-		}
-
-		byte[] createArray() {
-			byte[] array = new byte[startCode.length + nalUnit.length];
-			System.arraycopy(startCode, 0, array, 0, startCode.length);
-			System.arraycopy(nalUnit, 0, array, startCode.length, nalUnit.length);
-			return array;
-		}
-
-		public int getLength() {
-			return startCode.length + nalUnit.length;
-		}
-	}
-
-	private static final byte[] START_CODE_3 = {0x00, 0x00, 0x01};
-	private static final byte[] START_CODE_4 = {0x00, 0x00, 0x00, 0x01};
-
-	/* a sample H.264 stream, including 33 frames of 16px white square */
-	private final ByteStreamNALUnit[] SAMPLE_STREAM = new ByteStreamNALUnit[] {
-		// SPS
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x67, 0x42, (byte)0xC0, 0x0A, (byte)0xA6, 0x11, 0x11, (byte)0xE8,
-		                                               0x40, 0x00, 0x00, (byte)0xFA, 0x40, 0x00, 0x3A, (byte)0x98,
-		                                               0x23, (byte)0xC4, (byte)0x89, (byte)0x84, 0x60}, 0),
-		// PPS
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x68, (byte)0xC8, 0x42, 0x0F, 0x13, 0x20}, 0),
-		// I
-		new ByteStreamNALUnit(START_CODE_3, new byte[]{0x65, (byte)0x88, (byte)0x82, 0x07, 0x67, 0x39, 0x31, 0x40,
-		                                               0x00, 0x5E, 0x0A, (byte)0xFB, (byte)0xEF, (byte)0xAE, (byte)0xBA, (byte)0xEB,
-		                                               (byte)0xAE, (byte)0xBA, (byte)0xEB, (byte)0xC0}, 0),
-		// P
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, 0x1C, 0x0E, (byte)0xCE, 0x71, (byte)0xB0}, 1),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, 0x2A, 0x03, (byte)0xB3, (byte)0x9C, 0x6C}, 2),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, 0x3B, 0x03, (byte)0xB3, (byte)0x9C, 0x6C}, 3),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, 0x49, 0x00, (byte)0xEC, (byte)0xE7, 0x1B}, 4),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, 0x59, 0x40, (byte)0xEC, (byte)0xE7, 0x1B}, 5),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, 0x69, (byte)0x80, (byte)0xEC, (byte)0xE7, 0x1B}, 6),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, 0x79, (byte)0xC0, (byte)0xEC, (byte)0xE7, 0x1B}, 7),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, (byte)0x88, (byte)0x80, 0x3B, 0x39, (byte)0xC6, (byte)0xC0}, 8),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, (byte)0x98, (byte)0x90, 0x3B, 0x39, (byte)0xC6, (byte)0xC0}, 9),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, (byte)0xA8, (byte)0xA0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0}, 10),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, (byte)0xB8, (byte)0xB0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0}, 11),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, (byte)0xC8, (byte)0xC0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0}, 12),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, (byte)0xD8, (byte)0xD0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0}, 13),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, (byte)0xE8, (byte)0xE0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0}, 14),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, (byte)0xF8, (byte)0xF0, 0x3B, 0x39, (byte)0xC6, (byte)0xC0}, 15),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, 0x00, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 16),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, 0x10, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 17),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, 0x20, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 18),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, 0x30, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 19),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, 0x40, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 20),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, 0x50, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 21),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, 0x60, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 22),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, 0x70, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 23),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, (byte)0x80, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 24),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, (byte)0x90, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 25),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, (byte)0xA0, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 26),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, (byte)0xB0, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 27),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, (byte)0xC0, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 28),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9B, (byte)0xD0, 0x1D, (byte)0x9C, (byte)0xE3, 0x60}, 29),
-		// SPS
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x67, 0x42, (byte)0xC0, 0x0A, (byte)0xA6, 0x11, 0x11, (byte)0xE8,
-		                                               0x40, 0x00, 0x00, (byte)0xFA, 0x40, 0x00, 0x3A, (byte)0x98,
-		                                               0x23, (byte)0xC4, (byte)0x89, (byte)0x84, 0x60}, 30),
-		// PPS
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x68, (byte)0xC8, 0x42, 0x0F, 0x13, 0x20}, 30),
-		// I
-		new ByteStreamNALUnit(START_CODE_3, new byte[]{0x65, (byte)0x88, (byte)0x81, 0x00, (byte)0x8E, 0x73, (byte)0x93, 0x14,
-		                                               0x00, 0x06, (byte)0xA4, 0x2F, (byte)0xBE, (byte)0xFA, (byte)0xEB, (byte)0xAE,
-		                                               (byte)0xBA, (byte)0xEB, (byte)0xAE, (byte)0xBC}, 30),
-		// P
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, 0x1C, 0x0D, (byte)0xCE, 0x71, (byte)0xB0}, 31),
-		new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte)0x9A, 0x2A, 0x03, 0x33, (byte)0x9C, 0x6C}, 32),
-	};
-
-	/**
-	 * Test for creating Single Frame RTP packets from H.264 byte stream
-	 */
-	@Test
-	public void testSingleFrames() {
-		StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
-		SdlSession session = createTestSession();
-		RTPH264Packetizer packetizer = null;
-		try {
-			packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp encoder = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		encoder.inputByteStreamWithArray(SAMPLE_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
-	}
-
-	/**
-	 * Test for creating Single Frame RTP packets then splitting into multiple SDL frames
-	 */
-	@Test
-	public void testSingleFramesIntoMultipleMessages() {
-		StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
-		SdlSession session = createTestSession();
-		RTPH264Packetizer packetizer = null;
-		try {
-			packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-
-		// try to modify "bufferSize" variable (in AbstractPacketizer)
-		Class packetizerClass = RTPH264Packetizer.class;
-		String fieldName = "bufferSize";
-		java.lang.reflect.Field bufferSizeField = null;
-		while (packetizerClass != null) {
-			try {
-				bufferSizeField = packetizerClass.getDeclaredField(fieldName);
-				break;
-			} catch (NoSuchFieldException e) {
-				packetizerClass = packetizerClass.getSuperclass();
-			}
-		}
-		if (bufferSizeField != null) {
-			try {
-				bufferSizeField.setAccessible(true);
-				// use small MTU and make some RTP packets split into multiple SDL frames
-				bufferSizeField.set(packetizer, FRAME_LENGTH_LEN + RTP_HEADER_LEN + 16);
-			} catch (IllegalAccessException e) {
-				fail("Cannot access to private field \"" + fieldName + "\".");
-			}
-		} else {
-			fail("Cannot find private field \"" + fieldName + "\".");
-		}
-
-		MockVideoApp encoder = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		encoder.inputByteStreamWithArray(SAMPLE_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
-	}
-
-	/**
-	 * Test for creating Fragmentation Units from H.264 byte stream
-	 */
-	@Test
-	public void testFragmentationUnits() {
-		ByteStreamNALUnit[] stream = new ByteStreamNALUnit[] {
-			SAMPLE_STREAM[0], SAMPLE_STREAM[1], null, null, null, SAMPLE_STREAM[5]
-		};
-		byte[] fakeNALUnit1 = new byte[65535 - RTP_HEADER_LEN];  // not fragmented
-		byte[] fakeNALUnit2 = new byte[65536 - RTP_HEADER_LEN];  // will be fragmented
-		byte[] fakeNALUnit3 = new byte[65537 - RTP_HEADER_LEN];  // ditto
-
-		for (int i = 0; i < fakeNALUnit1.length; i++) {
-			fakeNALUnit1[i] = (byte)(i % 256);
-		}
-		for (int i = 0; i < fakeNALUnit2.length; i++) {
-			fakeNALUnit2[i] = (byte)(i % 256);
-		}
-		for (int i = 0; i < fakeNALUnit3.length; i++) {
-			fakeNALUnit3[i] = (byte)(i % 256);
-		}
-
-		stream[2] = new ByteStreamNALUnit(START_CODE_3, fakeNALUnit1, 0);
-		stream[3] = new ByteStreamNALUnit(START_CODE_4, fakeNALUnit2, 1);
-		stream[4] = new ByteStreamNALUnit(START_CODE_4, fakeNALUnit3, 2);
-
-		StreamVerifier verifier = new StreamVerifier(stream);
-		SdlSession session = createTestSession();
-		RTPH264Packetizer packetizer = null;
-		try {
-			packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp encoder = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		encoder.inputByteStreamWithArray(stream);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertEquals(stream.length + 2, verifier.getPacketCount());
-	}
-
-	/**
-	 * Test for RTP sequence number gets wrap-around correctly
-	 */
-	@Test
-	public void testSequenceNumWrapAround() {
-		ByteStreamNALUnit[] stream = new ByteStreamNALUnit[70000];
-		for (int i = 0; i < stream.length; i++) {
-			stream[i] = new ByteStreamNALUnit(START_CODE_4, SAMPLE_STREAM[3].nalUnit, i);
-		}
-
-		StreamVerifier verifier = new StreamVerifier(stream);
-		SdlSession session = createTestSession();
-		RTPH264Packetizer packetizer = null;
-		try {
-			packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp encoder = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		encoder.inputByteStreamWithArray(stream);
-		try {
-			Thread.sleep(2000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertEquals(stream.length, verifier.getPacketCount());
-	}
-
-	/**
-	 * Test for {@link RTPH264Packetizer#setPayloadType(byte)}
-	 */
-	@Test
-	public void testSetPayloadType() {
-		byte pt = (byte)123;
-		StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM, pt);
-		SdlSession session = createTestSession();
-		RTPH264Packetizer packetizer = null;
-		try {
-			packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		packetizer.setPayloadType(pt);
-		MockVideoApp encoder = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		encoder.inputByteStreamWithArray(SAMPLE_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
-	}
-
-	/**
-	 * Test for {@link RTPH264Packetizer#setSSRC(int)}
-	 */
-	@Test
-	public void testSetSSRC() {
-		int ssrc = 0xFEDCBA98;
-		StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
-		verifier.setExpectedSSRC(ssrc);
-		SdlSession session = createTestSession();
-		RTPH264Packetizer packetizer = null;
-		try {
-			packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		packetizer.setSSRC(ssrc);
-		MockVideoApp encoder = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		encoder.inputByteStreamWithArray(SAMPLE_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
-	}
-
-	/**
-	 * Test for {@link RTPH264Packetizer#pause()} and
-	 * {@link RTPH264Packetizer#resume()}
-	 */
-	@Test
-	public void testPauseResume() {
-		int index = 0;
-		// split SAMPLE_STREAM into three parts
-		ByteStreamNALUnit[] inputStream1 = new ByteStreamNALUnit[8];
-		ByteStreamNALUnit[] inputStream2 = new ByteStreamNALUnit[19];
-		ByteStreamNALUnit[] inputStream3 = new ByteStreamNALUnit[10];
-		for (int i = 0; i < inputStream1.length; i++) {
-			inputStream1[i] = SAMPLE_STREAM[index++];
-		}
-		for (int i = 0; i < inputStream2.length; i++) {
-			inputStream2[i] = SAMPLE_STREAM[index++];
-		}
-		for (int i = 0; i < inputStream3.length; i++) {
-			inputStream3[i] = SAMPLE_STREAM[index++];
-		}
-
-		index = 0;
-		// expected output is "all NAL units in inputStream1" plus "I frame and onwards in inputStream3"
-		ByteStreamNALUnit[] expectedStream = new ByteStreamNALUnit[inputStream1.length + 3];
-		for (int i = 0; i < inputStream1.length; i++) {
-			expectedStream[index++] = inputStream1[i];
-		}
-		expectedStream[index++] = SAMPLE_STREAM[34];
-		expectedStream[index++] = SAMPLE_STREAM[35];
-		expectedStream[index] = SAMPLE_STREAM[36];
-
-		StreamVerifier verifier = new StreamVerifier(expectedStream);
-		SdlSession session = createTestSession();
-		RTPH264Packetizer packetizer = null;
-		try {
-			packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp encoder = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		encoder.inputByteStreamWithArray(inputStream1);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.pause();
-
-		// this input stream should be disposed
-		encoder.inputByteStreamWithArray(inputStream2);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.resume();
-
-		// packetizer should resume from a I frame
-		encoder.inputByteStreamWithArray(inputStream3);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertEquals(expectedStream.length, verifier.getPacketCount());
-	}
-
-	/**
-	 * Test for {@link RTPH264Packetizer#sendFrame(byte[], int, int, long)}
-	 */
-	@Test
-	public void testSendFrameInterfaceWithArray() {
-		StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
-		SdlSession session = createTestSession();
-		RTPH264Packetizer packetizer = null;
-		try {
-			packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithArrayOffset(SAMPLE_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
-	}
-
-	/**
-	 * Test for {@link RTPH264Packetizer#sendFrame(ByteBuffer, long)}
-	 */
-	@Test
-	public void testSendFrameInterfaceWithByteBuffer() {
-		StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
-		SdlSession session = createTestSession();
-		RTPH264Packetizer packetizer = null;
-		try {
-			packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithByteBuffer(SAMPLE_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
-	}
-
-	/**
-	 * Test for {@link RTPH264Packetizer#sendFrame(ByteBuffer, long)}
-	 * with direct ByteBuffer
-	 */
-	@Test
-	public void testSendFrameInterfaceWithDirectByteBuffer() {
-		StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
-		SdlSession session = createTestSession();
-		RTPH264Packetizer packetizer = null;
-		try {
-			packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
-		} catch (IOException e) {
-			fail();
-		}
-		MockVideoApp mockApp = new MockVideoApp(packetizer);
-
-		try {
-			packetizer.start();
-		} catch (IOException e) {
-			fail();
-		}
-
-		mockApp.inputByteStreamWithDirectByteBuffer(SAMPLE_STREAM);
-		try {
-			Thread.sleep(1000, 0);
-		} catch (InterruptedException e) {}
-
-		packetizer.stop();
-		assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
-	}
-
-	private SdlSession createTestSession() {
-		return new SdlSession(new MockInterfaceBroker(), new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "41146"));
-	}
-
-	private class StreamVerifier implements IStreamListener {
-		private static final int STATE_LENGTH = 0;
-		private static final int STATE_PACKET = 1;
-
-		private ByteStreamNALUnit[] mStream;
-		private byte[] mExpectedNALUnit;
-		private ByteBuffer mReceiveBuffer;
-		private int mPacketLen;
-		private int mState;
-		private int mNALCount;
-		private int mTotalPacketCount;
-		private boolean mFragmented;
-		private int mOffsetInNALUnit;
-		private byte mPayloadType;
-		private boolean mVerifySSRC;
-		private int mExpectedSSRC;
-		private boolean mFirstPacketReceived;
-		private short mFirstSequenceNum;
-		private int mFirstTimestamp;
-
-		StreamVerifier(ByteStreamNALUnit[] stream) {
-			this(stream, (byte)96);
-		}
-
-		StreamVerifier(ByteStreamNALUnit[] stream, byte payloadType) {
-			mStream = stream;
-			mReceiveBuffer = ByteBuffer.allocate(256 * 1024);
-			mReceiveBuffer.order(ByteOrder.BIG_ENDIAN);
-			mPacketLen = 0;
-			mState = STATE_LENGTH;
-
-			mNALCount = 0;
-			mTotalPacketCount = 0;
-			mFragmented = false;
-			mOffsetInNALUnit = 1; // Used when verifying FUs. The first byte is skipped.
-
-			mPayloadType = payloadType;
-			mVerifySSRC = false;
-			mExpectedSSRC = 0;
-			mFirstPacketReceived = false;
-			mFirstSequenceNum = 0;
-			mFirstTimestamp = 0;
-		}
-
-		void setExpectedSSRC(int ssrc) {
-			mVerifySSRC = true;
-			mExpectedSSRC = ssrc;
-		}
-
-		int getPacketCount() {
-			return mTotalPacketCount;
-		}
-
-		@Override
-		public void sendStreamPacket(ProtocolMessage pm) {
-			mExpectedNALUnit = mStream[mNALCount].nalUnit;
-			// should be same as MockVideoApp's configuration (29.97 FPS)
-			int expectedPTSDelta = mStream[mNALCount].frameNum * 1001 * 3;
-			boolean isLast = shouldBeLast();
-
-			verifyProtocolMessage(pm, SESSION_ID);
-
-			mReceiveBuffer.put(pm.getData());
-			mReceiveBuffer.flip();
-
-			if (mState == STATE_LENGTH) {
-				if (mReceiveBuffer.remaining() >= 2) {
-					mPacketLen = mReceiveBuffer.getShort() & 0xFFFF;
-					mState = STATE_PACKET;
-				}
-			}
-
-			if (mState == STATE_PACKET) {
-				if (mReceiveBuffer.remaining() >= mPacketLen) {
-					byte[] packet = new byte[mPacketLen];
-					mReceiveBuffer.get(packet);
-
-					verifyRTPPacket(packet, mPayloadType, expectedPTSDelta,
-					                mVerifySSRC, mExpectedSSRC, isLast);
-					mFirstPacketReceived = true;
-
-					mState = STATE_LENGTH;
-					mPacketLen = 0;
-					mTotalPacketCount++;
-				}
-			}
-
-			mReceiveBuffer.compact();
-		}
-
-		private void verifyProtocolMessage(ProtocolMessage pm, byte sessionId) {
-			assertEquals(true, pm != null);
-			assertEquals(sessionId, pm.getSessionID());
-			assertEquals(SessionType.NAV, pm.getSessionType());
-			assertEquals(0, pm.getFunctionID());
-			assertEquals(0, pm.getCorrID());
-			assertEquals(false, pm.getPayloadProtected());
-		}
-
-		private void verifyRTPPacket(byte[] packet, byte payloadType, int expectedPTSDelta,
-		                             boolean verifySSRC, int expectedSSRC, boolean isLast) {
-			assertTrue(packet.length > RTP_HEADER_LEN);
-			verifyRTPHeader(packet, false, isLast, payloadType, (short)(mTotalPacketCount % 65536),
-			                expectedPTSDelta, verifySSRC, expectedSSRC);
-
-			byte type = (byte)(packet[RTP_HEADER_LEN] & 0x1F);
-			if (type == 28) { // FU-A frame
-				boolean fuEnd = verifyFUTypeA(packet);
-				if (fuEnd) {
-					mNALCount++;
-				}
-			} else if (type == 29) { // FU-B frame
-				fail("Fragmentation Unit B is not supported by this test");
-			} else if (type == 24 || type == 25 || type == 26 || type == 27) {
-				fail("STAP and MTAP are not supported by this test");
-			} else {
-				// Single Frame
-				verifySingleFrame(packet);
-				mNALCount++;
-			}
-		}
-
-		private void verifyRTPHeader(byte[] packet,
-		                             boolean hasPadding, boolean isLast, byte payloadType,
-		                             short seqNumDelta, int ptsDelta, boolean checkSSRC, int ssrc) {
-			int byte0 = packet[0] & 0xFF;
-			assertEquals((byte)2, (byte)((byte0 >> 6) & 3));                    // version
-			assertEquals((byte)(hasPadding ? 1 : 0), (byte)((byte0 >> 5) & 1)); // padding
-			assertEquals((byte)0, (byte)((byte0 >> 4) & 1));                    // extension
-			assertEquals((byte)0, (byte)(byte0 & 0xF));                         // CSRC count
-
-			int byte1 = packet[1] & 0xFF;
-			assertEquals((byte)(isLast ? 1 : 0), (byte)((byte1 >> 7) & 1)); // marker
-			assertEquals(payloadType, (byte)(byte1 & 0x7F));                // Payload Type
-
-			short actualSeq = (short)(((packet[2] & 0xFF) << 8) | (packet[3] & 0xFF));
-			if (!mFirstPacketReceived) {
-				mFirstSequenceNum = actualSeq;
-			} else {
-				assertEquals((short)(mFirstSequenceNum + seqNumDelta), actualSeq);
-			}
-
-			int actualPTS = ((packet[4] & 0xFF) << 24) | ((packet[5] & 0xFF) << 16) |
-			                 ((packet[6] & 0xFF) << 8) | (packet[7] & 0xFF);
-			if (!mFirstPacketReceived) {
-				mFirstTimestamp = actualPTS;
-			} else {
-				// accept calculation error
-				assertTrue(mFirstTimestamp + ptsDelta - 1 <= actualPTS &&
-				           actualPTS <= mFirstTimestamp + ptsDelta + 1);
-			}
-
-			if (checkSSRC) {
-				int actualSSRC = ((packet[8] & 0xFF) << 24) | ((packet[9] & 0xFF) << 16) |
-				                  ((packet[10] & 0xFF) << 8) | (packet[11] & 0xFF);
-				assertEquals(ssrc, actualSSRC);
-			}
-		}
-
-		private void verifySingleFrame(byte[] packet) {
-			assertEquals(true, arrayCompare(packet, RTP_HEADER_LEN, packet.length - RTP_HEADER_LEN,
-			                                mExpectedNALUnit, 0, mExpectedNALUnit.length));
-		}
-
-		private boolean verifyFUTypeA(byte[] packet) {
-			int firstByte = mExpectedNALUnit[0] & 0xFF;
-
-			int byte0 = packet[RTP_HEADER_LEN] & 0xFF;
-			assertEquals((byte)((firstByte >> 7) & 1), (byte)((byte0 >> 7) & 1));   // F bit
-			assertEquals((byte)((firstByte >> 5) & 3), (byte)((byte0 >> 5) & 3));   // NRI
-			assertEquals((byte)28, (byte)(byte0 & 0x1F));                           // Type
-
-			int byte1 = packet[RTP_HEADER_LEN+1] & 0xFF;
-			boolean isFirstFU = ((byte1 >> 7) & 1) == 1;                    // Start bit
-			boolean isLastFU = ((byte1 >> 6) & 1) == 1;                     // End bit
-			assertEquals((byte)0, (byte)((byte1 >> 5) & 1));                // Reserved bit
-			assertEquals((byte)(firstByte & 0x1F), (byte)(byte1 & 0x1F));   // Type
-
-			int len = packet.length - (RTP_HEADER_LEN + 2);
-			assertEquals(true, arrayCompare(packet, RTP_HEADER_LEN + 2, len, mExpectedNALUnit, mOffsetInNALUnit, len));
-			mOffsetInNALUnit += len;
-
-			if (!mFragmented) {
-				// this should be the first fragmentation unit
-				assertEquals(true, isFirstFU);
-				assertEquals(false, isLastFU);
-				mFragmented = true;
-			} else {
-				assertEquals(false, isFirstFU);
-				if (mExpectedNALUnit.length == mOffsetInNALUnit) {
-					// this is the last fragmentation unit
-					assertEquals(true, isLastFU);
-
-					mFragmented = false;
-					mOffsetInNALUnit = 1;
-					return true;
-				} else {
-					assertEquals(false, isLastFU);
-				}
-			}
-			return false;
-		}
-
-		private boolean shouldBeLast() {
-			if (mNALCount + 1 >= mStream.length) {
-				return true;
-			}
-			ByteStreamNALUnit current = mStream[mNALCount];
-			ByteStreamNALUnit next = mStream[mNALCount + 1];
-			if (next.frameNum != current.frameNum) {
-				return true;
-			} else {
-				return false;
-			}
-		}
-
-		private boolean arrayCompare(byte[] a1, int start1, int len1, byte[] a2, int start2, int len2) {
-			assertTrue(start1 + len1 <= a1.length);
-			assertTrue(start2 + len2 <= a2.length);
-
-			if (len1 != len2) {
-				return false;
-			}
-
-			for (int i = 0; i < len1; i++) {
-				if (a1[start1 + i] != a2[start2 + i]) {
-					return false;
-				}
-			}
-			return true;
-		}
-	}
-
-	private interface IVideoFrameSender {
-		void onVideoFrame(byte[] data, long timestampUs);
-	}
-
-	private class MockVideoApp {
-		private IVideoStreamListener mListener;
-		private int mFPSNum;
-		private int mFPSDen;
-
-		MockVideoApp(IVideoStreamListener listener) {
-			mListener = listener;
-			// 29.97 fps
-			mFPSNum = 30000;
-			mFPSDen = 1001;
-		}
-
-		void inputByteStreamWithArray(ByteStreamNALUnit[] stream) {
-			generateFramesFromStream(stream, new IVideoFrameSender() {
-				@Override
-				public void onVideoFrame(byte[] data, long timestampUs) {
-					byte[] buffer = new byte[data.length];
-					System.arraycopy(data, 0, buffer, 0, data.length);
-					mListener.sendFrame(buffer, 0, data.length, timestampUs);
-				}
-			});
-		}
-
-		void inputByteStreamWithArrayOffset(ByteStreamNALUnit[] stream) {
-			generateFramesFromStream(stream, new IVideoFrameSender() {
-				private int mDummyOffset = 0;
-
-				@Override
-				public void onVideoFrame(byte[] data, long timestampUs) {
-					// to test 'offset' param, create a buffer with a dummy offset
-					byte[] buffer = new byte[mDummyOffset + data.length];
-					System.arraycopy(data, 0, buffer, mDummyOffset, data.length);
-
-					mListener.sendFrame(buffer, mDummyOffset, data.length, timestampUs);
-					mDummyOffset++;
-				}
-			});
-		}
-
-		void inputByteStreamWithByteBuffer(ByteStreamNALUnit[] stream) {
-			generateFramesFromStream(stream, new IVideoFrameSender() {
-				private int mDummyOffset = 0;
-
-				@Override
-				public void onVideoFrame(byte[] data, long timestampUs) {
-					// add a dummy offset inside byteBuffer for testing
-					ByteBuffer byteBuffer = ByteBuffer.allocate(mDummyOffset + data.length);
-					byteBuffer.position(mDummyOffset);
-
-					byteBuffer.put(data);
-					byteBuffer.flip();
-					byteBuffer.position(mDummyOffset);
-
-					mListener.sendFrame(byteBuffer, timestampUs);
-					mDummyOffset++;
-				}
-			});
-		}
-
-		void inputByteStreamWithDirectByteBuffer(ByteStreamNALUnit[] stream) {
-			generateFramesFromStream(stream, new IVideoFrameSender() {
-				private int mDummyOffset = 0;
-
-				@Override
-				public void onVideoFrame(byte[] data, long timestampUs) {
-					// add a dummy offset inside byteBuffer for testing
-					ByteBuffer byteBuffer = ByteBuffer.allocateDirect(mDummyOffset + data.length);
-					byteBuffer.position(mDummyOffset);
-
-					byteBuffer.put(data);
-					byteBuffer.flip();
-					byteBuffer.position(mDummyOffset);
-
-					mListener.sendFrame(byteBuffer, timestampUs);
-					mDummyOffset++;
-				}
-			});
-		}
-
-		private void generateFramesFromStream(ByteStreamNALUnit[] stream, IVideoFrameSender callback) {
-			ByteArrayOutputStream os = new ByteArrayOutputStream();
-
-			for (int i = 0; i < stream.length; i++) {
-				ByteStreamNALUnit bs = stream[i];
-				byte[] array = bs.createArray();
-				os.write(array, 0, array.length);
-
-				if (i < stream.length - 1) {
-					ByteStreamNALUnit next = stream[i + 1];
-					if (bs.frameNum == next.frameNum) {
-						// enqueue it and send at once
-						continue;
-					}
-				}
-
-				long timestampUs = bs.frameNum * 1000L * 1000L * mFPSDen / mFPSNum;
-				byte[] data = os.toByteArray();
-				callback.onVideoFrame(data, timestampUs);
-				os.reset();
-			}
-
-			try {
-				os.close();
-			} catch (IOException e) {
-			}
-		}
-	}
+    private static final int FRAME_LENGTH_LEN = 2;
+    private static final int RTP_HEADER_LEN = 12;
+
+    private static final byte WIPRO_VERSION = 0x0B;
+    private static final byte SESSION_ID = 0x0A;
+
+    private class ByteStreamNALUnit {
+        byte[] startCode;
+        byte[] nalUnit;
+        int frameNum;
+
+        ByteStreamNALUnit(byte[] startCode, byte[] nalUnit, int frameNum) {
+            this.startCode = startCode;
+            this.nalUnit = nalUnit;
+            this.frameNum = frameNum;
+        }
+
+        byte[] createArray() {
+            byte[] array = new byte[startCode.length + nalUnit.length];
+            System.arraycopy(startCode, 0, array, 0, startCode.length);
+            System.arraycopy(nalUnit, 0, array, startCode.length, nalUnit.length);
+            return array;
+        }
+
+        public int getLength() {
+            return startCode.length + nalUnit.length;
+        }
+    }
+
+    private static final byte[] START_CODE_3 = {0x00, 0x00, 0x01};
+    private static final byte[] START_CODE_4 = {0x00, 0x00, 0x00, 0x01};
+
+    /* a sample H.264 stream, including 33 frames of 16px white square */
+    private final ByteStreamNALUnit[] SAMPLE_STREAM = new ByteStreamNALUnit[]{
+            // SPS
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x67, 0x42, (byte) 0xC0, 0x0A, (byte) 0xA6, 0x11, 0x11, (byte) 0xE8,
+                    0x40, 0x00, 0x00, (byte) 0xFA, 0x40, 0x00, 0x3A, (byte) 0x98,
+                    0x23, (byte) 0xC4, (byte) 0x89, (byte) 0x84, 0x60}, 0),
+            // PPS
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x68, (byte) 0xC8, 0x42, 0x0F, 0x13, 0x20}, 0),
+            // I
+            new ByteStreamNALUnit(START_CODE_3, new byte[]{0x65, (byte) 0x88, (byte) 0x82, 0x07, 0x67, 0x39, 0x31, 0x40,
+                    0x00, 0x5E, 0x0A, (byte) 0xFB, (byte) 0xEF, (byte) 0xAE, (byte) 0xBA, (byte) 0xEB,
+                    (byte) 0xAE, (byte) 0xBA, (byte) 0xEB, (byte) 0xC0}, 0),
+            // P
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, 0x1C, 0x0E, (byte) 0xCE, 0x71, (byte) 0xB0}, 1),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, 0x2A, 0x03, (byte) 0xB3, (byte) 0x9C, 0x6C}, 2),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, 0x3B, 0x03, (byte) 0xB3, (byte) 0x9C, 0x6C}, 3),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, 0x49, 0x00, (byte) 0xEC, (byte) 0xE7, 0x1B}, 4),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, 0x59, 0x40, (byte) 0xEC, (byte) 0xE7, 0x1B}, 5),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, 0x69, (byte) 0x80, (byte) 0xEC, (byte) 0xE7, 0x1B}, 6),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, 0x79, (byte) 0xC0, (byte) 0xEC, (byte) 0xE7, 0x1B}, 7),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, (byte) 0x88, (byte) 0x80, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0}, 8),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, (byte) 0x98, (byte) 0x90, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0}, 9),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, (byte) 0xA8, (byte) 0xA0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0}, 10),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, (byte) 0xB8, (byte) 0xB0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0}, 11),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, (byte) 0xC8, (byte) 0xC0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0}, 12),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, (byte) 0xD8, (byte) 0xD0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0}, 13),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, (byte) 0xE8, (byte) 0xE0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0}, 14),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, (byte) 0xF8, (byte) 0xF0, 0x3B, 0x39, (byte) 0xC6, (byte) 0xC0}, 15),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, 0x00, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 16),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, 0x10, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 17),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, 0x20, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 18),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, 0x30, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 19),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, 0x40, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 20),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, 0x50, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 21),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, 0x60, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 22),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, 0x70, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 23),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, (byte) 0x80, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 24),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, (byte) 0x90, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 25),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, (byte) 0xA0, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 26),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, (byte) 0xB0, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 27),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, (byte) 0xC0, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 28),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9B, (byte) 0xD0, 0x1D, (byte) 0x9C, (byte) 0xE3, 0x60}, 29),
+            // SPS
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x67, 0x42, (byte) 0xC0, 0x0A, (byte) 0xA6, 0x11, 0x11, (byte) 0xE8,
+                    0x40, 0x00, 0x00, (byte) 0xFA, 0x40, 0x00, 0x3A, (byte) 0x98,
+                    0x23, (byte) 0xC4, (byte) 0x89, (byte) 0x84, 0x60}, 30),
+            // PPS
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x68, (byte) 0xC8, 0x42, 0x0F, 0x13, 0x20}, 30),
+            // I
+            new ByteStreamNALUnit(START_CODE_3, new byte[]{0x65, (byte) 0x88, (byte) 0x81, 0x00, (byte) 0x8E, 0x73, (byte) 0x93, 0x14,
+                    0x00, 0x06, (byte) 0xA4, 0x2F, (byte) 0xBE, (byte) 0xFA, (byte) 0xEB, (byte) 0xAE,
+                    (byte) 0xBA, (byte) 0xEB, (byte) 0xAE, (byte) 0xBC}, 30),
+            // P
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, 0x1C, 0x0D, (byte) 0xCE, 0x71, (byte) 0xB0}, 31),
+            new ByteStreamNALUnit(START_CODE_4, new byte[]{0x41, (byte) 0x9A, 0x2A, 0x03, 0x33, (byte) 0x9C, 0x6C}, 32),
+    };
+
+    /**
+     * Test for creating Single Frame RTP packets from H.264 byte stream
+     */
+    @Test
+    public void testSingleFrames() {
+        StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
+        SdlSession session = createTestSession();
+        RTPH264Packetizer packetizer = null;
+        try {
+            packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp encoder = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        encoder.inputByteStreamWithArray(SAMPLE_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
+    }
+
+    /**
+     * Test for creating Single Frame RTP packets then splitting into multiple SDL frames
+     */
+    @Test
+    public void testSingleFramesIntoMultipleMessages() {
+        StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
+        SdlSession session = createTestSession();
+        RTPH264Packetizer packetizer = null;
+        try {
+            packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+
+        // try to modify "bufferSize" variable (in AbstractPacketizer)
+        Class packetizerClass = RTPH264Packetizer.class;
+        String fieldName = "bufferSize";
+        java.lang.reflect.Field bufferSizeField = null;
+        while (packetizerClass != null) {
+            try {
+                bufferSizeField = packetizerClass.getDeclaredField(fieldName);
+                break;
+            } catch (NoSuchFieldException e) {
+                packetizerClass = packetizerClass.getSuperclass();
+            }
+        }
+        if (bufferSizeField != null) {
+            try {
+                bufferSizeField.setAccessible(true);
+                // use small MTU and make some RTP packets split into multiple SDL frames
+                bufferSizeField.set(packetizer, FRAME_LENGTH_LEN + RTP_HEADER_LEN + 16);
+            } catch (IllegalAccessException e) {
+                fail("Cannot access to private field \"" + fieldName + "\".");
+            }
+        } else {
+            fail("Cannot find private field \"" + fieldName + "\".");
+        }
+
+        MockVideoApp encoder = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        encoder.inputByteStreamWithArray(SAMPLE_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
+    }
+
+    /**
+     * Test for creating Fragmentation Units from H.264 byte stream
+     */
+    @Test
+    public void testFragmentationUnits() {
+        ByteStreamNALUnit[] stream = new ByteStreamNALUnit[]{
+                SAMPLE_STREAM[0], SAMPLE_STREAM[1], null, null, null, SAMPLE_STREAM[5]
+        };
+        byte[] fakeNALUnit1 = new byte[65535 - RTP_HEADER_LEN];  // not fragmented
+        byte[] fakeNALUnit2 = new byte[65536 - RTP_HEADER_LEN];  // will be fragmented
+        byte[] fakeNALUnit3 = new byte[65537 - RTP_HEADER_LEN];  // ditto
+
+        for (int i = 0; i < fakeNALUnit1.length; i++) {
+            fakeNALUnit1[i] = (byte) (i % 256);
+        }
+        for (int i = 0; i < fakeNALUnit2.length; i++) {
+            fakeNALUnit2[i] = (byte) (i % 256);
+        }
+        for (int i = 0; i < fakeNALUnit3.length; i++) {
+            fakeNALUnit3[i] = (byte) (i % 256);
+        }
+
+        stream[2] = new ByteStreamNALUnit(START_CODE_3, fakeNALUnit1, 0);
+        stream[3] = new ByteStreamNALUnit(START_CODE_4, fakeNALUnit2, 1);
+        stream[4] = new ByteStreamNALUnit(START_CODE_4, fakeNALUnit3, 2);
+
+        StreamVerifier verifier = new StreamVerifier(stream);
+        SdlSession session = createTestSession();
+        RTPH264Packetizer packetizer = null;
+        try {
+            packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp encoder = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        encoder.inputByteStreamWithArray(stream);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertEquals(stream.length + 2, verifier.getPacketCount());
+    }
+
+    /**
+     * Test for RTP sequence number gets wrap-around correctly
+     */
+    @Test
+    public void testSequenceNumWrapAround() {
+        ByteStreamNALUnit[] stream = new ByteStreamNALUnit[70000];
+        for (int i = 0; i < stream.length; i++) {
+            stream[i] = new ByteStreamNALUnit(START_CODE_4, SAMPLE_STREAM[3].nalUnit, i);
+        }
+
+        StreamVerifier verifier = new StreamVerifier(stream);
+        SdlSession session = createTestSession();
+        RTPH264Packetizer packetizer = null;
+        try {
+            packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp encoder = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        encoder.inputByteStreamWithArray(stream);
+        try {
+            Thread.sleep(2000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertEquals(stream.length, verifier.getPacketCount());
+    }
+
+    /**
+     * Test for {@link RTPH264Packetizer#setPayloadType(byte)}
+     */
+    @Test
+    public void testSetPayloadType() {
+        byte pt = (byte) 123;
+        StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM, pt);
+        SdlSession session = createTestSession();
+        RTPH264Packetizer packetizer = null;
+        try {
+            packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        packetizer.setPayloadType(pt);
+        MockVideoApp encoder = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        encoder.inputByteStreamWithArray(SAMPLE_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
+    }
+
+    /**
+     * Test for {@link RTPH264Packetizer#setSSRC(int)}
+     */
+    @Test
+    public void testSetSSRC() {
+        int ssrc = 0xFEDCBA98;
+        StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
+        verifier.setExpectedSSRC(ssrc);
+        SdlSession session = createTestSession();
+        RTPH264Packetizer packetizer = null;
+        try {
+            packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        packetizer.setSSRC(ssrc);
+        MockVideoApp encoder = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        encoder.inputByteStreamWithArray(SAMPLE_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
+    }
+
+    /**
+     * Test for {@link RTPH264Packetizer#pause()} and
+     * {@link RTPH264Packetizer#resume()}
+     */
+    @Test
+    public void testPauseResume() {
+        int index = 0;
+        // split SAMPLE_STREAM into three parts
+        ByteStreamNALUnit[] inputStream1 = new ByteStreamNALUnit[8];
+        ByteStreamNALUnit[] inputStream2 = new ByteStreamNALUnit[19];
+        ByteStreamNALUnit[] inputStream3 = new ByteStreamNALUnit[10];
+        for (int i = 0; i < inputStream1.length; i++) {
+            inputStream1[i] = SAMPLE_STREAM[index++];
+        }
+        for (int i = 0; i < inputStream2.length; i++) {
+            inputStream2[i] = SAMPLE_STREAM[index++];
+        }
+        for (int i = 0; i < inputStream3.length; i++) {
+            inputStream3[i] = SAMPLE_STREAM[index++];
+        }
+
+        index = 0;
+        // expected output is "all NAL units in inputStream1" plus "I frame and onwards in inputStream3"
+        ByteStreamNALUnit[] expectedStream = new ByteStreamNALUnit[inputStream1.length + 3];
+        for (int i = 0; i < inputStream1.length; i++) {
+            expectedStream[index++] = inputStream1[i];
+        }
+        expectedStream[index++] = SAMPLE_STREAM[34];
+        expectedStream[index++] = SAMPLE_STREAM[35];
+        expectedStream[index] = SAMPLE_STREAM[36];
+
+        StreamVerifier verifier = new StreamVerifier(expectedStream);
+        SdlSession session = createTestSession();
+        RTPH264Packetizer packetizer = null;
+        try {
+            packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp encoder = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        encoder.inputByteStreamWithArray(inputStream1);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.pause();
+
+        // this input stream should be disposed
+        encoder.inputByteStreamWithArray(inputStream2);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.resume();
+
+        // packetizer should resume from a I frame
+        encoder.inputByteStreamWithArray(inputStream3);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertEquals(expectedStream.length, verifier.getPacketCount());
+    }
+
+    /**
+     * Test for {@link RTPH264Packetizer#sendFrame(byte[], int, int, long)}
+     */
+    @Test
+    public void testSendFrameInterfaceWithArray() {
+        StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
+        SdlSession session = createTestSession();
+        RTPH264Packetizer packetizer = null;
+        try {
+            packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithArrayOffset(SAMPLE_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
+    }
+
+    /**
+     * Test for {@link RTPH264Packetizer#sendFrame(ByteBuffer, long)}
+     */
+    @Test
+    public void testSendFrameInterfaceWithByteBuffer() {
+        StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
+        SdlSession session = createTestSession();
+        RTPH264Packetizer packetizer = null;
+        try {
+            packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithByteBuffer(SAMPLE_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
+    }
+
+    /**
+     * Test for {@link RTPH264Packetizer#sendFrame(ByteBuffer, long)}
+     * with direct ByteBuffer
+     */
+    @Test
+    public void testSendFrameInterfaceWithDirectByteBuffer() {
+        StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
+        SdlSession session = createTestSession();
+        RTPH264Packetizer packetizer = null;
+        try {
+            packetizer = new RTPH264Packetizer(verifier, SessionType.NAV, SESSION_ID, session);
+        } catch (IOException e) {
+            fail();
+        }
+        MockVideoApp mockApp = new MockVideoApp(packetizer);
+
+        try {
+            packetizer.start();
+        } catch (IOException e) {
+            fail();
+        }
+
+        mockApp.inputByteStreamWithDirectByteBuffer(SAMPLE_STREAM);
+        try {
+            Thread.sleep(1000, 0);
+        } catch (InterruptedException e) {
+        }
+
+        packetizer.stop();
+        assertEquals(SAMPLE_STREAM.length, verifier.getPacketCount());
+    }
+
+    private SdlSession createTestSession() {
+        return new SdlSession(new MockInterfaceBroker(), new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "41146"));
+    }
+
+    private class StreamVerifier implements IStreamListener {
+        private static final int STATE_LENGTH = 0;
+        private static final int STATE_PACKET = 1;
+
+        private ByteStreamNALUnit[] mStream;
+        private byte[] mExpectedNALUnit;
+        private ByteBuffer mReceiveBuffer;
+        private int mPacketLen;
+        private int mState;
+        private int mNALCount;
+        private int mTotalPacketCount;
+        private boolean mFragmented;
+        private int mOffsetInNALUnit;
+        private byte mPayloadType;
+        private boolean mVerifySSRC;
+        private int mExpectedSSRC;
+        private boolean mFirstPacketReceived;
+        private short mFirstSequenceNum;
+        private int mFirstTimestamp;
+
+        StreamVerifier(ByteStreamNALUnit[] stream) {
+            this(stream, (byte) 96);
+        }
+
+        StreamVerifier(ByteStreamNALUnit[] stream, byte payloadType) {
+            mStream = stream;
+            mReceiveBuffer = ByteBuffer.allocate(256 * 1024);
+            mReceiveBuffer.order(ByteOrder.BIG_ENDIAN);
+            mPacketLen = 0;
+            mState = STATE_LENGTH;
+
+            mNALCount = 0;
+            mTotalPacketCount = 0;
+            mFragmented = false;
+            mOffsetInNALUnit = 1; // Used when verifying FUs. The first byte is skipped.
+
+            mPayloadType = payloadType;
+            mVerifySSRC = false;
+            mExpectedSSRC = 0;
+            mFirstPacketReceived = false;
+            mFirstSequenceNum = 0;
+            mFirstTimestamp = 0;
+        }
+
+        void setExpectedSSRC(int ssrc) {
+            mVerifySSRC = true;
+            mExpectedSSRC = ssrc;
+        }
+
+        int getPacketCount() {
+            return mTotalPacketCount;
+        }
+
+        @Override
+        public void sendStreamPacket(ProtocolMessage pm) {
+            mExpectedNALUnit = mStream[mNALCount].nalUnit;
+            // should be same as MockVideoApp's configuration (29.97 FPS)
+            int expectedPTSDelta = mStream[mNALCount].frameNum * 1001 * 3;
+            boolean isLast = shouldBeLast();
+
+            verifyProtocolMessage(pm, SESSION_ID);
+
+            mReceiveBuffer.put(pm.getData());
+            mReceiveBuffer.flip();
+
+            if (mState == STATE_LENGTH) {
+                if (mReceiveBuffer.remaining() >= 2) {
+                    mPacketLen = mReceiveBuffer.getShort() & 0xFFFF;
+                    mState = STATE_PACKET;
+                }
+            }
+
+            if (mState == STATE_PACKET) {
+                if (mReceiveBuffer.remaining() >= mPacketLen) {
+                    byte[] packet = new byte[mPacketLen];
+                    mReceiveBuffer.get(packet);
+
+                    verifyRTPPacket(packet, mPayloadType, expectedPTSDelta,
+                            mVerifySSRC, mExpectedSSRC, isLast);
+                    mFirstPacketReceived = true;
+
+                    mState = STATE_LENGTH;
+                    mPacketLen = 0;
+                    mTotalPacketCount++;
+                }
+            }
+
+            mReceiveBuffer.compact();
+        }
+
+        private void verifyProtocolMessage(ProtocolMessage pm, byte sessionId) {
+            assertEquals(true, pm != null);
+            assertEquals(sessionId, pm.getSessionID());
+            assertEquals(SessionType.NAV, pm.getSessionType());
+            assertEquals(0, pm.getFunctionID());
+            assertEquals(0, pm.getCorrID());
+            assertEquals(false, pm.getPayloadProtected());
+        }
+
+        private void verifyRTPPacket(byte[] packet, byte payloadType, int expectedPTSDelta,
+                                     boolean verifySSRC, int expectedSSRC, boolean isLast) {
+            assertTrue(packet.length > RTP_HEADER_LEN);
+            verifyRTPHeader(packet, false, isLast, payloadType, (short) (mTotalPacketCount % 65536),
+                    expectedPTSDelta, verifySSRC, expectedSSRC);
+
+            byte type = (byte) (packet[RTP_HEADER_LEN] & 0x1F);
+            if (type == 28) { // FU-A frame
+                boolean fuEnd = verifyFUTypeA(packet);
+                if (fuEnd) {
+                    mNALCount++;
+                }
+            } else if (type == 29) { // FU-B frame
+                fail("Fragmentation Unit B is not supported by this test");
+            } else if (type == 24 || type == 25 || type == 26 || type == 27) {
+                fail("STAP and MTAP are not supported by this test");
+            } else {
+                // Single Frame
+                verifySingleFrame(packet);
+                mNALCount++;
+            }
+        }
+
+        private void verifyRTPHeader(byte[] packet,
+                                     boolean hasPadding, boolean isLast, byte payloadType,
+                                     short seqNumDelta, int ptsDelta, boolean checkSSRC, int ssrc) {
+            int byte0 = packet[0] & 0xFF;
+            assertEquals((byte) 2, (byte) ((byte0 >> 6) & 3));                    // version
+            assertEquals((byte) (hasPadding ? 1 : 0), (byte) ((byte0 >> 5) & 1)); // padding
+            assertEquals((byte) 0, (byte) ((byte0 >> 4) & 1));                    // extension
+            assertEquals((byte) 0, (byte) (byte0 & 0xF));                         // CSRC count
+
+            int byte1 = packet[1] & 0xFF;
+            assertEquals((byte) (isLast ? 1 : 0), (byte) ((byte1 >> 7) & 1)); // marker
+            assertEquals(payloadType, (byte) (byte1 & 0x7F));                // Payload Type
+
+            short actualSeq = (short) (((packet[2] & 0xFF) << 8) | (packet[3] & 0xFF));
+            if (!mFirstPacketReceived) {
+                mFirstSequenceNum = actualSeq;
+            } else {
+                assertEquals((short) (mFirstSequenceNum + seqNumDelta), actualSeq);
+            }
+
+            int actualPTS = ((packet[4] & 0xFF) << 24) | ((packet[5] & 0xFF) << 16) |
+                    ((packet[6] & 0xFF) << 8) | (packet[7] & 0xFF);
+            if (!mFirstPacketReceived) {
+                mFirstTimestamp = actualPTS;
+            } else {
+                // accept calculation error
+                assertTrue(mFirstTimestamp + ptsDelta - 1 <= actualPTS &&
+                        actualPTS <= mFirstTimestamp + ptsDelta + 1);
+            }
+
+            if (checkSSRC) {
+                int actualSSRC = ((packet[8] & 0xFF) << 24) | ((packet[9] & 0xFF) << 16) |
+                        ((packet[10] & 0xFF) << 8) | (packet[11] & 0xFF);
+                assertEquals(ssrc, actualSSRC);
+            }
+        }
+
+        private void verifySingleFrame(byte[] packet) {
+            assertEquals(true, arrayCompare(packet, RTP_HEADER_LEN, packet.length - RTP_HEADER_LEN,
+                    mExpectedNALUnit, 0, mExpectedNALUnit.length));
+        }
+
+        private boolean verifyFUTypeA(byte[] packet) {
+            int firstByte = mExpectedNALUnit[0] & 0xFF;
+
+            int byte0 = packet[RTP_HEADER_LEN] & 0xFF;
+            assertEquals((byte) ((firstByte >> 7) & 1), (byte) ((byte0 >> 7) & 1));   // F bit
+            assertEquals((byte) ((firstByte >> 5) & 3), (byte) ((byte0 >> 5) & 3));   // NRI
+            assertEquals((byte) 28, (byte) (byte0 & 0x1F));                           // Type
+
+            int byte1 = packet[RTP_HEADER_LEN + 1] & 0xFF;
+            boolean isFirstFU = ((byte1 >> 7) & 1) == 1;                    // Start bit
+            boolean isLastFU = ((byte1 >> 6) & 1) == 1;                     // End bit
+            assertEquals((byte) 0, (byte) ((byte1 >> 5) & 1));                // Reserved bit
+            assertEquals((byte) (firstByte & 0x1F), (byte) (byte1 & 0x1F));   // Type
+
+            int len = packet.length - (RTP_HEADER_LEN + 2);
+            assertEquals(true, arrayCompare(packet, RTP_HEADER_LEN + 2, len, mExpectedNALUnit, mOffsetInNALUnit, len));
+            mOffsetInNALUnit += len;
+
+            if (!mFragmented) {
+                // this should be the first fragmentation unit
+                assertEquals(true, isFirstFU);
+                assertEquals(false, isLastFU);
+                mFragmented = true;
+            } else {
+                assertEquals(false, isFirstFU);
+                if (mExpectedNALUnit.length == mOffsetInNALUnit) {
+                    // this is the last fragmentation unit
+                    assertEquals(true, isLastFU);
+
+                    mFragmented = false;
+                    mOffsetInNALUnit = 1;
+                    return true;
+                } else {
+                    assertEquals(false, isLastFU);
+                }
+            }
+            return false;
+        }
+
+        private boolean shouldBeLast() {
+            if (mNALCount + 1 >= mStream.length) {
+                return true;
+            }
+            ByteStreamNALUnit current = mStream[mNALCount];
+            ByteStreamNALUnit next = mStream[mNALCount + 1];
+            if (next.frameNum != current.frameNum) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        private boolean arrayCompare(byte[] a1, int start1, int len1, byte[] a2, int start2, int len2) {
+            assertTrue(start1 + len1 <= a1.length);
+            assertTrue(start2 + len2 <= a2.length);
+
+            if (len1 != len2) {
+                return false;
+            }
+
+            for (int i = 0; i < len1; i++) {
+                if (a1[start1 + i] != a2[start2 + i]) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
+    private interface IVideoFrameSender {
+        void onVideoFrame(byte[] data, long timestampUs);
+    }
+
+    private class MockVideoApp {
+        private IVideoStreamListener mListener;
+        private int mFPSNum;
+        private int mFPSDen;
+
+        MockVideoApp(IVideoStreamListener listener) {
+            mListener = listener;
+            // 29.97 fps
+            mFPSNum = 30000;
+            mFPSDen = 1001;
+        }
+
+        void inputByteStreamWithArray(ByteStreamNALUnit[] stream) {
+            generateFramesFromStream(stream, new IVideoFrameSender() {
+                @Override
+                public void onVideoFrame(byte[] data, long timestampUs) {
+                    byte[] buffer = new byte[data.length];
+                    System.arraycopy(data, 0, buffer, 0, data.length);
+                    mListener.sendFrame(buffer, 0, data.length, timestampUs);
+                }
+            });
+        }
+
+        void inputByteStreamWithArrayOffset(ByteStreamNALUnit[] stream) {
+            generateFramesFromStream(stream, new IVideoFrameSender() {
+                private int mDummyOffset = 0;
+
+                @Override
+                public void onVideoFrame(byte[] data, long timestampUs) {
+                    // to test 'offset' param, create a buffer with a dummy offset
+                    byte[] buffer = new byte[mDummyOffset + data.length];
+                    System.arraycopy(data, 0, buffer, mDummyOffset, data.length);
+
+                    mListener.sendFrame(buffer, mDummyOffset, data.length, timestampUs);
+                    mDummyOffset++;
+                }
+            });
+        }
+
+        void inputByteStreamWithByteBuffer(ByteStreamNALUnit[] stream) {
+            generateFramesFromStream(stream, new IVideoFrameSender() {
+                private int mDummyOffset = 0;
+
+                @Override
+                public void onVideoFrame(byte[] data, long timestampUs) {
+                    // add a dummy offset inside byteBuffer for testing
+                    ByteBuffer byteBuffer = ByteBuffer.allocate(mDummyOffset + data.length);
+                    byteBuffer.position(mDummyOffset);
+
+                    byteBuffer.put(data);
+                    byteBuffer.flip();
+                    byteBuffer.position(mDummyOffset);
+
+                    mListener.sendFrame(byteBuffer, timestampUs);
+                    mDummyOffset++;
+                }
+            });
+        }
+
+        void inputByteStreamWithDirectByteBuffer(ByteStreamNALUnit[] stream) {
+            generateFramesFromStream(stream, new IVideoFrameSender() {
+                private int mDummyOffset = 0;
+
+                @Override
+                public void onVideoFrame(byte[] data, long timestampUs) {
+                    // add a dummy offset inside byteBuffer for testing
+                    ByteBuffer byteBuffer = ByteBuffer.allocateDirect(mDummyOffset + data.length);
+                    byteBuffer.position(mDummyOffset);
+
+                    byteBuffer.put(data);
+                    byteBuffer.flip();
+                    byteBuffer.position(mDummyOffset);
+
+                    mListener.sendFrame(byteBuffer, timestampUs);
+                    mDummyOffset++;
+                }
+            });
+        }
+
+        private void generateFramesFromStream(ByteStreamNALUnit[] stream, IVideoFrameSender callback) {
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+            for (int i = 0; i < stream.length; i++) {
+                ByteStreamNALUnit bs = stream[i];
+                byte[] array = bs.createArray();
+                os.write(array, 0, array.length);
+
+                if (i < stream.length - 1) {
+                    ByteStreamNALUnit next = stream[i + 1];
+                    if (bs.frameNum == next.frameNum) {
+                        // enqueue it and send at once
+                        continue;
+                    }
+                }
+
+                long timestampUs = bs.frameNum * 1000L * 1000L * mFPSDen / mFPSNum;
+                byte[] data = os.toByteArray();
+                callback.onVideoFrame(data, timestampUs);
+                os.reset();
+            }
+
+            try {
+                os.close();
+            } catch (IOException e) {
+            }
+        }
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
index 4a0d7b87f..134de0519 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/SdlRemoteDisplayTest.java
@@ -28,12 +28,12 @@ public class SdlRemoteDisplayTest extends TestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        if(Looper.myLooper() == null){
+        if (Looper.myLooper() == null) {
             Looper.prepare();
         }
     }
 
-    public void testCreator(){
+    public void testCreator() {
         VirtualDisplayEncoder encoder = createVDE();
         assertNotNull(encoder);
 
@@ -46,7 +46,7 @@ public class SdlRemoteDisplayTest extends TestCase {
         assert true;
     }
 
-    public void testConstructor(){
+    public void testConstructor() {
         VirtualDisplayEncoder encoder = createVDE();
         assertNotNull(encoder);
         MockRemoteDisplay remoteDisplay = new MockRemoteDisplay(InstrumentationRegistry.getInstrumentation().getContext(), encoder.getVirtualDisplay());
@@ -57,7 +57,7 @@ public class SdlRemoteDisplayTest extends TestCase {
 
 
     @TargetApi(19)
-    public void testTouchEvents(){
+    public void testTouchEvents() {
         VirtualDisplayEncoder encoder = createVDE();
         assertNotNull(encoder);
         MockRemoteDisplay remoteDisplay = new MockRemoteDisplay(InstrumentationRegistry.getInstrumentation().getContext(), encoder.getVirtualDisplay());
@@ -66,9 +66,9 @@ public class SdlRemoteDisplayTest extends TestCase {
 
         assertNotNull(remoteDisplay.getMainView());
 
-        try{
+        try {
             remoteDisplay.handleMotionEvent(MotionEvent.obtain(10, System.currentTimeMillis(), MotionEvent.ACTION_DOWN, 100, 100, 0));
-        }catch (Exception e){
+        } catch (Exception e) {
             assert false;
         }
 
@@ -77,13 +77,13 @@ public class SdlRemoteDisplayTest extends TestCase {
     }
 
 
-    public VirtualDisplayEncoder createVDE(){
-        try{
+    public VirtualDisplayEncoder createVDE() {
+        try {
             VirtualDisplayEncoder displayEncoder = new VirtualDisplayEncoder();
             displayEncoder.init(InstrumentationRegistry.getInstrumentation().getContext(), new MockVideoStreamListener(), new VideoStreamingParameters());
             displayEncoder.start();
             return displayEncoder;
-        }catch (Exception e ){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return null;
@@ -92,7 +92,7 @@ public class SdlRemoteDisplayTest extends TestCase {
 
     //Mock classes
 
-    public static class MockRemoteDisplay extends SdlRemoteDisplay{
+    public static class MockRemoteDisplay extends SdlRemoteDisplay {
 
         public MockRemoteDisplay(Context context, Display display) {
             super(context, display);
@@ -102,14 +102,14 @@ public class SdlRemoteDisplayTest extends TestCase {
         @Override
         protected void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            setContentView( new RelativeLayout(getContext()));
+            setContentView(new RelativeLayout(getContext()));
 
         }
 
 
     }
 
-    class MockVideoStreamListener implements IVideoStreamListener{
+    class MockVideoStreamListener implements IVideoStreamListener {
 
         @Override
         public void sendFrame(byte[] data, int offset, int length, long presentationTimeUs) throws ArrayIndexOutOfBoundsException {
@@ -122,7 +122,7 @@ public class SdlRemoteDisplayTest extends TestCase {
         }
     }
 
-    class MockRemoteDisplayCallback implements SdlRemoteDisplay.Callback{
+    class MockRemoteDisplayCallback implements SdlRemoteDisplay.Callback {
 
         @Override
         public void onCreated(SdlRemoteDisplay remoteDisplay) {
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java
index a297a9626..ca7924e8f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java
@@ -162,10 +162,10 @@ public class VideoStreamingParametersTest {
     }
 
     @Test
-    public void testUpdateCapabilityFormat(){
+    public void testUpdateCapabilityFormat() {
         VideoStreamingCapability capability = new VideoStreamingCapability();
         capability.setMaxBitrate(10000);
-        capability.setPreferredResolution( new ImageResolution(800,600));
+        capability.setPreferredResolution(new ImageResolution(800, 600));
         capability.setIsHapticSpatialDataSupported(false);
 
         VideoStreamingFormat format = new VideoStreamingFormat(VideoStreamingProtocol.RAW, VideoStreamingCodec.H264);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java
index 34685897f..cd617eaed 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java
@@ -8,124 +8,124 @@ import com.smartdevicelink.trace.enums.Mod;
 import junit.framework.TestCase;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.trace.DiagLevel}
  */
 public class DiagLevelTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.trace.DiagLevel#setAllLevels(DetailLevel)}
-	 * {@link com.smartdevicelink.trace.DiagLevel#setLevel(Mod, DetailLevel)}
-	 * {@link com.smartdevicelink.trace.DiagLevel#getLevel(Mod)}
-	 * {@link com.smartdevicelink.trace.DiagLevel#isValidDetailLevel(String)}
-	 * {@link com.smartdevicelink.trace.DiagLevel#toDetailLevel(String)}
-	 */
-	public void testLevels () {
-		
-		// Test Values
-		Mod testMar   = Mod.mar;
-		Mod testRpc   = Mod.rpc;
-		Mod testApp   = Mod.app;
-		Mod testTran  = Mod.tran;
-		Mod testProxy = Mod.proxy;
-		Mod testProto = Mod.proto;
-		
-		String testOffS     = "off";
-		String testTerseS   = "terse";
-		String testVerboseS = "verbose";
-		String testInvalidS = "invalid";
-		
-		DetailLevel testOff     = DetailLevel.OFF;
-		DetailLevel testTerse   = DetailLevel.TERSE;
-		DetailLevel testVerbose = DetailLevel.VERBOSE;
-				
-		// Valid Tests
-		DiagLevel.setAllLevels(testVerbose);
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testProto));
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testProxy));
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testTran));
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testApp));
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testRpc));
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testMar));
-		
-		DiagLevel.setAllLevels(testTerse);
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testProto));
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testProxy));
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testTran));
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testApp));
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testRpc));
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testMar));
-		
-		DiagLevel.setAllLevels(testOff);
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testProto));
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testProxy));
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testTran));
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testApp));
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testRpc));
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testMar));
-		
-		
-		DiagLevel.setLevel(testMar, testVerbose);
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testMar));
-		DiagLevel.setLevel(testMar, testTerse);
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testMar));
-		DiagLevel.setLevel(testMar, testOff);
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testMar));
-		
-		DiagLevel.setLevel(testRpc, testVerbose);
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testRpc));
-		DiagLevel.setLevel(testRpc, testTerse);
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testRpc));
-		DiagLevel.setLevel(testRpc, testOff);
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testRpc));
-		
-		DiagLevel.setLevel(testApp, testVerbose);
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testApp));
-		DiagLevel.setLevel(testApp, testTerse);
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testApp));
-		DiagLevel.setLevel(testApp, testOff);
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testApp));
-		
-		DiagLevel.setLevel(testTran, testVerbose);
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testTran));
-		DiagLevel.setLevel(testTran, testTerse);
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testTran));
-		DiagLevel.setLevel(testTran, testOff);
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testTran));
-		
-		DiagLevel.setLevel(testProxy, testVerbose);
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testProxy));
-		DiagLevel.setLevel(testProxy, testTerse);
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testProxy));
-		DiagLevel.setLevel(testProxy, testOff);
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testProxy));
-		
-		DiagLevel.setLevel(testProto, testVerbose);
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testProto));
-		DiagLevel.setLevel(testProto, testTerse);
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testProto));
-		DiagLevel.setLevel(testProto, testOff);
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testProto));
-		
-		assertTrue(TestValues.TRUE, DiagLevel.isValidDetailLevel(testVerboseS));
-		assertTrue(TestValues.TRUE, DiagLevel.isValidDetailLevel(testTerseS));
-		assertTrue(TestValues.TRUE, DiagLevel.isValidDetailLevel(testOffS));
-		
-		assertEquals(TestValues.MATCH, testVerbose, DiagLevel.toDetailLevel(testVerboseS));
-		assertEquals(TestValues.MATCH, testTerse, DiagLevel.toDetailLevel(testTerseS));
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.toDetailLevel(testOffS));
-		assertEquals(TestValues.MATCH, testOff, DiagLevel.toDetailLevel(testInvalidS));
-		
-		try {
-			// Invalid/Null Tests
-			assertFalse(TestValues.FALSE, DiagLevel.isValidDetailLevel(testInvalidS));
-			assertFalse(TestValues.FALSE, DiagLevel.isValidDetailLevel(null));
-			assertNull(TestValues.NULL, DiagLevel.getLevel(null));
-			DiagLevel.setLevel(null, null);
-			DiagLevel.setAllLevels(null);
-		} catch (NullPointerException e) {
-			fail("NullPointerException was thrown when attempting to set null values.");
-		}
-	}
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.trace.DiagLevel#setAllLevels(DetailLevel)}
+     * {@link com.smartdevicelink.trace.DiagLevel#setLevel(Mod, DetailLevel)}
+     * {@link com.smartdevicelink.trace.DiagLevel#getLevel(Mod)}
+     * {@link com.smartdevicelink.trace.DiagLevel#isValidDetailLevel(String)}
+     * {@link com.smartdevicelink.trace.DiagLevel#toDetailLevel(String)}
+     */
+    public void testLevels() {
+
+        // Test Values
+        Mod testMar = Mod.mar;
+        Mod testRpc = Mod.rpc;
+        Mod testApp = Mod.app;
+        Mod testTran = Mod.tran;
+        Mod testProxy = Mod.proxy;
+        Mod testProto = Mod.proto;
+
+        String testOffS = "off";
+        String testTerseS = "terse";
+        String testVerboseS = "verbose";
+        String testInvalidS = "invalid";
+
+        DetailLevel testOff = DetailLevel.OFF;
+        DetailLevel testTerse = DetailLevel.TERSE;
+        DetailLevel testVerbose = DetailLevel.VERBOSE;
+
+        // Valid Tests
+        DiagLevel.setAllLevels(testVerbose);
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testProto));
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testProxy));
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testTran));
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testApp));
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testRpc));
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testMar));
+
+        DiagLevel.setAllLevels(testTerse);
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testProto));
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testProxy));
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testTran));
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testApp));
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testRpc));
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testMar));
+
+        DiagLevel.setAllLevels(testOff);
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testProto));
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testProxy));
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testTran));
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testApp));
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testRpc));
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testMar));
+
+
+        DiagLevel.setLevel(testMar, testVerbose);
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testMar));
+        DiagLevel.setLevel(testMar, testTerse);
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testMar));
+        DiagLevel.setLevel(testMar, testOff);
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testMar));
+
+        DiagLevel.setLevel(testRpc, testVerbose);
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testRpc));
+        DiagLevel.setLevel(testRpc, testTerse);
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testRpc));
+        DiagLevel.setLevel(testRpc, testOff);
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testRpc));
+
+        DiagLevel.setLevel(testApp, testVerbose);
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testApp));
+        DiagLevel.setLevel(testApp, testTerse);
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testApp));
+        DiagLevel.setLevel(testApp, testOff);
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testApp));
+
+        DiagLevel.setLevel(testTran, testVerbose);
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testTran));
+        DiagLevel.setLevel(testTran, testTerse);
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testTran));
+        DiagLevel.setLevel(testTran, testOff);
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testTran));
+
+        DiagLevel.setLevel(testProxy, testVerbose);
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testProxy));
+        DiagLevel.setLevel(testProxy, testTerse);
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testProxy));
+        DiagLevel.setLevel(testProxy, testOff);
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testProxy));
+
+        DiagLevel.setLevel(testProto, testVerbose);
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.getLevel(testProto));
+        DiagLevel.setLevel(testProto, testTerse);
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.getLevel(testProto));
+        DiagLevel.setLevel(testProto, testOff);
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.getLevel(testProto));
+
+        assertTrue(TestValues.TRUE, DiagLevel.isValidDetailLevel(testVerboseS));
+        assertTrue(TestValues.TRUE, DiagLevel.isValidDetailLevel(testTerseS));
+        assertTrue(TestValues.TRUE, DiagLevel.isValidDetailLevel(testOffS));
+
+        assertEquals(TestValues.MATCH, testVerbose, DiagLevel.toDetailLevel(testVerboseS));
+        assertEquals(TestValues.MATCH, testTerse, DiagLevel.toDetailLevel(testTerseS));
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.toDetailLevel(testOffS));
+        assertEquals(TestValues.MATCH, testOff, DiagLevel.toDetailLevel(testInvalidS));
+
+        try {
+            // Invalid/Null Tests
+            assertFalse(TestValues.FALSE, DiagLevel.isValidDetailLevel(testInvalidS));
+            assertFalse(TestValues.FALSE, DiagLevel.isValidDetailLevel(null));
+            assertNull(TestValues.NULL, DiagLevel.getLevel(null));
+            DiagLevel.setLevel(null, null);
+            DiagLevel.setAllLevels(null);
+        } catch (NullPointerException e) {
+            fail("NullPointerException was thrown when attempting to set null values.");
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java
index c28d4af87..2e4f59f01 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java
@@ -8,47 +8,47 @@ import junit.framework.TestCase;
 import java.io.UnsupportedEncodingException;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.trace.Mime}
  */
 public class MimeTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.trace.Mime#base64Encode(byte[])}
-	 * {@link com.smartdevicelink.trace.Mime#base64Encode(String)}
-	 * {@link com.smartdevicelink.trace.Mime#base64Encode(byte[], int, int)}
-	 */
-	public void testEncoding () {
-		
-		try {
-			// Test Values
-			String testString  = "test";
-			byte[] testBytes   = testString.getBytes("US-ASCII");
-			
-			// Comparison Values
-			String expectedEncodedString = "dGVzdA==";
-			String actualNullResult1    = Mime.base64Encode((byte[]) null);
-			String actualNullResult2    = Mime.base64Encode((String) null);	
-			String actualNullResult3    = Mime.base64Encode(null, 0, 0); 
-			String actualInvalidResult  = Mime.base64Encode(testBytes, 35, 2);
-			String actualEncodedString1 = Mime.base64Encode(testString);
-			String actualEncodedString2 = Mime.base64Encode(testBytes);
-			String actualEncodedString3 = Mime.base64Encode(testBytes, 0, testBytes.length);
-			
-			// Valid Tests
-			assertEquals(TestValues.MATCH, expectedEncodedString, actualEncodedString1);
-			assertEquals(TestValues.MATCH, expectedEncodedString, actualEncodedString2);
-			assertEquals(TestValues.MATCH, expectedEncodedString, actualEncodedString3);
-			
-			// Invalid/Null Tests
-			assertNull(TestValues.NULL, actualNullResult1);
-			assertNull(TestValues.NULL, actualNullResult2);
-			assertNull(TestValues.NULL, actualNullResult3);
-			assertNull(TestValues.NULL, actualInvalidResult);
-						
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-	}
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.trace.Mime#base64Encode(byte[])}
+     * {@link com.smartdevicelink.trace.Mime#base64Encode(String)}
+     * {@link com.smartdevicelink.trace.Mime#base64Encode(byte[], int, int)}
+     */
+    public void testEncoding() {
+
+        try {
+            // Test Values
+            String testString = "test";
+            byte[] testBytes = testString.getBytes("US-ASCII");
+
+            // Comparison Values
+            String expectedEncodedString = "dGVzdA==";
+            String actualNullResult1 = Mime.base64Encode((byte[]) null);
+            String actualNullResult2 = Mime.base64Encode((String) null);
+            String actualNullResult3 = Mime.base64Encode(null, 0, 0);
+            String actualInvalidResult = Mime.base64Encode(testBytes, 35, 2);
+            String actualEncodedString1 = Mime.base64Encode(testString);
+            String actualEncodedString2 = Mime.base64Encode(testBytes);
+            String actualEncodedString3 = Mime.base64Encode(testBytes, 0, testBytes.length);
+
+            // Valid Tests
+            assertEquals(TestValues.MATCH, expectedEncodedString, actualEncodedString1);
+            assertEquals(TestValues.MATCH, expectedEncodedString, actualEncodedString2);
+            assertEquals(TestValues.MATCH, expectedEncodedString, actualEncodedString3);
+
+            // Invalid/Null Tests
+            assertNull(TestValues.NULL, actualNullResult1);
+            assertNull(TestValues.NULL, actualNullResult2);
+            assertNull(TestValues.NULL, actualNullResult3);
+            assertNull(TestValues.NULL, actualInvalidResult);
+
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java
index 1a770f609..566aa7dfb 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java
@@ -9,116 +9,116 @@ import com.smartdevicelink.trace.enums.Mod;
 import junit.framework.TestCase;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.trace.SdlTrace}
  */
 public class SdlTraceTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.trace.SdlTrace#setAcceptAPITraceAdjustments(Boolean)}
-	 * {@link com.smartdevicelink.trace.SdlTrace#getAcceptAPITraceAdjustments()}
-	 */
-	public void testAdjustmentFlags () {
-		
-		SdlTrace.setAcceptAPITraceAdjustments(true);
-		assertTrue(TestValues.TRUE, SdlTrace.getAcceptAPITraceAdjustments());
-		
-		SdlTrace.setAcceptAPITraceAdjustments(false);
-		assertFalse(TestValues.FALSE, SdlTrace.getAcceptAPITraceAdjustments());
-		
-		// This should not change the value from the previous setting.
-		SdlTrace.setAcceptAPITraceAdjustments(null);
-		assertFalse(TestValues.FALSE, SdlTrace.getAcceptAPITraceAdjustments());
-	}
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.trace.SdlTrace#setAppTraceLevel(DetailLevel)}
-	 * {@link com.smartdevicelink.trace.SdlTrace#setProxyTraceLevel(DetailLevel)}
-	 * {@link com.smartdevicelink.trace.SdlTrace#setRpcTraceLevel(DetailLevel)}
-	 * {@link com.smartdevicelink.trace.SdlTrace#setMarshallingTraceLevel(DetailLevel)}
-	 * {@link com.smartdevicelink.trace.SdlTrace#setProtocolTraceLevel(DetailLevel)}
-	 * {@link com.smartdevicelink.trace.SdlTrace#setTransportTraceLevel(DetailLevel)}
-	 */
-	public void testTraceLevelFlags () {
-		
-		SdlTrace.setAcceptAPITraceAdjustments(true);
-		
-		// App Trace Level - - - - - - - - - - - - - - - - - - - - - - - - - - -
-		SdlTrace.setAppTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.app));
-		SdlTrace.setAppTraceLevel(DetailLevel.TERSE);
-		assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.app));
-		SdlTrace.setAppTraceLevel(DetailLevel.OFF);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.app));
-		
-		// This should not change the value from the previous setting.
-		SdlTrace.setAppTraceLevel(null);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.app));
-		
-		// Proxy Trace Level - - - - - - - - - - - - - - - - - - - - - - - - - -
-		SdlTrace.setProxyTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.proxy));
-		SdlTrace.setProxyTraceLevel(DetailLevel.TERSE);
-		assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.proxy));
-		SdlTrace.setProxyTraceLevel(DetailLevel.OFF);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proxy));
-		
-		// This should not change the value from the previous setting.
-		SdlTrace.setProxyTraceLevel(null);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proxy));
-		
-		// Rpc Trace Level - - - - - - - - - - - - - - - - - - - - - - - - - - -
-		SdlTrace.setRpcTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.rpc));
-		SdlTrace.setRpcTraceLevel(DetailLevel.TERSE);
-		assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.rpc));
-		SdlTrace.setRpcTraceLevel(DetailLevel.OFF);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.rpc));
-		
-		// This should not change the value from the previous setting.
-		SdlTrace.setRpcTraceLevel(null);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.rpc));
-		
-		// Marshalling Trace Level - - - - - - - - - - - - - - - - - - - - - - -
-		SdlTrace.setMarshallingTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.mar));
-		SdlTrace.setMarshallingTraceLevel(DetailLevel.TERSE);
-		assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.mar));
-		SdlTrace.setMarshallingTraceLevel(DetailLevel.OFF);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.mar));
-		
-		// This should not change the value from the previous setting.
-		SdlTrace.setMarshallingTraceLevel(null);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.mar));
-		
-		// Protocol Trace Level - - - - - - - - - - - - - - - - - - - - - - - -
-		SdlTrace.setProtocolTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.proto));
-		SdlTrace.setProtocolTraceLevel(DetailLevel.TERSE);
-		assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.proto));
-		SdlTrace.setProtocolTraceLevel(DetailLevel.OFF);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proto));
-		
-		// This should not change the value from the previous setting.
-		SdlTrace.setProtocolTraceLevel(null);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proto));
-		
-		// Transport Trace Level - - - - - - - - - - - - - - - - - - - - - - - -
-		SdlTrace.setTransportTraceLevel(DetailLevel.VERBOSE);
-		assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.tran));
-		SdlTrace.setTransportTraceLevel(DetailLevel.TERSE);
-		assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.tran));
-		SdlTrace.setTransportTraceLevel(DetailLevel.OFF);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.tran));
-		
-		// This should not change the value from the previous setting.
-		SdlTrace.setTransportTraceLevel(null);
-		assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.tran));
-	}
-	
-	// NOTE : No testing can currently be done for the logging methods.
-		
-	// NOTE : Cannot test for Bluetooth connected information currently.
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.trace.SdlTrace#setAcceptAPITraceAdjustments(Boolean)}
+     * {@link com.smartdevicelink.trace.SdlTrace#getAcceptAPITraceAdjustments()}
+     */
+    public void testAdjustmentFlags() {
+
+        SdlTrace.setAcceptAPITraceAdjustments(true);
+        assertTrue(TestValues.TRUE, SdlTrace.getAcceptAPITraceAdjustments());
+
+        SdlTrace.setAcceptAPITraceAdjustments(false);
+        assertFalse(TestValues.FALSE, SdlTrace.getAcceptAPITraceAdjustments());
+
+        // This should not change the value from the previous setting.
+        SdlTrace.setAcceptAPITraceAdjustments(null);
+        assertFalse(TestValues.FALSE, SdlTrace.getAcceptAPITraceAdjustments());
+    }
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.trace.SdlTrace#setAppTraceLevel(DetailLevel)}
+     * {@link com.smartdevicelink.trace.SdlTrace#setProxyTraceLevel(DetailLevel)}
+     * {@link com.smartdevicelink.trace.SdlTrace#setRpcTraceLevel(DetailLevel)}
+     * {@link com.smartdevicelink.trace.SdlTrace#setMarshallingTraceLevel(DetailLevel)}
+     * {@link com.smartdevicelink.trace.SdlTrace#setProtocolTraceLevel(DetailLevel)}
+     * {@link com.smartdevicelink.trace.SdlTrace#setTransportTraceLevel(DetailLevel)}
+     */
+    public void testTraceLevelFlags() {
+
+        SdlTrace.setAcceptAPITraceAdjustments(true);
+
+        // App Trace Level - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        SdlTrace.setAppTraceLevel(DetailLevel.VERBOSE);
+        assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.app));
+        SdlTrace.setAppTraceLevel(DetailLevel.TERSE);
+        assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.app));
+        SdlTrace.setAppTraceLevel(DetailLevel.OFF);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.app));
+
+        // This should not change the value from the previous setting.
+        SdlTrace.setAppTraceLevel(null);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.app));
+
+        // Proxy Trace Level - - - - - - - - - - - - - - - - - - - - - - - - - -
+        SdlTrace.setProxyTraceLevel(DetailLevel.VERBOSE);
+        assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.proxy));
+        SdlTrace.setProxyTraceLevel(DetailLevel.TERSE);
+        assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.proxy));
+        SdlTrace.setProxyTraceLevel(DetailLevel.OFF);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proxy));
+
+        // This should not change the value from the previous setting.
+        SdlTrace.setProxyTraceLevel(null);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proxy));
+
+        // Rpc Trace Level - - - - - - - - - - - - - - - - - - - - - - - - - - -
+        SdlTrace.setRpcTraceLevel(DetailLevel.VERBOSE);
+        assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.rpc));
+        SdlTrace.setRpcTraceLevel(DetailLevel.TERSE);
+        assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.rpc));
+        SdlTrace.setRpcTraceLevel(DetailLevel.OFF);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.rpc));
+
+        // This should not change the value from the previous setting.
+        SdlTrace.setRpcTraceLevel(null);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.rpc));
+
+        // Marshalling Trace Level - - - - - - - - - - - - - - - - - - - - - - -
+        SdlTrace.setMarshallingTraceLevel(DetailLevel.VERBOSE);
+        assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.mar));
+        SdlTrace.setMarshallingTraceLevel(DetailLevel.TERSE);
+        assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.mar));
+        SdlTrace.setMarshallingTraceLevel(DetailLevel.OFF);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.mar));
+
+        // This should not change the value from the previous setting.
+        SdlTrace.setMarshallingTraceLevel(null);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.mar));
+
+        // Protocol Trace Level - - - - - - - - - - - - - - - - - - - - - - - -
+        SdlTrace.setProtocolTraceLevel(DetailLevel.VERBOSE);
+        assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.proto));
+        SdlTrace.setProtocolTraceLevel(DetailLevel.TERSE);
+        assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.proto));
+        SdlTrace.setProtocolTraceLevel(DetailLevel.OFF);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proto));
+
+        // This should not change the value from the previous setting.
+        SdlTrace.setProtocolTraceLevel(null);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.proto));
+
+        // Transport Trace Level - - - - - - - - - - - - - - - - - - - - - - - -
+        SdlTrace.setTransportTraceLevel(DetailLevel.VERBOSE);
+        assertEquals(TestValues.MATCH, DetailLevel.VERBOSE, DiagLevel.getLevel(Mod.tran));
+        SdlTrace.setTransportTraceLevel(DetailLevel.TERSE);
+        assertEquals(TestValues.MATCH, DetailLevel.TERSE, DiagLevel.getLevel(Mod.tran));
+        SdlTrace.setTransportTraceLevel(DetailLevel.OFF);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.tran));
+
+        // This should not change the value from the previous setting.
+        SdlTrace.setTransportTraceLevel(null);
+        assertEquals(TestValues.MATCH, DetailLevel.OFF, DiagLevel.getLevel(Mod.tran));
+    }
+
+    // NOTE : No testing can currently be done for the logging methods.
+
+    // NOTE : Cannot test for Bluetooth connected information currently.
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java
index 07cd3e56e..8cb5eee63 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java
@@ -10,54 +10,54 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.trace.enums.DetailLevel}
  */
 public class DetailLevelTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following enum : 
-	 * {@link com.smartdevicelink.trace.enums.DetailLevel}
-	 */
-	public void testDetailLevelEnum () {
-		
-		// Test Values
-		String testOff     = "OFF";
-		String testTerse   = "TERSE";
-		String testInvalid = "INVALID";
-		String testVerbose = "VERBOSE";
-		
-		try {
-			// Comparison Values
-			DetailLevel expectedOffEnum        = DetailLevel.OFF;
-			DetailLevel expectedTerseEnum      = DetailLevel.TERSE;
-			DetailLevel expectedVerboseEnum    = DetailLevel.VERBOSE;
-			List<DetailLevel> expectedEnumList = new ArrayList<DetailLevel>();
-			expectedEnumList.add(DetailLevel.OFF);
-			expectedEnumList.add(DetailLevel.TERSE);
-			expectedEnumList.add(DetailLevel.VERBOSE);
-			
-			DetailLevel actualNullEnum       = DetailLevel.valueForString(null);
-			DetailLevel actualOffEnum        = DetailLevel.valueForString(testOff);
-			DetailLevel actualTerseEnum      = DetailLevel.valueForString(testTerse);
-			DetailLevel actualInvalidEnum    = DetailLevel.valueForString(testInvalid);
-			DetailLevel actualVerboseEnum    = DetailLevel.valueForString(testVerbose);
-			List<DetailLevel> actualEnumList = Arrays.asList(DetailLevel.values());
-			
-			// Valid Tests
-			assertEquals(TestValues.MATCH, expectedOffEnum, actualOffEnum);
-			assertEquals(TestValues.MATCH, expectedTerseEnum, actualTerseEnum);
-			assertEquals(TestValues.MATCH, expectedVerboseEnum, actualVerboseEnum);
-			assertTrue(TestValues.ARRAY, expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
-			
-			// Invalid/Null Tests
-			assertNull(TestValues.NULL, actualInvalidEnum);
-			assertNull(TestValues.NULL, actualNullEnum);
-			
-		}catch (NullPointerException e) {
-			fail("Could not retrieve value for null string, should return null.");
-		} catch (IllegalArgumentException e) {
-			fail("Could not retrieve value for invalid string, should return null.");
-		}
-	}
+
+    /**
+     * This is a unit test for the following enum :
+     * {@link com.smartdevicelink.trace.enums.DetailLevel}
+     */
+    public void testDetailLevelEnum() {
+
+        // Test Values
+        String testOff = "OFF";
+        String testTerse = "TERSE";
+        String testInvalid = "INVALID";
+        String testVerbose = "VERBOSE";
+
+        try {
+            // Comparison Values
+            DetailLevel expectedOffEnum = DetailLevel.OFF;
+            DetailLevel expectedTerseEnum = DetailLevel.TERSE;
+            DetailLevel expectedVerboseEnum = DetailLevel.VERBOSE;
+            List<DetailLevel> expectedEnumList = new ArrayList<DetailLevel>();
+            expectedEnumList.add(DetailLevel.OFF);
+            expectedEnumList.add(DetailLevel.TERSE);
+            expectedEnumList.add(DetailLevel.VERBOSE);
+
+            DetailLevel actualNullEnum = DetailLevel.valueForString(null);
+            DetailLevel actualOffEnum = DetailLevel.valueForString(testOff);
+            DetailLevel actualTerseEnum = DetailLevel.valueForString(testTerse);
+            DetailLevel actualInvalidEnum = DetailLevel.valueForString(testInvalid);
+            DetailLevel actualVerboseEnum = DetailLevel.valueForString(testVerbose);
+            List<DetailLevel> actualEnumList = Arrays.asList(DetailLevel.values());
+
+            // Valid Tests
+            assertEquals(TestValues.MATCH, expectedOffEnum, actualOffEnum);
+            assertEquals(TestValues.MATCH, expectedTerseEnum, actualTerseEnum);
+            assertEquals(TestValues.MATCH, expectedVerboseEnum, actualVerboseEnum);
+            assertTrue(TestValues.ARRAY, expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
+
+            // Invalid/Null Tests
+            assertNull(TestValues.NULL, actualInvalidEnum);
+            assertNull(TestValues.NULL, actualNullEnum);
+
+        } catch (NullPointerException e) {
+            fail("Could not retrieve value for null string, should return null.");
+        } catch (IllegalArgumentException e) {
+            fail("Could not retrieve value for invalid string, should return null.");
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java
index 32aae24b1..2d687ed33 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java
@@ -10,54 +10,54 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.trace.enums.InterfaceActivityDirection}
  */
 public class InterfaceActivityDirectionTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following enum : 
-	 * {@link com.smartdevicelink.trace.enums.InterfaceActivityDirection}
-	 */
-	public void testInterfaceActivityDirectionEnum () {
-		
-		// Test Values
-		String testNone     = "None";
-		String testInvalid  = "Invalid";
-		String testReceive  = "Receive";
-		String testTransmit	= "Transmit";
-		
-		try {
-			// Comparison Values
-			InterfaceActivityDirection expectedNoneEnum       = InterfaceActivityDirection.None;
-			InterfaceActivityDirection expectedReceiveEnum    = InterfaceActivityDirection.Receive;
-			InterfaceActivityDirection expectedTransmitEnum   = InterfaceActivityDirection.Transmit;
-			List<InterfaceActivityDirection> expectedEnumList = new ArrayList<InterfaceActivityDirection>();
-			expectedEnumList.add(InterfaceActivityDirection.None);
-			expectedEnumList.add(InterfaceActivityDirection.Receive);
-			expectedEnumList.add(InterfaceActivityDirection.Transmit);
-			
-			InterfaceActivityDirection actualNullEnum       = InterfaceActivityDirection.valueForString(null);
-			InterfaceActivityDirection actualNoneEnum       = InterfaceActivityDirection.valueForString(testNone);
-			InterfaceActivityDirection actualInvalidEnum    = InterfaceActivityDirection.valueForString(testInvalid);
-			InterfaceActivityDirection actualReceiveEnum    = InterfaceActivityDirection.valueForString(testReceive);
-			InterfaceActivityDirection actualTransmitEnum   = InterfaceActivityDirection.valueForString(testTransmit);
-			List<InterfaceActivityDirection> actualEnumList = Arrays.asList(InterfaceActivityDirection.values());
-			
-			// Valid Tests
-			assertEquals(TestValues.MATCH, expectedNoneEnum, actualNoneEnum);
-			assertEquals(TestValues.MATCH, expectedReceiveEnum, actualReceiveEnum);
-			assertEquals(TestValues.MATCH, expectedTransmitEnum, actualTransmitEnum);
-			assertTrue(TestValues.ARRAY, expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
-						
-			// Invalid/Null 
-			assertNull(TestValues.NULL, actualInvalidEnum);
-			assertNull(TestValues.NULL, actualNullEnum);
-			
-		} catch (NullPointerException e) {
-			fail("Could not retrieve value for null string, should return null.");
-		} catch (IllegalArgumentException e) {
-			fail("Could not retrieve value for invalid string, should return null.");
-		}	
-	}
+
+    /**
+     * This is a unit test for the following enum :
+     * {@link com.smartdevicelink.trace.enums.InterfaceActivityDirection}
+     */
+    public void testInterfaceActivityDirectionEnum() {
+
+        // Test Values
+        String testNone = "None";
+        String testInvalid = "Invalid";
+        String testReceive = "Receive";
+        String testTransmit = "Transmit";
+
+        try {
+            // Comparison Values
+            InterfaceActivityDirection expectedNoneEnum = InterfaceActivityDirection.None;
+            InterfaceActivityDirection expectedReceiveEnum = InterfaceActivityDirection.Receive;
+            InterfaceActivityDirection expectedTransmitEnum = InterfaceActivityDirection.Transmit;
+            List<InterfaceActivityDirection> expectedEnumList = new ArrayList<InterfaceActivityDirection>();
+            expectedEnumList.add(InterfaceActivityDirection.None);
+            expectedEnumList.add(InterfaceActivityDirection.Receive);
+            expectedEnumList.add(InterfaceActivityDirection.Transmit);
+
+            InterfaceActivityDirection actualNullEnum = InterfaceActivityDirection.valueForString(null);
+            InterfaceActivityDirection actualNoneEnum = InterfaceActivityDirection.valueForString(testNone);
+            InterfaceActivityDirection actualInvalidEnum = InterfaceActivityDirection.valueForString(testInvalid);
+            InterfaceActivityDirection actualReceiveEnum = InterfaceActivityDirection.valueForString(testReceive);
+            InterfaceActivityDirection actualTransmitEnum = InterfaceActivityDirection.valueForString(testTransmit);
+            List<InterfaceActivityDirection> actualEnumList = Arrays.asList(InterfaceActivityDirection.values());
+
+            // Valid Tests
+            assertEquals(TestValues.MATCH, expectedNoneEnum, actualNoneEnum);
+            assertEquals(TestValues.MATCH, expectedReceiveEnum, actualReceiveEnum);
+            assertEquals(TestValues.MATCH, expectedTransmitEnum, actualTransmitEnum);
+            assertTrue(TestValues.ARRAY, expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
+
+            // Invalid/Null
+            assertNull(TestValues.NULL, actualInvalidEnum);
+            assertNull(TestValues.NULL, actualNullEnum);
+
+        } catch (NullPointerException e) {
+            fail("Could not retrieve value for null string, should return null.");
+        } catch (IllegalArgumentException e) {
+            fail("Could not retrieve value for invalid string, should return null.");
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java
index c2621d789..7503f9dc2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java
@@ -10,70 +10,70 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.trace.enums.Mod}
  */
 public class ModTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following enum : 
-	 * {@link com.smartdevicelink.trace.enums.Mod}
-	 */
-	public void testModEnum () {
-		
-		// TestValues
-		String testApp     = "app";
-		String testRpc     = "rpc";
-		String testMar     = "mar";
-		String testTran    = "tran";
-		String testProto   = "proto";
-		String testProxy   = "proxy";
-		String testInvalid = "invalid";
-		
-		try {
-			// Comparison Values
-			Mod expectedAppEnum   = Mod.app;
-			Mod expectedRpcEnum   = Mod.rpc;
-			Mod expectedMarEnum   = Mod.mar;
-			Mod expectedTranEnum  = Mod.tran;
-			Mod expectedProtoEnum = Mod.proto;
-			Mod expectedProxyEnum = Mod.proxy;
-			List<Mod> expectedEnumList = new ArrayList<Mod>();
-			expectedEnumList.add(Mod.app);
-			expectedEnumList.add(Mod.rpc);
-			expectedEnumList.add(Mod.mar);
-			expectedEnumList.add(Mod.tran);
-			expectedEnumList.add(Mod.proto);
-			expectedEnumList.add(Mod.proxy);
-			
-			Mod actualNullEnum       = Mod.valueForString(null);
-			Mod actualAppEnum        = Mod.valueForString(testApp);
-			Mod actualRpcEnum        = Mod.valueForString(testRpc);
-			Mod actualMarEnum        = Mod.valueForString(testMar);
-			Mod actualTranEnum       = Mod.valueForString(testTran);
-			Mod actualProtoEnum      = Mod.valueForString(testProto);
-			Mod actualProxyEnum      = Mod.valueForString(testProxy);
-			Mod actualInvalidEnum    = Mod.valueForString(testInvalid);
-			List<Mod> actualEnumList = Arrays.asList(Mod.values());
-			
-			// Valid Tests
-			assertEquals(TestValues.MATCH, expectedAppEnum, actualAppEnum);
-			assertEquals(TestValues.MATCH, expectedRpcEnum, actualRpcEnum);
-			assertEquals(TestValues.MATCH, expectedMarEnum, actualMarEnum);
-			assertEquals(TestValues.MATCH, expectedTranEnum, actualTranEnum);
-			assertEquals(TestValues.MATCH, expectedProtoEnum, actualProtoEnum);
-			assertEquals(TestValues.MATCH, expectedProxyEnum, actualProxyEnum);
-			assertTrue(TestValues.ARRAY, expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
-			
-			// Invalid/Null Tests
-			assertNull(TestValues.NULL, actualInvalidEnum);
-			assertNull(TestValues.NULL, actualNullEnum);
-			
-		} catch (NullPointerException e) {
-			fail("Could not retrieve value for null string, should return null.");
-		} catch (IllegalArgumentException e) {
-			fail("Could not retrieve value for invalid string, should return null.");
-		}
-		
-	}
+
+    /**
+     * This is a unit test for the following enum :
+     * {@link com.smartdevicelink.trace.enums.Mod}
+     */
+    public void testModEnum() {
+
+        // TestValues
+        String testApp = "app";
+        String testRpc = "rpc";
+        String testMar = "mar";
+        String testTran = "tran";
+        String testProto = "proto";
+        String testProxy = "proxy";
+        String testInvalid = "invalid";
+
+        try {
+            // Comparison Values
+            Mod expectedAppEnum = Mod.app;
+            Mod expectedRpcEnum = Mod.rpc;
+            Mod expectedMarEnum = Mod.mar;
+            Mod expectedTranEnum = Mod.tran;
+            Mod expectedProtoEnum = Mod.proto;
+            Mod expectedProxyEnum = Mod.proxy;
+            List<Mod> expectedEnumList = new ArrayList<Mod>();
+            expectedEnumList.add(Mod.app);
+            expectedEnumList.add(Mod.rpc);
+            expectedEnumList.add(Mod.mar);
+            expectedEnumList.add(Mod.tran);
+            expectedEnumList.add(Mod.proto);
+            expectedEnumList.add(Mod.proxy);
+
+            Mod actualNullEnum = Mod.valueForString(null);
+            Mod actualAppEnum = Mod.valueForString(testApp);
+            Mod actualRpcEnum = Mod.valueForString(testRpc);
+            Mod actualMarEnum = Mod.valueForString(testMar);
+            Mod actualTranEnum = Mod.valueForString(testTran);
+            Mod actualProtoEnum = Mod.valueForString(testProto);
+            Mod actualProxyEnum = Mod.valueForString(testProxy);
+            Mod actualInvalidEnum = Mod.valueForString(testInvalid);
+            List<Mod> actualEnumList = Arrays.asList(Mod.values());
+
+            // Valid Tests
+            assertEquals(TestValues.MATCH, expectedAppEnum, actualAppEnum);
+            assertEquals(TestValues.MATCH, expectedRpcEnum, actualRpcEnum);
+            assertEquals(TestValues.MATCH, expectedMarEnum, actualMarEnum);
+            assertEquals(TestValues.MATCH, expectedTranEnum, actualTranEnum);
+            assertEquals(TestValues.MATCH, expectedProtoEnum, actualProtoEnum);
+            assertEquals(TestValues.MATCH, expectedProxyEnum, actualProxyEnum);
+            assertTrue(TestValues.ARRAY, expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
+
+            // Invalid/Null Tests
+            assertNull(TestValues.NULL, actualInvalidEnum);
+            assertNull(TestValues.NULL, actualNullEnum);
+
+        } catch (NullPointerException e) {
+            fail("Could not retrieve value for null string, should return null.");
+        } catch (IllegalArgumentException e) {
+            fail("Could not retrieve value for invalid string, should return null.");
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
index 8fcde0456..fcb77c3cf 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
@@ -7,41 +7,46 @@ import com.smartdevicelink.transport.enums.TransportType;
 import junit.framework.TestCase;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.transport.BaseTransportConfig}
  */
 public class BaseTransportConfigTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.transport.BaseTransportConfig#getTransportType()}
-	 * {@link com.smartdevicelink.transport.BaseTransportConfig#getHeartBeatTimeout()}
-	 * {@link com.smartdevicelink.transport.BaseTransportConfig#setHeartBeatTimeout(int)}
-	 */
-	public void testConfigs () {
-		
-		// Test Values
-		int testInt = 10;
-		MockBaseTransportConfig testBaseTransportConfig = new MockBaseTransportConfig();
-		
-		// Comparison Values
-		int     expectedMaxValue      = Integer.MAX_VALUE;
-		int     actualMaxValue        = testBaseTransportConfig.getHeartBeatTimeout();
-		
-		// Valid Tests
-		assertNotNull(TestValues.NOT_NULL, testBaseTransportConfig);
-		assertEquals(TestValues.MATCH, expectedMaxValue, actualMaxValue);
-
-		testBaseTransportConfig.setHeartBeatTimeout(testInt);
-		assertEquals(TestValues.MATCH, testInt, testBaseTransportConfig.getHeartBeatTimeout());
-	}
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.transport.BaseTransportConfig#getTransportType()}
+     * {@link com.smartdevicelink.transport.BaseTransportConfig#getHeartBeatTimeout()}
+     * {@link com.smartdevicelink.transport.BaseTransportConfig#setHeartBeatTimeout(int)}
+     */
+    public void testConfigs() {
+
+        // Test Values
+        int testInt = 10;
+        MockBaseTransportConfig testBaseTransportConfig = new MockBaseTransportConfig();
+
+        // Comparison Values
+        int expectedMaxValue = Integer.MAX_VALUE;
+        int actualMaxValue = testBaseTransportConfig.getHeartBeatTimeout();
+
+        // Valid Tests
+        assertNotNull(TestValues.NOT_NULL, testBaseTransportConfig);
+        assertEquals(TestValues.MATCH, expectedMaxValue, actualMaxValue);
+
+        testBaseTransportConfig.setHeartBeatTimeout(testInt);
+        assertEquals(TestValues.MATCH, testInt, testBaseTransportConfig.getHeartBeatTimeout());
+    }
 }
 
 /**
- * This is a mock class for testing the following : 
+ * This is a mock class for testing the following :
  * {@link com.smartdevicelink.transport.BaseTransportConfig}
  */
-class MockBaseTransportConfig extends BaseTransportConfig {	
-	public MockBaseTransportConfig () { }
-	@Override public TransportType getTransportType() { return null; }
+class MockBaseTransportConfig extends BaseTransportConfig {
+    public MockBaseTransportConfig() {
+    }
+
+    @Override
+    public TransportType getTransportType() {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
index 51916ea16..5d9f75268 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
@@ -12,68 +12,69 @@ import junit.framework.TestCase;
 
 
 public class MultiplexBluetoothTransportTest extends TestCase {
-	
-	private static final Object REQUEST_LOCK = new Object();
-	
-	MultiplexBluetoothTransport bluetooth;
-	boolean didCorrectThing = false, isWaitingForResponse = false;
-	
-	//Example handler
-	Handler stateChangeHandler;
-	
-	public void testStateTransitions() {
-		if(Looper.myLooper() == null){
-			Looper.prepare();
-		}
-
-		stateChangeHandler = new Handler(){
-			int stateDesired = MultiplexBluetoothTransport.STATE_LISTEN;
-			@Override
-			public void handleMessage(Message msg) {
-				if(!isWaitingForResponse){
-					return;
-				}
-				switch(msg.what){
-					case SdlRouterService.MESSAGE_STATE_CHANGE:
-						if(msg.arg1 == stateDesired){
-							didCorrectThing = true;
-							break;
-						}
-					default:
-						didCorrectThing = false;
-				}
-				REQUEST_LOCK.notify();
-			}
-
-		};
-
-		bluetooth = new MultiplexBluetoothTransport(stateChangeHandler);
-		assertEquals(bluetooth.getState(), MultiplexBluetoothTransport.STATE_NONE);
-
-		bluetooth.start();
-		if(DeviceUtil.isEmulator()){
-			assertEquals(bluetooth.getState(), MultiplexBluetoothTransport.STATE_NONE);
-		}else{
-			assertEquals(bluetooth.getState(), MultiplexBluetoothTransport.STATE_LISTEN);
-		}
-
-		bluetooth.stop();
-		assertEquals(bluetooth.getState(), MultiplexBluetoothTransport.STATE_NONE);
-	}
-	
-	private void notifyResponseReceived(){
-		REQUEST_LOCK.notify();
-	}
-	
-	private void waitForResponse(){
-		synchronized(REQUEST_LOCK){
-			try {
-				REQUEST_LOCK.wait();
-				assertTrue(didCorrectThing);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-	}
+
+    private static final Object REQUEST_LOCK = new Object();
+
+    MultiplexBluetoothTransport bluetooth;
+    boolean didCorrectThing = false, isWaitingForResponse = false;
+
+    //Example handler
+    Handler stateChangeHandler;
+
+    public void testStateTransitions() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        stateChangeHandler = new Handler() {
+            int stateDesired = MultiplexBluetoothTransport.STATE_LISTEN;
+
+            @Override
+            public void handleMessage(Message msg) {
+                if (!isWaitingForResponse) {
+                    return;
+                }
+                switch (msg.what) {
+                    case SdlRouterService.MESSAGE_STATE_CHANGE:
+                        if (msg.arg1 == stateDesired) {
+                            didCorrectThing = true;
+                            break;
+                        }
+                    default:
+                        didCorrectThing = false;
+                }
+                REQUEST_LOCK.notify();
+            }
+
+        };
+
+        bluetooth = new MultiplexBluetoothTransport(stateChangeHandler);
+        assertEquals(bluetooth.getState(), MultiplexBluetoothTransport.STATE_NONE);
+
+        bluetooth.start();
+        if (DeviceUtil.isEmulator()) {
+            assertEquals(bluetooth.getState(), MultiplexBluetoothTransport.STATE_NONE);
+        } else {
+            assertEquals(bluetooth.getState(), MultiplexBluetoothTransport.STATE_LISTEN);
+        }
+
+        bluetooth.stop();
+        assertEquals(bluetooth.getState(), MultiplexBluetoothTransport.STATE_NONE);
+    }
+
+    private void notifyResponseReceived() {
+        REQUEST_LOCK.notify();
+    }
+
+    private void waitForResponse() {
+        synchronized (REQUEST_LOCK) {
+            try {
+                REQUEST_LOCK.wait();
+                assertTrue(didCorrectThing);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
index 53fe30114..c2f0a048d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
@@ -13,20 +13,20 @@ import static junit.framework.TestCase.assertEquals;
 @RunWith(AndroidJUnit4.class)
 public class MultiplexTransportConfigTests {
 
-	@Test
-	public void testDefaultSecurity(){
-		MultiplexTransportConfig config = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "2341");
-		assertEquals(config.getSecurityLevel(), MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED);
-	}
-
-	@Test
-	public void testSettingSecurity(){
-		MultiplexTransportConfig config = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "2341", MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-		assertEquals(config.getSecurityLevel(), MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-		
-		config = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "2341");
-		config.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-		assertEquals(config.getSecurityLevel(), MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-	}
-	
+    @Test
+    public void testDefaultSecurity() {
+        MultiplexTransportConfig config = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "2341");
+        assertEquals(config.getSecurityLevel(), MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED);
+    }
+
+    @Test
+    public void testSettingSecurity() {
+        MultiplexTransportConfig config = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "2341", MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+        assertEquals(config.getSecurityLevel(), MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+
+        config = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), "2341");
+        config.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+        assertEquals(config.getSecurityLevel(), MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+    }
+
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java
index 48b0eebb2..64b0cb768 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java
@@ -13,82 +13,82 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.transport.SdlPsm}
  */
 public class SdlPsmTests extends TestCase {
-	private static final String TAG = "SdlPsmTests";
-	private static final int MAX_DATA_LENGTH = SdlProtocol.V1_V2_MTU_SIZE - SdlProtocol.V1_HEADER_SIZE;
-	SdlPsm sdlPsm;
-	Field frameType, dataLength, version, controlFrameInfo;
-	Method transitionOnInput;
-	byte rawByte = (byte) 0x0;
-	
-	protected void setUp() throws Exception{
-		super.setUp();
-		sdlPsm = new SdlPsm();
-		transitionOnInput = SdlPsm.class.getDeclaredMethod("transitionOnInput", byte.class, int.class);
-		transitionOnInput.setAccessible(true);
-		
-		frameType = SdlPsm.class.getDeclaredField("frameType");
-		dataLength = SdlPsm.class.getDeclaredField("dataLength");
-		version = SdlPsm.class.getDeclaredField("version");
-		controlFrameInfo = SdlPsm.class.getDeclaredField("controlFrameInfo");
-		frameType.setAccessible(true);
-		dataLength.setAccessible(true);
-		version.setAccessible(true);
-		controlFrameInfo.setAccessible(true);
-	}
-	
-
-	public void testGarbledControlFrame() {
-		try{
-			rawByte = 0x0;
-			version.set(sdlPsm, 1);
-			controlFrameInfo.set(sdlPsm, SdlPacket.FRAME_INFO_START_SERVICE);
-			frameType.set(sdlPsm, SdlPacket.FRAME_TYPE_CONTROL);
-			
-			dataLength.set(sdlPsm, MAX_DATA_LENGTH + 1);
-			int STATE = (Integer) transitionOnInput.invoke(sdlPsm, rawByte, SdlPsm.DATA_SIZE_4_STATE);
-			
-			assertEquals(TestValues.MATCH, SdlPsm.ERROR_STATE, STATE);
-		}catch (Exception e){
-			Log.e(TAG, e.toString());
-		}
-	}
-	
-	public void testMaximumControlFrame(){
-		try{
-			rawByte = 0x0;
-			version.set(sdlPsm, 1);
-			controlFrameInfo.set(sdlPsm, SdlPacket.FRAME_INFO_START_SERVICE);
-			frameType.set(sdlPsm, SdlPacket.FRAME_TYPE_CONTROL);
-			
-			dataLength.set(sdlPsm, MAX_DATA_LENGTH);
-			int STATE = (Integer) transitionOnInput.invoke(sdlPsm, rawByte, SdlPsm.DATA_SIZE_4_STATE);
-			
-			assertEquals(TestValues.MATCH, SdlPsm.DATA_PUMP_STATE, STATE);
-		}catch (Exception e){
-			Log.e(TAG, e.toString());
-		}	
-	}
-	
-	public void testOutOfMemoryDS4(){
-		try{
-			rawByte = 0x0;
-			version.set(sdlPsm, 1);
-			frameType.set(sdlPsm, SdlPacket.FRAME_TYPE_SINGLE);
-			
-			dataLength.set(sdlPsm, 2147483647);
-			int STATE = (Integer) transitionOnInput.invoke(sdlPsm, rawByte, SdlPsm.DATA_SIZE_4_STATE);
-			
-			assertEquals(TestValues.MATCH, SdlPsm.ERROR_STATE, STATE);
-		}catch (Exception e){
-			Log.e(TAG, e.toString());
-		}
-	}
-	
-	protected void tearDown() throws Exception{
-		super.tearDown();
-	}
+    private static final String TAG = "SdlPsmTests";
+    private static final int MAX_DATA_LENGTH = SdlProtocol.V1_V2_MTU_SIZE - SdlProtocol.V1_HEADER_SIZE;
+    SdlPsm sdlPsm;
+    Field frameType, dataLength, version, controlFrameInfo;
+    Method transitionOnInput;
+    byte rawByte = (byte) 0x0;
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        sdlPsm = new SdlPsm();
+        transitionOnInput = SdlPsm.class.getDeclaredMethod("transitionOnInput", byte.class, int.class);
+        transitionOnInput.setAccessible(true);
+
+        frameType = SdlPsm.class.getDeclaredField("frameType");
+        dataLength = SdlPsm.class.getDeclaredField("dataLength");
+        version = SdlPsm.class.getDeclaredField("version");
+        controlFrameInfo = SdlPsm.class.getDeclaredField("controlFrameInfo");
+        frameType.setAccessible(true);
+        dataLength.setAccessible(true);
+        version.setAccessible(true);
+        controlFrameInfo.setAccessible(true);
+    }
+
+
+    public void testGarbledControlFrame() {
+        try {
+            rawByte = 0x0;
+            version.set(sdlPsm, 1);
+            controlFrameInfo.set(sdlPsm, SdlPacket.FRAME_INFO_START_SERVICE);
+            frameType.set(sdlPsm, SdlPacket.FRAME_TYPE_CONTROL);
+
+            dataLength.set(sdlPsm, MAX_DATA_LENGTH + 1);
+            int STATE = (Integer) transitionOnInput.invoke(sdlPsm, rawByte, SdlPsm.DATA_SIZE_4_STATE);
+
+            assertEquals(TestValues.MATCH, SdlPsm.ERROR_STATE, STATE);
+        } catch (Exception e) {
+            Log.e(TAG, e.toString());
+        }
+    }
+
+    public void testMaximumControlFrame() {
+        try {
+            rawByte = 0x0;
+            version.set(sdlPsm, 1);
+            controlFrameInfo.set(sdlPsm, SdlPacket.FRAME_INFO_START_SERVICE);
+            frameType.set(sdlPsm, SdlPacket.FRAME_TYPE_CONTROL);
+
+            dataLength.set(sdlPsm, MAX_DATA_LENGTH);
+            int STATE = (Integer) transitionOnInput.invoke(sdlPsm, rawByte, SdlPsm.DATA_SIZE_4_STATE);
+
+            assertEquals(TestValues.MATCH, SdlPsm.DATA_PUMP_STATE, STATE);
+        } catch (Exception e) {
+            Log.e(TAG, e.toString());
+        }
+    }
+
+    public void testOutOfMemoryDS4() {
+        try {
+            rawByte = 0x0;
+            version.set(sdlPsm, 1);
+            frameType.set(sdlPsm, SdlPacket.FRAME_TYPE_SINGLE);
+
+            dataLength.set(sdlPsm, 2147483647);
+            int STATE = (Integer) transitionOnInput.invoke(sdlPsm, rawByte, SdlPsm.DATA_SIZE_4_STATE);
+
+            assertEquals(TestValues.MATCH, SdlPsm.ERROR_STATE, STATE);
+        } catch (Exception e) {
+            Log.e(TAG, e.toString());
+        }
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java
index 5ba848245..37d841a5c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java
@@ -7,48 +7,48 @@ import com.smartdevicelink.transport.enums.TransportType;
 import junit.framework.TestCase;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.transport.TCPTransportConfig}
  */
 public class TCPTransportConfigTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.transport.TCPTransportConfig#getPort()}
-	 * {@link com.smartdevicelink.transport.TCPTransportConfig#getIPAddress()}
-	 * {@link com.smartdevicelink.transport.TCPTransportConfig#getAutoReconnect()}
-	 * {@link com.smartdevicelink.transport.TCPTransportConfig#getTransportType()}
-	 */
-	public void testConfigs () {
-		
-		// Test Values
-		int     testInt     = 123;
-		String  testString  = "test";
-		boolean testBoolean = true;
-		TCPTransportConfig testConfig1 = new TCPTransportConfig(testInt, testString, testBoolean);
-		TCPTransportConfig testConfig2 = new TCPTransportConfig(testInt, null, testBoolean);
-		
-		// Comparison Values
-		TransportType expectedTransportType = TransportType.TCP;
-		String        expectedToString1     = "TCPTransportConfig{Port=123, IpAddress='test', AutoReconnect=true}";
-		String        expectedToString2     = "TCPTransportConfig{Port=123, IpAddress='null', AutoReconnect=true}";
-		int           actualPort            = testConfig1.getPort();
-		String        actualIpAddress       = testConfig1.getIPAddress();
-		String        actualToString1       = testConfig1.toString();
-		String        actualToString2       = testConfig2.toString();
-		String        actualNullString      = testConfig2.getIPAddress();
-		boolean       actualAutoReconnect   = testConfig1.getAutoReconnect();
-		TransportType actualTransportType   = testConfig1.getTransportType();
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, testInt, actualPort);
-		assertEquals(TestValues.MATCH, testString, actualIpAddress);
-		assertEquals(TestValues.MATCH, testBoolean, actualAutoReconnect);
-		assertEquals(TestValues.MATCH, expectedTransportType, actualTransportType);
-		assertEquals(TestValues.MATCH, expectedToString1, actualToString1);
-		assertEquals(TestValues.MATCH, expectedToString2, actualToString2);
-		
-		// Invalid/Null Tests
-		assertNull(TestValues.NULL, actualNullString);
-	}
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.transport.TCPTransportConfig#getPort()}
+     * {@link com.smartdevicelink.transport.TCPTransportConfig#getIPAddress()}
+     * {@link com.smartdevicelink.transport.TCPTransportConfig#getAutoReconnect()}
+     * {@link com.smartdevicelink.transport.TCPTransportConfig#getTransportType()}
+     */
+    public void testConfigs() {
+
+        // Test Values
+        int testInt = 123;
+        String testString = "test";
+        boolean testBoolean = true;
+        TCPTransportConfig testConfig1 = new TCPTransportConfig(testInt, testString, testBoolean);
+        TCPTransportConfig testConfig2 = new TCPTransportConfig(testInt, null, testBoolean);
+
+        // Comparison Values
+        TransportType expectedTransportType = TransportType.TCP;
+        String expectedToString1 = "TCPTransportConfig{Port=123, IpAddress='test', AutoReconnect=true}";
+        String expectedToString2 = "TCPTransportConfig{Port=123, IpAddress='null', AutoReconnect=true}";
+        int actualPort = testConfig1.getPort();
+        String actualIpAddress = testConfig1.getIPAddress();
+        String actualToString1 = testConfig1.toString();
+        String actualToString2 = testConfig2.toString();
+        String actualNullString = testConfig2.getIPAddress();
+        boolean actualAutoReconnect = testConfig1.getAutoReconnect();
+        TransportType actualTransportType = testConfig1.getTransportType();
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, testInt, actualPort);
+        assertEquals(TestValues.MATCH, testString, actualIpAddress);
+        assertEquals(TestValues.MATCH, testBoolean, actualAutoReconnect);
+        assertEquals(TestValues.MATCH, expectedTransportType, actualTransportType);
+        assertEquals(TestValues.MATCH, expectedToString1, actualToString1);
+        assertEquals(TestValues.MATCH, expectedToString2, actualToString2);
+
+        // Invalid/Null Tests
+        assertNull(TestValues.NULL, actualNullString);
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
index dc54b2197..3b6a066a4 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
@@ -10,71 +10,71 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.transport.enums.TransportType}
  */
 public class TransportTypeTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following enum : 
-	 * {@link com.smartdevicelink.transport.enums.TransportType}
-	 */
-	public void testTransportTypeEnum () {
-		
-		// Test Values
-		String testTcp       		= "TCP";
-		String testUsb       		= "USB";
-		String testInvalid   		= "INVALID";
-		String testBluetooth 		= "BLUETOOTH";
-		String testMultiplexing 	= "MULTIPLEX";
-		String testWebSocketServer 	= "WEB_SOCKET_SERVER";
-		String testCustom 			= "CUSTOM";
 
-		try {
-			// Comparison Values
-			TransportType expectedTcpEnum        		= TransportType.TCP;
-			TransportType expectedUsbEnum        		= TransportType.USB;
-			TransportType expectedBluetoothEnum  		= TransportType.BLUETOOTH;
-			TransportType expectedMultiplexingEnum  	= TransportType.MULTIPLEX;
-			TransportType expectedWebSocketServerEnum  	= TransportType.WEB_SOCKET_SERVER;
-			TransportType expectedCustomEnum  			= TransportType.CUSTOM;
+    /**
+     * This is a unit test for the following enum :
+     * {@link com.smartdevicelink.transport.enums.TransportType}
+     */
+    public void testTransportTypeEnum() {
 
-			List<TransportType> expectedEnumList = new ArrayList<TransportType>();
-			expectedEnumList.add(TransportType.BLUETOOTH);
-			expectedEnumList.add(TransportType.TCP);
-			expectedEnumList.add(TransportType.USB);
-			expectedEnumList.add(TransportType.MULTIPLEX);
-			expectedEnumList.add(TransportType.WEB_SOCKET_SERVER);
-			expectedEnumList.add(TransportType.CUSTOM);
+        // Test Values
+        String testTcp = "TCP";
+        String testUsb = "USB";
+        String testInvalid = "INVALID";
+        String testBluetooth = "BLUETOOTH";
+        String testMultiplexing = "MULTIPLEX";
+        String testWebSocketServer = "WEB_SOCKET_SERVER";
+        String testCustom = "CUSTOM";
 
-			TransportType actualNullEnum       			= TransportType.valueForString(null);
-			TransportType actualTcpEnum        			= TransportType.valueForString(testTcp);
-			TransportType actualUsbEnum        			= TransportType.valueForString(testUsb);
-			TransportType actualInvalidEnum    			= TransportType.valueForString(testInvalid);
-			TransportType actualBluetoothEnum  			= TransportType.valueForString(testBluetooth);
-			TransportType actualMultiplexingEnum 		= TransportType.valueForString(testMultiplexing);
-			TransportType actualWebSocketServerEnum 	= TransportType.valueForString(testWebSocketServer);
-			TransportType actualCustomEnum			 	= TransportType.valueForString(testCustom);
+        try {
+            // Comparison Values
+            TransportType expectedTcpEnum = TransportType.TCP;
+            TransportType expectedUsbEnum = TransportType.USB;
+            TransportType expectedBluetoothEnum = TransportType.BLUETOOTH;
+            TransportType expectedMultiplexingEnum = TransportType.MULTIPLEX;
+            TransportType expectedWebSocketServerEnum = TransportType.WEB_SOCKET_SERVER;
+            TransportType expectedCustomEnum = TransportType.CUSTOM;
 
-			List<TransportType> actualEnumList = Arrays.asList(TransportType.values());
-			
-			// Valid Tests
-			assertEquals(TestValues.MATCH, expectedTcpEnum, actualTcpEnum);
-			assertEquals(TestValues.MATCH, expectedUsbEnum, actualUsbEnum);
-			assertEquals(TestValues.MATCH, expectedBluetoothEnum, actualBluetoothEnum);
-			assertEquals(TestValues.MATCH, expectedMultiplexingEnum, actualMultiplexingEnum);
-			assertEquals(TestValues.MATCH, expectedWebSocketServerEnum, actualWebSocketServerEnum);
-			assertEquals(TestValues.MATCH, expectedCustomEnum, actualCustomEnum);
-			assertTrue(TestValues.ARRAY, expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
-			
-			// Invalid/Null Tests
-			assertNull(TestValues.NULL, actualInvalidEnum);
-			assertNull(TestValues.NULL, actualNullEnum);
-		
-		} catch (NullPointerException e) {
-			fail("Could not retrieve value for null string, should return null.");
-		} catch (IllegalArgumentException e) {
-			fail("Could not retrieve value for invalid string, should return null.");
-		}
-	}
+            List<TransportType> expectedEnumList = new ArrayList<TransportType>();
+            expectedEnumList.add(TransportType.BLUETOOTH);
+            expectedEnumList.add(TransportType.TCP);
+            expectedEnumList.add(TransportType.USB);
+            expectedEnumList.add(TransportType.MULTIPLEX);
+            expectedEnumList.add(TransportType.WEB_SOCKET_SERVER);
+            expectedEnumList.add(TransportType.CUSTOM);
+
+            TransportType actualNullEnum = TransportType.valueForString(null);
+            TransportType actualTcpEnum = TransportType.valueForString(testTcp);
+            TransportType actualUsbEnum = TransportType.valueForString(testUsb);
+            TransportType actualInvalidEnum = TransportType.valueForString(testInvalid);
+            TransportType actualBluetoothEnum = TransportType.valueForString(testBluetooth);
+            TransportType actualMultiplexingEnum = TransportType.valueForString(testMultiplexing);
+            TransportType actualWebSocketServerEnum = TransportType.valueForString(testWebSocketServer);
+            TransportType actualCustomEnum = TransportType.valueForString(testCustom);
+
+            List<TransportType> actualEnumList = Arrays.asList(TransportType.values());
+
+            // Valid Tests
+            assertEquals(TestValues.MATCH, expectedTcpEnum, actualTcpEnum);
+            assertEquals(TestValues.MATCH, expectedUsbEnum, actualUsbEnum);
+            assertEquals(TestValues.MATCH, expectedBluetoothEnum, actualBluetoothEnum);
+            assertEquals(TestValues.MATCH, expectedMultiplexingEnum, actualMultiplexingEnum);
+            assertEquals(TestValues.MATCH, expectedWebSocketServerEnum, actualWebSocketServerEnum);
+            assertEquals(TestValues.MATCH, expectedCustomEnum, actualCustomEnum);
+            assertTrue(TestValues.ARRAY, expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
+
+            // Invalid/Null Tests
+            assertNull(TestValues.NULL, actualInvalidEnum);
+            assertNull(TestValues.NULL, actualNullEnum);
+
+        } catch (NullPointerException e) {
+            fail("Could not retrieve value for null string, should return null.");
+        } catch (IllegalArgumentException e) {
+            fail("Could not retrieve value for invalid string, should return null.");
+        }
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java
index ab2b7b52d..8cbaa3c72 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/WiFiSocketFactoryTest.java
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.when;
 /**
  * This is a unit test class for the WiFiSocketFactory class:
  * {@link com.smartdevicelink.transport.utl.WiFiSocketFactory}
- *
+ * <p>
  * Requires LOLLIPOP or later since the tests use android.net.NetworkCapabilities class
  */
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@@ -168,7 +168,7 @@ public class WiFiSocketFactoryTest extends TestCase {
 
     // test the happy path
     public void testWithWiFiNetwork() {
-        setupMockNetworks(new MockNetworkConfig[] {
+        setupMockNetworks(new MockNetworkConfig[]{
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_CELLULAR, FactoryRet.RETURNS_ANOTHER_FACTORY),
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_CORRECT_FACTORY),
         });
@@ -204,8 +204,8 @@ public class WiFiSocketFactoryTest extends TestCase {
 
     // test the case where we do not have ACCESS_NETWORK_STATE permission
     public void testWithoutPermission() {
-        setupMockNetworks(new MockNetworkConfig[] {
-            new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_CORRECT_FACTORY),
+        setupMockNetworks(new MockNetworkConfig[]{
+                new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_CORRECT_FACTORY),
         });
 
         // simulate the case where required permission isn't available
@@ -220,7 +220,7 @@ public class WiFiSocketFactoryTest extends TestCase {
 
     // test the case where context.getPackageManager() returns null
     public void testPackageManagerNull() {
-        setupMockNetworks(new MockNetworkConfig[] {
+        setupMockNetworks(new MockNetworkConfig[]{
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_CORRECT_FACTORY),
         });
 
@@ -236,7 +236,7 @@ public class WiFiSocketFactoryTest extends TestCase {
 
     // test the case where getSystemService() returns null
     public void testConnectivityManagerNull() {
-        setupMockNetworks(new MockNetworkConfig[] {
+        setupMockNetworks(new MockNetworkConfig[]{
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_CORRECT_FACTORY),
         });
 
@@ -263,7 +263,7 @@ public class WiFiSocketFactoryTest extends TestCase {
 
     // test the case where the network list contains a null for Network instance
     public void testNetworkListHasNull() {
-        setupMockNetworks(new MockNetworkConfig[] {
+        setupMockNetworks(new MockNetworkConfig[]{
                 // multiple Network instances in the list, the first one being NULL
                 new MockNetworkConfig(true, 0, FactoryRet.RETURNS_ANOTHER_FACTORY),
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_CORRECT_FACTORY),
@@ -277,7 +277,7 @@ public class WiFiSocketFactoryTest extends TestCase {
 
     // test the case where the phone isn't connected to Wi-Fi network
     public void testNoWiFiNetwork() {
-        setupMockNetworks(new MockNetworkConfig[] {
+        setupMockNetworks(new MockNetworkConfig[]{
                 // none of the instances has TRANSPORT_WIFI in their capabilities
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_CELLULAR, FactoryRet.RETURNS_ANOTHER_FACTORY),
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_BLUETOOTH, FactoryRet.RETURNS_ANOTHER_FACTORY),
@@ -293,7 +293,7 @@ public class WiFiSocketFactoryTest extends TestCase {
 
     // test the case where we get null for SocketFactory
     public void testSocketFactoryNull() {
-        setupMockNetworks(new MockNetworkConfig[] {
+        setupMockNetworks(new MockNetworkConfig[]{
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_CELLULAR, FactoryRet.RETURNS_ANOTHER_FACTORY),
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_NULL),
         });
@@ -307,7 +307,7 @@ public class WiFiSocketFactoryTest extends TestCase {
 
     // test the case where we get a null for SocketFactory, then a valid one for another
     public void testSocketFactoryNull2() {
-        setupMockNetworks(new MockNetworkConfig[] {
+        setupMockNetworks(new MockNetworkConfig[]{
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_CELLULAR, FactoryRet.RETURNS_ANOTHER_FACTORY),
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_NULL),
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_CORRECT_FACTORY),
@@ -321,7 +321,7 @@ public class WiFiSocketFactoryTest extends TestCase {
 
     // test the case where we get an exception with SocketFactory.createSocket()
     public void testFactoryReturnsException() throws IOException {
-        setupMockNetworks(new MockNetworkConfig[] {
+        setupMockNetworks(new MockNetworkConfig[]{
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_CORRECT_FACTORY),
         });
 
@@ -338,13 +338,13 @@ public class WiFiSocketFactoryTest extends TestCase {
     // the first one throws Exception and the other one succeeds.
     // This is to simulate Samsung Galaxy S9.
     public void testFactoryReturnsException2() throws IOException {
-        setupMockNetworks(new MockNetworkConfig[] {
+        setupMockNetworks(new MockNetworkConfig[]{
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_CORRECT_FACTORY),
                 new MockNetworkConfig(false, NetworkCapabilities.TRANSPORT_WIFI, FactoryRet.RETURNS_CORRECT_FACTORY),
         });
 
         when(mMockSocketFactory.createSocket()).thenThrow(new IOException("Dummy IOException for testing!"))
-        .thenReturn(mWiFiBoundSocket);
+                .thenReturn(mWiFiBoundSocket);
 
         Socket ret = WiFiSocketFactory.createSocket(mMockContext);
 
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java
index 4fd0ca2cb..69d82c0bd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java
@@ -8,81 +8,81 @@ import junit.framework.TestCase;
 import java.util.Arrays;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.util.BitConverter}
  */
 public class BitConverterTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.util.BitConverter#bytesToHex(byte[])}
-	 * {@link com.smartdevicelink.util.BitConverter#bytesToHex(byte[], int, int)}
-	 * {@link com.smartdevicelink.util.BitConverter#hexToBytes(String)}
-	 */
-	public void testHexToByteConversions () {
-		
-		// Test Values
-		byte[] testBytes = { (byte) 0x01, (byte) 0x02 };
-		
-		// Comparison Values
-		String expectedHex = "0102";
-		String actualHex1  = BitConverter.bytesToHex(testBytes);
-		String actualHex2  = BitConverter.bytesToHex(testBytes, 0, testBytes.length);
-		byte[] actualBytes = BitConverter.hexToBytes(expectedHex);
-		
-		// Valid Tests
-		assertEquals("Values should match.", expectedHex, actualHex1);
-		assertEquals("Values should match.", expectedHex, actualHex2);
-		assertTrue("Arrays should match.", Arrays.equals(testBytes, actualBytes));
-		
-		// Invalid/Null Tests
-		assertNull(TestValues.NULL, BitConverter.bytesToHex(null));
-		assertNull(TestValues.NULL, BitConverter.bytesToHex(null, 0, 0));
-		assertNull(TestValues.NULL, BitConverter.hexToBytes(null));
-	}
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.util.BitConverter#intToByteArray(int)}
-	 * {@link com.smartdevicelink.util.BitConverter#intFromByteArray(byte[], int)}
-	 */
-	public void testIntToByteConversions () {
-		
-		// Comparison Values
-		Integer expectedInt     = 1234;
-		byte[]  expectedBytes   = { (byte)(1234 >>> 24), (byte)(1234 >>> 16),
-				                    (byte)(1234 >>> 8),  (byte)(1234) };
-		int     actualInt       = BitConverter.intFromByteArray(expectedBytes, 0);
-		byte[]  actualBytes     = BitConverter.intToByteArray(expectedInt);
-		int     actualNullBytes = BitConverter.intFromByteArray(null, 0);
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, expectedInt.intValue(), actualInt);
-		assertTrue(TestValues.ARRAY, Arrays.equals(expectedBytes, actualBytes));
-		
-		// Invalid/Null Tests
-		assertEquals(TestValues.MATCH, (int) -1, actualNullBytes);
-	}
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.util.BitConverter#shortToByteArray(short)}
-	 * {@link com.smartdevicelink.util.BitConverter#shortFromByteArray(byte[], int)}
-	 */
-	public void testShortToByteConverstions () {
-		
-		// Comparison Values
-		short  expectedShort   = 1;
-		byte[] expectedBytes   = { ((byte) ((1 >> 8) & 0xff)), ((byte) (1 & 0xff)) };
-		short  actualShort     = BitConverter.shortFromByteArray(expectedBytes, 0);
-		byte[] actualBytes     = BitConverter.shortToByteArray(expectedShort);
-		short  actualNullBytes = BitConverter.shortFromByteArray(null, 0);
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, expectedShort, actualShort);
-		assertTrue(TestValues.ARRAY, Arrays.equals(expectedBytes, actualBytes));
-		
-		// Invalid/Null Tests
-		assertEquals(TestValues.MATCH, (short) -1, actualNullBytes);
-	}		
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.util.BitConverter#bytesToHex(byte[])}
+     * {@link com.smartdevicelink.util.BitConverter#bytesToHex(byte[], int, int)}
+     * {@link com.smartdevicelink.util.BitConverter#hexToBytes(String)}
+     */
+    public void testHexToByteConversions() {
+
+        // Test Values
+        byte[] testBytes = {(byte) 0x01, (byte) 0x02};
+
+        // Comparison Values
+        String expectedHex = "0102";
+        String actualHex1 = BitConverter.bytesToHex(testBytes);
+        String actualHex2 = BitConverter.bytesToHex(testBytes, 0, testBytes.length);
+        byte[] actualBytes = BitConverter.hexToBytes(expectedHex);
+
+        // Valid Tests
+        assertEquals("Values should match.", expectedHex, actualHex1);
+        assertEquals("Values should match.", expectedHex, actualHex2);
+        assertTrue("Arrays should match.", Arrays.equals(testBytes, actualBytes));
+
+        // Invalid/Null Tests
+        assertNull(TestValues.NULL, BitConverter.bytesToHex(null));
+        assertNull(TestValues.NULL, BitConverter.bytesToHex(null, 0, 0));
+        assertNull(TestValues.NULL, BitConverter.hexToBytes(null));
+    }
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.util.BitConverter#intToByteArray(int)}
+     * {@link com.smartdevicelink.util.BitConverter#intFromByteArray(byte[], int)}
+     */
+    public void testIntToByteConversions() {
+
+        // Comparison Values
+        Integer expectedInt = 1234;
+        byte[] expectedBytes = {(byte) (1234 >>> 24), (byte) (1234 >>> 16),
+                (byte) (1234 >>> 8), (byte) (1234)};
+        int actualInt = BitConverter.intFromByteArray(expectedBytes, 0);
+        byte[] actualBytes = BitConverter.intToByteArray(expectedInt);
+        int actualNullBytes = BitConverter.intFromByteArray(null, 0);
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, expectedInt.intValue(), actualInt);
+        assertTrue(TestValues.ARRAY, Arrays.equals(expectedBytes, actualBytes));
+
+        // Invalid/Null Tests
+        assertEquals(TestValues.MATCH, (int) -1, actualNullBytes);
+    }
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.util.BitConverter#shortToByteArray(short)}
+     * {@link com.smartdevicelink.util.BitConverter#shortFromByteArray(byte[], int)}
+     */
+    public void testShortToByteConverstions() {
+
+        // Comparison Values
+        short expectedShort = 1;
+        byte[] expectedBytes = {((byte) ((1 >> 8) & 0xff)), ((byte) (1 & 0xff))};
+        short actualShort = BitConverter.shortFromByteArray(expectedBytes, 0);
+        byte[] actualBytes = BitConverter.shortToByteArray(expectedShort);
+        short actualNullBytes = BitConverter.shortFromByteArray(null, 0);
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, expectedShort, actualShort);
+        assertTrue(TestValues.ARRAY, Arrays.equals(expectedBytes, actualBytes));
+
+        // Invalid/Null Tests
+        assertEquals(TestValues.MATCH, (short) -1, actualNullBytes);
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java
index 0cf0efc47..02f1d1c90 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java
@@ -8,89 +8,89 @@ import junit.framework.TestCase;
 import java.util.Vector;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.util.ByteEnumer}
  */
 public class ByteEnumerTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods :
-	 * {@link com.smartdevicelink.util.ByteEnumer#value()}
-	 * {@link com.smartdevicelink.util.ByteEnumer#getValue()}
-	 * {@link com.smartdevicelink.util.ByteEnumer#getName()}
-	 * {@link com.smartdevicelink.util.ByteEnumer#equals(ByteEnumer)}
-	 * {@link com.smartdevicelink.util.ByteEnumer#eq(ByteEnumer)}
-	 */
-	public void testStoredValues () {
-		
-		// Test Values
-		byte           testByte   = (byte) 0x01;
-		String         testString = "test";
-		MockByteEnumer testObject = new MockByteEnumer(testByte, null);
-		
-		// Comparison Values
-		MockByteEnumer expectedObject   = new MockByteEnumer(testByte, testString);
-		MockByteEnumer actualObject     = new MockByteEnumer(testByte, testString);		
-		byte           actualByte1      = expectedObject.getValue();
-		byte           actualByte2      = expectedObject.value();
-		String         actualString     = expectedObject.getName();
-		String         actualNullString = testObject.getName();
-		
-		// Valid Tests
-		assertNotNull(TestValues.NOT_NULL, expectedObject);
-		assertEquals(TestValues.MATCH, testByte, actualByte1);
-		assertEquals(TestValues.MATCH, testByte, actualByte2);
-		assertEquals(TestValues.MATCH, testString, actualString);
-		assertTrue(TestValues.TRUE, actualObject.equals(expectedObject));
-		assertTrue(TestValues.TRUE, actualObject.eq(expectedObject));
-		
-		// Invalid/Null Tests
-		assertNull(TestValues.NULL, actualNullString);
-	}
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.util.ByteEnumer#get(Vector, byte)}
-	 * {@link com.smartdevicelink.util.ByteEnumer#get(Vector, String)}
-	 */
-	public void testSearchMethods () {
-		
-		// Test Values
-		byte               testByte1       = (byte) 0x01;
-		byte               testByte2       = (byte) 0x02;
-		String             testString1     = "test_1";
-		String             testString2     = "test_2";
-		Vector<ByteEnumer> testList        = new Vector<ByteEnumer>();
-		Vector<String>     testInvalidList = new Vector<String>();
-		
-		// Comparison Values
-		MockByteEnumer expectedObject1 = new MockByteEnumer(testByte1, testString1);
-		MockByteEnumer expectedObject2 = new MockByteEnumer(testByte2, testString2);
-		
-		testList.add(expectedObject1);
-		testList.add(expectedObject2);		
-		testInvalidList.add(testString1);
-		testInvalidList.add(testString2);
-		
-		// Valid Tests
-		assertEquals(TestValues.MATCH, expectedObject1, ByteEnumer.get(testList, testByte1));
-		assertEquals(TestValues.MATCH, expectedObject1, ByteEnumer.get(testList, testString1));
-		assertEquals(TestValues.MATCH, expectedObject2, ByteEnumer.get(testList, testByte2));
-		assertEquals(TestValues.MATCH, expectedObject2, ByteEnumer.get(testList, testString2));
-		
-		// Invalid/Null Tests
-		assertNull(TestValues.NULL, ByteEnumer.get(testList, null));
-		assertNull(TestValues.NULL, ByteEnumer.get(testInvalidList, testByte1));
-		assertNull(TestValues.NULL, ByteEnumer.get(testInvalidList, testString1));
-	}
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.util.ByteEnumer#value()}
+     * {@link com.smartdevicelink.util.ByteEnumer#getValue()}
+     * {@link com.smartdevicelink.util.ByteEnumer#getName()}
+     * {@link com.smartdevicelink.util.ByteEnumer#equals(ByteEnumer)}
+     * {@link com.smartdevicelink.util.ByteEnumer#eq(ByteEnumer)}
+     */
+    public void testStoredValues() {
+
+        // Test Values
+        byte testByte = (byte) 0x01;
+        String testString = "test";
+        MockByteEnumer testObject = new MockByteEnumer(testByte, null);
+
+        // Comparison Values
+        MockByteEnumer expectedObject = new MockByteEnumer(testByte, testString);
+        MockByteEnumer actualObject = new MockByteEnumer(testByte, testString);
+        byte actualByte1 = expectedObject.getValue();
+        byte actualByte2 = expectedObject.value();
+        String actualString = expectedObject.getName();
+        String actualNullString = testObject.getName();
+
+        // Valid Tests
+        assertNotNull(TestValues.NOT_NULL, expectedObject);
+        assertEquals(TestValues.MATCH, testByte, actualByte1);
+        assertEquals(TestValues.MATCH, testByte, actualByte2);
+        assertEquals(TestValues.MATCH, testString, actualString);
+        assertTrue(TestValues.TRUE, actualObject.equals(expectedObject));
+        assertTrue(TestValues.TRUE, actualObject.eq(expectedObject));
+
+        // Invalid/Null Tests
+        assertNull(TestValues.NULL, actualNullString);
+    }
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.util.ByteEnumer#get(Vector, byte)}
+     * {@link com.smartdevicelink.util.ByteEnumer#get(Vector, String)}
+     */
+    public void testSearchMethods() {
+
+        // Test Values
+        byte testByte1 = (byte) 0x01;
+        byte testByte2 = (byte) 0x02;
+        String testString1 = "test_1";
+        String testString2 = "test_2";
+        Vector<ByteEnumer> testList = new Vector<ByteEnumer>();
+        Vector<String> testInvalidList = new Vector<String>();
+
+        // Comparison Values
+        MockByteEnumer expectedObject1 = new MockByteEnumer(testByte1, testString1);
+        MockByteEnumer expectedObject2 = new MockByteEnumer(testByte2, testString2);
+
+        testList.add(expectedObject1);
+        testList.add(expectedObject2);
+        testInvalidList.add(testString1);
+        testInvalidList.add(testString2);
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, expectedObject1, ByteEnumer.get(testList, testByte1));
+        assertEquals(TestValues.MATCH, expectedObject1, ByteEnumer.get(testList, testString1));
+        assertEquals(TestValues.MATCH, expectedObject2, ByteEnumer.get(testList, testByte2));
+        assertEquals(TestValues.MATCH, expectedObject2, ByteEnumer.get(testList, testString2));
+
+        // Invalid/Null Tests
+        assertNull(TestValues.NULL, ByteEnumer.get(testList, null));
+        assertNull(TestValues.NULL, ByteEnumer.get(testInvalidList, testByte1));
+        assertNull(TestValues.NULL, ByteEnumer.get(testInvalidList, testString1));
+    }
 }
 
 /**
- * This is a mock class for testing the following : 
+ * This is a mock class for testing the following :
  * {@link com.smartdevicelink.util.ByteEnumer}
  */
 class MockByteEnumer extends ByteEnumer {
-	protected MockByteEnumer(byte value, String name) {
-		super(value, name);
-	}
+    protected MockByteEnumer(byte value, String name) {
+        super(value, name);
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/CompareUtilsTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/CompareUtilsTest.java
index 044d22f2d..26b4819bd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/CompareUtilsTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/CompareUtilsTest.java
@@ -15,7 +15,7 @@ import static junit.framework.TestCase.assertTrue;
 public class CompareUtilsTest {
 
     @Test
-    public void testAreStringsEqual(){
+    public void testAreStringsEqual() {
 
         assertTrue(CompareUtils.areStringsEqual(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, true, true));
         assertTrue(CompareUtils.areStringsEqual(TestValues.GENERAL_STRING, TestValues.GENERAL_STRING, false, true));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java
index 62d159f26..dd2a4fdcd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java
@@ -6,23 +6,23 @@ import com.smartdevicelink.util.DebugTool;
 import junit.framework.TestCase;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.util.DebugTool}
  */
 public class DebugToolTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.util.DebugTool#enableDebugTool()}
-	 * {@link com.smartdevicelink.util.DebugTool#disableDebugTool()}
-	 * {@link com.smartdevicelink.util.DebugTool#isDebugEnabled()}
-	 */
-	public void testDebugEnableMethods () {		
-		DebugTool.enableDebugTool();
-		assertTrue(TestValues.TRUE, DebugTool.isDebugEnabled());
-		DebugTool.disableDebugTool();
-		assertFalse(TestValues.FALSE, DebugTool.isDebugEnabled());
-	}
-	
-	// NOTE : No testing can currently be done for the logging methods.
+
+    /**
+     * This is a unit test for the following methods :
+     * {@link com.smartdevicelink.util.DebugTool#enableDebugTool()}
+     * {@link com.smartdevicelink.util.DebugTool#disableDebugTool()}
+     * {@link com.smartdevicelink.util.DebugTool#isDebugEnabled()}
+     */
+    public void testDebugEnableMethods() {
+        DebugTool.enableDebugTool();
+        assertTrue(TestValues.TRUE, DebugTool.isDebugEnabled());
+        DebugTool.disableDebugTool();
+        assertFalse(TestValues.FALSE, DebugTool.isDebugEnabled());
+    }
+
+    // NOTE : No testing can currently be done for the logging methods.
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java
index 8aa8c81f4..7397b24a7 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java
@@ -10,63 +10,63 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.util.NativeLogTool}
  */
 public class NativeLogToolTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following enum : 
-	 * {@link com.smartdevicelink.util.NativeLogTool.LogTarget}
-	 */
-	public void testLogTargetEnum () {
-		
-		// Test Values
-		String testInfo    = "Info";
-		String testError   = "Error";
-		String testInvalid = "Invalid";
-		String testWarning = "Warning";
-		
-		try {
-			// Comparison Values 
-			NativeLogTool.LogTarget expectedInfoEnum       = NativeLogTool.LogTarget.Info;
-			NativeLogTool.LogTarget expectedErrorEnum      = NativeLogTool.LogTarget.Error;
-			NativeLogTool.LogTarget expectedWarningEnum    = NativeLogTool.LogTarget.Warning;
-			List<NativeLogTool.LogTarget> expectedEnumList = new ArrayList<NativeLogTool.LogTarget>();
-			expectedEnumList.add(NativeLogTool.LogTarget.Info);			
-			expectedEnumList.add(NativeLogTool.LogTarget.Error);
-			expectedEnumList.add(NativeLogTool.LogTarget.Warning);
-			
-			NativeLogTool.LogTarget actualNullEnum       = NativeLogTool.LogTarget.valueForString(null);
-			NativeLogTool.LogTarget actualInfoEnum       = NativeLogTool.LogTarget.valueForString(testInfo);
-			NativeLogTool.LogTarget actualErrorEnum      = NativeLogTool.LogTarget.valueForString(testError);
-			NativeLogTool.LogTarget actualInvalidEnum    = NativeLogTool.LogTarget.valueForString(testInvalid);
-			NativeLogTool.LogTarget actualWarningEnum    = NativeLogTool.LogTarget.valueForString(testWarning);
-			List<NativeLogTool.LogTarget> actualEnumList = Arrays.asList(NativeLogTool.LogTarget.values());
-			
-			// Valid Tests
-			assertEquals(TestValues.MATCH, expectedInfoEnum,    actualInfoEnum);
-			assertEquals(TestValues.MATCH, expectedErrorEnum,   actualErrorEnum);
-			assertEquals(TestValues.MATCH, expectedWarningEnum, actualWarningEnum);
-			assertTrue("Contents should match.", expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
-			
-			// Invalid/Null Tests
-			assertNull(TestValues.NULL, actualInvalidEnum);
-			assertNull(TestValues.NULL, actualNullEnum);
-		
-		} catch (NullPointerException e) {
-			fail("Could not retrieve value for null string, should return null.");
-		} catch (IllegalArgumentException e) {
-			fail("Could not retrieve value for invalid string, should return null.");
-		}
-	}
 
-	public void testEnabled () {
-		NativeLogTool.setEnableState(false);
-		assertFalse("Value should be false.", NativeLogTool.isEnabled());		
-		NativeLogTool.setEnableState(true);
-		assertTrue("Valueshould be true.", NativeLogTool.isEnabled());
-	}
-	
-	// NOTE : No testing can currently be done for the logging methods.
+    /**
+     * This is a unit test for the following enum :
+     * {@link com.smartdevicelink.util.NativeLogTool.LogTarget}
+     */
+    public void testLogTargetEnum() {
+
+        // Test Values
+        String testInfo = "Info";
+        String testError = "Error";
+        String testInvalid = "Invalid";
+        String testWarning = "Warning";
+
+        try {
+            // Comparison Values
+            NativeLogTool.LogTarget expectedInfoEnum = NativeLogTool.LogTarget.Info;
+            NativeLogTool.LogTarget expectedErrorEnum = NativeLogTool.LogTarget.Error;
+            NativeLogTool.LogTarget expectedWarningEnum = NativeLogTool.LogTarget.Warning;
+            List<NativeLogTool.LogTarget> expectedEnumList = new ArrayList<NativeLogTool.LogTarget>();
+            expectedEnumList.add(NativeLogTool.LogTarget.Info);
+            expectedEnumList.add(NativeLogTool.LogTarget.Error);
+            expectedEnumList.add(NativeLogTool.LogTarget.Warning);
+
+            NativeLogTool.LogTarget actualNullEnum = NativeLogTool.LogTarget.valueForString(null);
+            NativeLogTool.LogTarget actualInfoEnum = NativeLogTool.LogTarget.valueForString(testInfo);
+            NativeLogTool.LogTarget actualErrorEnum = NativeLogTool.LogTarget.valueForString(testError);
+            NativeLogTool.LogTarget actualInvalidEnum = NativeLogTool.LogTarget.valueForString(testInvalid);
+            NativeLogTool.LogTarget actualWarningEnum = NativeLogTool.LogTarget.valueForString(testWarning);
+            List<NativeLogTool.LogTarget> actualEnumList = Arrays.asList(NativeLogTool.LogTarget.values());
+
+            // Valid Tests
+            assertEquals(TestValues.MATCH, expectedInfoEnum, actualInfoEnum);
+            assertEquals(TestValues.MATCH, expectedErrorEnum, actualErrorEnum);
+            assertEquals(TestValues.MATCH, expectedWarningEnum, actualWarningEnum);
+            assertTrue("Contents should match.", expectedEnumList.containsAll(actualEnumList) && actualEnumList.containsAll(expectedEnumList));
+
+            // Invalid/Null Tests
+            assertNull(TestValues.NULL, actualInvalidEnum);
+            assertNull(TestValues.NULL, actualNullEnum);
+
+        } catch (NullPointerException e) {
+            fail("Could not retrieve value for null string, should return null.");
+        } catch (IllegalArgumentException e) {
+            fail("Could not retrieve value for invalid string, should return null.");
+        }
+    }
+
+    public void testEnabled() {
+        NativeLogTool.setEnableState(false);
+        assertFalse("Value should be false.", NativeLogTool.isEnabled());
+        NativeLogTool.setEnableState(true);
+        assertTrue("Valueshould be true.", NativeLogTool.isEnabled());
+    }
+
+    // NOTE : No testing can currently be done for the logging methods.
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
index 64c2d7b7b..7909d4997 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlAppInfoTests.java
@@ -73,7 +73,7 @@ public class SdlAppInfoTests {
     @Before
     public void setUp() throws Exception {
         context = getInstrumentation().getContext();
-        defaultResolveInfo =  createResolveInfo(context.getResources().getInteger(R.integer.sdl_router_service_version_value), "com.smartdevicelink.test", "com.smartdevicelink.test.SdlRouterService",false);
+        defaultResolveInfo = createResolveInfo(context.getResources().getInteger(R.integer.sdl_router_service_version_value), "com.smartdevicelink.test", "com.smartdevicelink.test.SdlRouterService", false);
         defaultServiceInfo = defaultResolveInfo.serviceInfo;
         defaultBundle = defaultServiceInfo.metaData;
 
@@ -83,19 +83,19 @@ public class SdlAppInfoTests {
     }
 
     @Test
-    public void testConstructorWithDefaultData(){
+    public void testConstructorWithDefaultData() {
 
-        SdlAppInfo info = new SdlAppInfo(defaultResolveInfo,defaultPackageInfo);
+        SdlAppInfo info = new SdlAppInfo(defaultResolveInfo, defaultPackageInfo);
 
         assertNotNull(info);
 
-        ComponentName  componentName = info.getRouterServiceComponentName();
+        ComponentName componentName = info.getRouterServiceComponentName();
 
         assertNotNull(componentName);
 
-        assertEquals(defaultServiceInfo.name,componentName.getClassName());
+        assertEquals(defaultServiceInfo.name, componentName.getClassName());
 
-        assertEquals(context.getResources().getInteger(R.integer.sdl_router_service_version_value),info.getRouterServiceVersion());
+        assertEquals(context.getResources().getInteger(R.integer.sdl_router_service_version_value), info.getRouterServiceVersion());
 
         assertFalse(info.isCustomRouterService());
     }
@@ -104,16 +104,16 @@ public class SdlAppInfoTests {
      * If an app is found to have a newer service the compare should put it at the top of the list
      */
     @Test
-    public void testCompareVersion(){
-        SdlAppInfo defaultInfo = new SdlAppInfo(defaultResolveInfo,defaultPackageInfo);
+    public void testCompareVersion() {
+        SdlAppInfo defaultInfo = new SdlAppInfo(defaultResolveInfo, defaultPackageInfo);
 
         int newVersion = context.getResources().getInteger(R.integer.sdl_router_service_version_value) + 1;
-        SdlAppInfo  testInfo = new SdlAppInfo(createResolveInfo(newVersion,"com.smartdevicelink.test2", "com.smartdevicelink.test2.SdlRouterService", false), defaultPackageInfo);
+        SdlAppInfo testInfo = new SdlAppInfo(createResolveInfo(newVersion, "com.smartdevicelink.test2", "com.smartdevicelink.test2.SdlRouterService", false), defaultPackageInfo);
 
         List<SdlAppInfo> infos = new ArrayList<>();
         infos.add(defaultInfo);
         infos.add(testInfo);
-        assertEquals(defaultInfo,infos.get(0));
+        assertEquals(defaultInfo, infos.get(0));
 
         Collections.sort(infos, new SdlAppInfo.BestRouterComparator());
 
@@ -125,16 +125,16 @@ public class SdlAppInfoTests {
      * Regardless of version, if the router service is custom it should be towards the end of the list
      */
     @Test
-    public void testCompareVersionAndCustom(){
-        SdlAppInfo defaultInfo = new SdlAppInfo(defaultResolveInfo,defaultPackageInfo);
+    public void testCompareVersionAndCustom() {
+        SdlAppInfo defaultInfo = new SdlAppInfo(defaultResolveInfo, defaultPackageInfo);
 
         int newVersion = context.getResources().getInteger(R.integer.sdl_router_service_version_value) + 1;
-        SdlAppInfo  testInfo = new SdlAppInfo(createResolveInfo(newVersion,"com.smartdevicelink.test2", "com.smartdevicelink.test2.SdlRouterService",true ), defaultPackageInfo);
+        SdlAppInfo testInfo = new SdlAppInfo(createResolveInfo(newVersion, "com.smartdevicelink.test2", "com.smartdevicelink.test2.SdlRouterService", true), defaultPackageInfo);
 
         List<SdlAppInfo> infos = new ArrayList<>();
         infos.add(defaultInfo);
         infos.add(testInfo);
-        assertEquals(defaultInfo,infos.get(0));
+        assertEquals(defaultInfo, infos.get(0));
 
         Collections.sort(infos, new SdlAppInfo.BestRouterComparator());
 
@@ -146,18 +146,18 @@ public class SdlAppInfoTests {
      * If two services have the same version and are not custom, we need to check which app has been updated the most recently
      */
     @Test
-    public void testCompareUpdatedTime(){
-        SdlAppInfo defaultInfo = new SdlAppInfo(defaultResolveInfo,defaultPackageInfo);
+    public void testCompareUpdatedTime() {
+        SdlAppInfo defaultInfo = new SdlAppInfo(defaultResolveInfo, defaultPackageInfo);
 
         PackageInfo packageInfo = new PackageInfo();
         packageInfo.firstInstallTime = defaultPackageInfo.firstInstallTime;
         packageInfo.lastUpdateTime = defaultPackageInfo.lastUpdateTime + 500;
-        SdlAppInfo  testInfo = new SdlAppInfo(defaultResolveInfo, packageInfo);
+        SdlAppInfo testInfo = new SdlAppInfo(defaultResolveInfo, packageInfo);
 
         List<SdlAppInfo> infos = new ArrayList<>();
         infos.add(defaultInfo);
         infos.add(testInfo);
-        assertEquals(defaultInfo,infos.get(0));
+        assertEquals(defaultInfo, infos.get(0));
 
         Collections.sort(infos, new SdlAppInfo.BestRouterComparator());
 
@@ -165,11 +165,11 @@ public class SdlAppInfoTests {
 
     }
 
-    public ResolveInfo  createResolveInfo(int routerServiceVersion,String packageName, String className, boolean isCustom){
+    public ResolveInfo createResolveInfo(int routerServiceVersion, String packageName, String className, boolean isCustom) {
         ResolveInfo info = new ResolveInfo();
         ServiceInfo serviceInfo = new ServiceInfo();
         defaultBundle = new Bundle();
-        defaultBundle.putInt(context.getString(R.string.sdl_router_service_version_name),routerServiceVersion);
+        defaultBundle.putInt(context.getString(R.string.sdl_router_service_version_name), routerServiceVersion);
         defaultBundle.putBoolean(context.getString(R.string.sdl_router_service_is_custom_name), isCustom);
         serviceInfo.metaData = defaultBundle;
         serviceInfo.packageName = packageName;
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
index 0912354d7..c5ab9e35f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
@@ -6,41 +6,41 @@ import com.smartdevicelink.util.SdlDataTypeConverter;
 import junit.framework.TestCase;
 
 /**
- * This is a unit test class for the SmartDeviceLink library project class : 
+ * This is a unit test class for the SmartDeviceLink library project class :
  * {@link com.smartdevicelink.util.SdlDataTypeConverter}
  */
 public class SdlDataTypeConverterTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following method : 
-	 * {@link com.smartdevicelink.util.SdlDataTypeConverter#objectToDouble(Object)}
-	 */
-	public void testObjectToDouble () {
-		
-		// Test Values
-		Long    testLong          = Long.valueOf(1);		
-		Short   testShort         = 1;		
-		Float   testFloat         = 1f;
-		Double  testDouble        = 1.0;		
-		Integer testInteger       = 1;
-		
-		// Comparison Values
-		Double expectedValue      = 1.0;		
-		Double actualNullValue    = SdlDataTypeConverter.objectToDouble(null);
-		Double actualLongValue    = SdlDataTypeConverter.objectToDouble(testLong);
-		Double actualShortValue   = SdlDataTypeConverter.objectToDouble(testShort);
-		Double actualFloatValue   = SdlDataTypeConverter.objectToDouble(testFloat);
-		Double actualDoubleValue  = SdlDataTypeConverter.objectToDouble(testDouble);
-		Double actualIntegerValue = SdlDataTypeConverter.objectToDouble(testInteger);
-		
-		// Valid Tests		
-		assertEquals(TestValues.MATCH, expectedValue, actualDoubleValue);
-		assertEquals(TestValues.MATCH, expectedValue, actualIntegerValue);
-		assertEquals(TestValues.MATCH, expectedValue, actualFloatValue);
-		
-		// Null Tests
-		assertNull(TestValues.NULL, actualNullValue);
-		assertNull(TestValues.NULL, actualLongValue);
-		assertNull(TestValues.NULL, actualShortValue);
-	}
+
+    /**
+     * This is a unit test for the following method :
+     * {@link com.smartdevicelink.util.SdlDataTypeConverter#objectToDouble(Object)}
+     */
+    public void testObjectToDouble() {
+
+        // Test Values
+        Long testLong = Long.valueOf(1);
+        Short testShort = 1;
+        Float testFloat = 1f;
+        Double testDouble = 1.0;
+        Integer testInteger = 1;
+
+        // Comparison Values
+        Double expectedValue = 1.0;
+        Double actualNullValue = SdlDataTypeConverter.objectToDouble(null);
+        Double actualLongValue = SdlDataTypeConverter.objectToDouble(testLong);
+        Double actualShortValue = SdlDataTypeConverter.objectToDouble(testShort);
+        Double actualFloatValue = SdlDataTypeConverter.objectToDouble(testFloat);
+        Double actualDoubleValue = SdlDataTypeConverter.objectToDouble(testDouble);
+        Double actualIntegerValue = SdlDataTypeConverter.objectToDouble(testInteger);
+
+        // Valid Tests
+        assertEquals(TestValues.MATCH, expectedValue, actualDoubleValue);
+        assertEquals(TestValues.MATCH, expectedValue, actualIntegerValue);
+        assertEquals(TestValues.MATCH, expectedValue, actualFloatValue);
+
+        // Null Tests
+        assertNull(TestValues.NULL, actualNullValue);
+        assertNull(TestValues.NULL, actualLongValue);
+        assertNull(TestValues.NULL, actualShortValue);
+    }
 }
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
index 2dab00ccd..88ff2f8d2 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/VersionTest.java
@@ -13,10 +13,10 @@ import static junit.framework.TestCase.assertEquals;
 public class VersionTest {
 
     private static final String TEST_VERSION_STRING = "1.2.3";
-    private static final Version TEST_VERSION = new Version(1,2,3);
+    private static final Version TEST_VERSION = new Version(1, 2, 3);
 
     @Test
-    public void testConstructorCorrect(){
+    public void testConstructorCorrect() {
         Version version = new Version(TEST_VERSION_STRING);
         assertEquals(1, version.getMajor());
         assertEquals(2, version.getMinor());
@@ -24,51 +24,51 @@ public class VersionTest {
     }
 
     @Test
-    public void testConstructorIncorrect(){
-        try{
+    public void testConstructorIncorrect() {
+        try {
             Version version = new Version("1.2");
-        }catch (Exception e){
+        } catch (Exception e) {
             assert true;
         }
         assert false;
     }
 
     @Test
-    public void testToString(){
+    public void testToString() {
         Version version = new Version(TEST_VERSION_STRING);
         assertEquals(version.toString(), TEST_VERSION_STRING);
     }
 
     @Test
-    public void testisNewerThan(){
-        Version version1 = new Version(5,0,0);
+    public void testisNewerThan() {
+        Version version1 = new Version(5, 0, 0);
 
         //Supplied version is newer
-        assertEquals(-1,version1.isNewerThan(new Version(6,0,0)));
-        assertEquals(-1,version1.isNewerThan( new Version(5,1,0)));
-        assertEquals(-1,version1.isNewerThan( new Version(5,0,1)));
+        assertEquals(-1, version1.isNewerThan(new Version(6, 0, 0)));
+        assertEquals(-1, version1.isNewerThan(new Version(5, 1, 0)));
+        assertEquals(-1, version1.isNewerThan(new Version(5, 0, 1)));
 
         //Supplied version is older
-        assertEquals(1,version1.isNewerThan( new Version(4,0,0)));
-        assertEquals(1,version1.isNewerThan( new Version(4,1,0)));
-        assertEquals(1,version1.isNewerThan( new Version(4,0,1)));
+        assertEquals(1, version1.isNewerThan(new Version(4, 0, 0)));
+        assertEquals(1, version1.isNewerThan(new Version(4, 1, 0)));
+        assertEquals(1, version1.isNewerThan(new Version(4, 0, 1)));
 
         //Supplied  version is equal
-        assertEquals(0,version1.isNewerThan( new Version(5,0,0)));
+        assertEquals(0, version1.isNewerThan(new Version(5, 0, 0)));
 
     }
 
     @Test
-    public void testIsBetween(){
+    public void testIsBetween() {
 
-        assertEquals(TEST_VERSION.isBetween(new Version(1,0,0), new Version (2,0,0)), 1);
-        assertEquals(TEST_VERSION.isBetween(new Version(2,0,0), new Version (1,0,0)), -1);
-        assertEquals(TEST_VERSION.isBetween(new Version(2,0,0), new Version (3,0,0)), -1);
+        assertEquals(TEST_VERSION.isBetween(new Version(1, 0, 0), new Version(2, 0, 0)), 1);
+        assertEquals(TEST_VERSION.isBetween(new Version(2, 0, 0), new Version(1, 0, 0)), -1);
+        assertEquals(TEST_VERSION.isBetween(new Version(2, 0, 0), new Version(3, 0, 0)), -1);
 
-        assertEquals(TEST_VERSION.isBetween(new Version(1,0,0), new Version (1,2,3)), 0);
-        assertEquals(TEST_VERSION.isBetween(new Version(1,2,3), new Version (3,2,3)), 0);
+        assertEquals(TEST_VERSION.isBetween(new Version(1, 0, 0), new Version(1, 2, 3)), 0);
+        assertEquals(TEST_VERSION.isBetween(new Version(1, 2, 3), new Version(3, 2, 3)), 0);
 
-        assertEquals(TEST_VERSION.isBetween(new Version(1,2,3), new Version (1,2,3)), 0);
+        assertEquals(TEST_VERSION.isBetween(new Version(1, 2, 3), new Version(1, 2, 3)), 0);
 
     }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
index 9deff1ec8..1ad01a1c3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
@@ -15,27 +15,28 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat
 
 @RunWith(AndroidJUnit4.class)
 public class AndroidToolsTests {
-	
-	@Test
-	public void testIsServiceExportedNormal(){
-		
-		try{
-			AndroidTools.isServiceExported(getInstrumentation().getTargetContext(), new ComponentName(getInstrumentation().getTargetContext(), "test"));
-		}catch(Exception e){
-			Assert.fail("Exception during normal test: " + e.getMessage());
-		}
-		
-	}
-	@Test
-	public void testIsServiceExportedNull(){
-		
-		try{
-			AndroidTools.isServiceExported(getInstrumentation().getTargetContext(), null);
-			Assert.fail("Proccessed null data");
-		}catch(Exception e){
-			
-		}
-		
-	}
+
+    @Test
+    public void testIsServiceExportedNormal() {
+
+        try {
+            AndroidTools.isServiceExported(getInstrumentation().getTargetContext(), new ComponentName(getInstrumentation().getTargetContext(), "test"));
+        } catch (Exception e) {
+            Assert.fail("Exception during normal test: " + e.getMessage());
+        }
+
+    }
+
+    @Test
+    public void testIsServiceExportedNull() {
+
+        try {
+            AndroidTools.isServiceExported(getInstrumentation().getTargetContext(), null);
+            Assert.fail("Proccessed null data");
+        } catch (Exception e) {
+
+        }
+
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AppServiceFactory.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AppServiceFactory.java
index aa37eda2d..6400d9252 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AppServiceFactory.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AppServiceFactory.java
@@ -18,7 +18,7 @@ import java.util.List;
 public class AppServiceFactory {
 
 
-    public static AppServiceManifest createAppServiceManifest(AppServiceType type, String serviceName){
+    public static AppServiceManifest createAppServiceManifest(AppServiceType type, String serviceName) {
         AppServiceManifest manifest = new AppServiceManifest();
 
         manifest.setServiceName(serviceName);
@@ -26,7 +26,7 @@ public class AppServiceFactory {
         manifest.setAllowAppConsumers(true);
         List<FunctionID> handledRPCs = new ArrayList<>();
 
-        switch (type){
+        switch (type) {
             case MEDIA:
                 handledRPCs.add(FunctionID.BUTTON_PRESS);
                 manifest.setMediaServiceManifest(new MediaServiceManifest());
@@ -57,18 +57,18 @@ public class AppServiceFactory {
         return manifest;
     }
 
-    public static AppServiceRecord createAppServiceRecord(AppServiceType type, String serviceName, String serviceID, boolean isActive){
+    public static AppServiceRecord createAppServiceRecord(AppServiceType type, String serviceName, String serviceID, boolean isActive) {
         AppServiceRecord appServiceRecord = new AppServiceRecord();
-        appServiceRecord.setServiceManifest(createAppServiceManifest(type,serviceName));
+        appServiceRecord.setServiceManifest(createAppServiceManifest(type, serviceName));
         appServiceRecord.setServiceID(serviceID);
         appServiceRecord.setServiceActive(isActive);
         appServiceRecord.setServicePublished(true);
         return appServiceRecord;
     }
 
-    public static AppServiceCapability createAppServiceCapability(AppServiceType type, String serviceName, String serviceID, boolean isActive, ServiceUpdateReason updateReason){
+    public static AppServiceCapability createAppServiceCapability(AppServiceType type, String serviceName, String serviceID, boolean isActive, ServiceUpdateReason updateReason) {
         AppServiceCapability appServiceCapability = new AppServiceCapability();
-        appServiceCapability.setUpdatedAppServiceRecord(createAppServiceRecord(type,serviceName,serviceID,isActive));
+        appServiceCapability.setUpdatedAppServiceRecord(createAppServiceRecord(type, serviceName, serviceID, isActive));
         appServiceCapability.setUpdateReason(updateReason);
         return appServiceCapability;
     }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
index a816d6d87..c7b449fc3 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
@@ -17,139 +17,139 @@ import static junit.framework.TestCase.assertNull;
 @RunWith(AndroidJUnit4.class)
 public class LocalRouterServiceTests {
 
-	private static final int TEST_WITH_CONSTRUCTOR 	= 0;
-	private static final int TEST_WITH_CREATOR 		= 1;
-	
-	
-	@Test
-	public void testLocalRouterServiceParcel(){
-		Parcel p =  Parcel.obtain();
-		p.writeInt(4);
-		p.writeLong(System.currentTimeMillis());
-		p.writeParcelable(new Intent(), 0);
-		p.writeParcelable(new ComponentName(getInstrumentation().getContext(), "test"), 0);
-		p.setDataPosition(0);
-		
-		SdlRouterService.LocalRouterService local = new SdlRouterService.LocalRouterService(p);
-		
-		assertNotNull(local);
-		assertEquals(local.version,4);
-		p.recycle();
-		
-	}
-
-	@Test
-	public void testLocalRouterServiceParcelCreator(){
-		Parcel p =  Parcel.obtain();
-		p.writeInt(4);
-		p.writeLong(System.currentTimeMillis());
-		p.writeParcelable(new Intent(), 0);
-		p.writeParcelable(new ComponentName(getInstrumentation().getContext(), "test"), 0);
-		p.setDataPosition(0);
-		
-		SdlRouterService.LocalRouterService local = SdlRouterService.LocalRouterService.CREATOR.createFromParcel(p);
-		
-		assertNotNull(local);
-		assertEquals(local.version,4);
-		p.recycle();
-		
-	}
-
-	public SdlRouterService.LocalRouterService getLocalRouterService(int testWith, Parcel p){
-		if(testWith == TEST_WITH_CONSTRUCTOR){
-			return new SdlRouterService.LocalRouterService(p);
-		}else{
-			return SdlRouterService.LocalRouterService.CREATOR.createFromParcel(p);
-		}
-	}
-	
-	public void corruptParcel(int testWith){
-		Parcel p =  Parcel.obtain();
-		p.writeInt(4);
-		p.writeLong(System.currentTimeMillis());
-		p.writeParcelable(new ComponentName(getInstrumentation().getContext(), "test"), 0);
-		p.writeParcelable(new Intent(), 0);
-		p.setDataPosition(0);
-		
-		SdlRouterService.LocalRouterService local = getLocalRouterService(testWith, p);
-
-		assertNotNull(local);
-		assertNull(local.launchIntent);
-		assertNull(local.name);
-		
-		p.recycle();
-		//---------------------------------------------------------------------------
-		
-		p =  Parcel.obtain();
-		p.writeInt(4);
-		p.writeLong(System.currentTimeMillis());
-		p.writeParcelable(null,0);
-		p.writeParcelable(null,0);
-		p.setDataPosition(0);
-		
-		local = getLocalRouterService(testWith, p);
-
-		assertNotNull(local);
-		assertNull(local.launchIntent);
-		assertNull(local.name);
-		
-		p.recycle();
-		//---------------------------------------------------------------------------
-		
-		p =  Parcel.obtain();
-		p.writeInt(4);
-		p.writeLong(System.currentTimeMillis());
-		p.setDataPosition(0);
-		
-		local = getLocalRouterService(testWith, p);
-
-		assertNotNull(local);
-		assertNull(local.launchIntent);
-		assertNull(local.name);
-		
-		p.recycle();
-		
-		//---------------------------------------------------------------------------
-		local = null;
-		p = null;
-		
-		p =  Parcel.obtain();
-		p.writeInt(4);
-		p.writeLong(System.currentTimeMillis());
-		int space = p.dataSize();
-		p.writeParcelable(new Intent(), 0);
-		p.writeParcelable(new ComponentName(getInstrumentation().getContext(), "test"), 0);
-		p.setDataPosition(0);
-		
-		byte[] raw = p.marshall();
-		for(;space<raw.length;space++){
-			raw[space] = 0x00;
-		}
-		p.recycle();
-		p = Parcel.obtain();
-		p.unmarshall(raw, 0, raw.length);
-		p.setDataPosition(0);
-		
-		
-		local = getLocalRouterService(testWith, p);
-
-		assertNotNull(local);
-		assertNull(local.launchIntent);
-		assertNull(local.name);
-		
-		p.recycle();
-		
-	}
-
-	@Test
-	public void testLocalRouterServiceCorruptParcel(){
-		corruptParcel(TEST_WITH_CONSTRUCTOR);
-	}
-
-	@Test
-	public void testLocalRouterServiceCorruptParcelCreator(){
-		corruptParcel(TEST_WITH_CREATOR);
-	}
-	
+    private static final int TEST_WITH_CONSTRUCTOR = 0;
+    private static final int TEST_WITH_CREATOR = 1;
+
+
+    @Test
+    public void testLocalRouterServiceParcel() {
+        Parcel p = Parcel.obtain();
+        p.writeInt(4);
+        p.writeLong(System.currentTimeMillis());
+        p.writeParcelable(new Intent(), 0);
+        p.writeParcelable(new ComponentName(getInstrumentation().getContext(), "test"), 0);
+        p.setDataPosition(0);
+
+        SdlRouterService.LocalRouterService local = new SdlRouterService.LocalRouterService(p);
+
+        assertNotNull(local);
+        assertEquals(local.version, 4);
+        p.recycle();
+
+    }
+
+    @Test
+    public void testLocalRouterServiceParcelCreator() {
+        Parcel p = Parcel.obtain();
+        p.writeInt(4);
+        p.writeLong(System.currentTimeMillis());
+        p.writeParcelable(new Intent(), 0);
+        p.writeParcelable(new ComponentName(getInstrumentation().getContext(), "test"), 0);
+        p.setDataPosition(0);
+
+        SdlRouterService.LocalRouterService local = SdlRouterService.LocalRouterService.CREATOR.createFromParcel(p);
+
+        assertNotNull(local);
+        assertEquals(local.version, 4);
+        p.recycle();
+
+    }
+
+    public SdlRouterService.LocalRouterService getLocalRouterService(int testWith, Parcel p) {
+        if (testWith == TEST_WITH_CONSTRUCTOR) {
+            return new SdlRouterService.LocalRouterService(p);
+        } else {
+            return SdlRouterService.LocalRouterService.CREATOR.createFromParcel(p);
+        }
+    }
+
+    public void corruptParcel(int testWith) {
+        Parcel p = Parcel.obtain();
+        p.writeInt(4);
+        p.writeLong(System.currentTimeMillis());
+        p.writeParcelable(new ComponentName(getInstrumentation().getContext(), "test"), 0);
+        p.writeParcelable(new Intent(), 0);
+        p.setDataPosition(0);
+
+        SdlRouterService.LocalRouterService local = getLocalRouterService(testWith, p);
+
+        assertNotNull(local);
+        assertNull(local.launchIntent);
+        assertNull(local.name);
+
+        p.recycle();
+        //---------------------------------------------------------------------------
+
+        p = Parcel.obtain();
+        p.writeInt(4);
+        p.writeLong(System.currentTimeMillis());
+        p.writeParcelable(null, 0);
+        p.writeParcelable(null, 0);
+        p.setDataPosition(0);
+
+        local = getLocalRouterService(testWith, p);
+
+        assertNotNull(local);
+        assertNull(local.launchIntent);
+        assertNull(local.name);
+
+        p.recycle();
+        //---------------------------------------------------------------------------
+
+        p = Parcel.obtain();
+        p.writeInt(4);
+        p.writeLong(System.currentTimeMillis());
+        p.setDataPosition(0);
+
+        local = getLocalRouterService(testWith, p);
+
+        assertNotNull(local);
+        assertNull(local.launchIntent);
+        assertNull(local.name);
+
+        p.recycle();
+
+        //---------------------------------------------------------------------------
+        local = null;
+        p = null;
+
+        p = Parcel.obtain();
+        p.writeInt(4);
+        p.writeLong(System.currentTimeMillis());
+        int space = p.dataSize();
+        p.writeParcelable(new Intent(), 0);
+        p.writeParcelable(new ComponentName(getInstrumentation().getContext(), "test"), 0);
+        p.setDataPosition(0);
+
+        byte[] raw = p.marshall();
+        for (; space < raw.length; space++) {
+            raw[space] = 0x00;
+        }
+        p.recycle();
+        p = Parcel.obtain();
+        p.unmarshall(raw, 0, raw.length);
+        p.setDataPosition(0);
+
+
+        local = getLocalRouterService(testWith, p);
+
+        assertNotNull(local);
+        assertNull(local.launchIntent);
+        assertNull(local.name);
+
+        p.recycle();
+
+    }
+
+    @Test
+    public void testLocalRouterServiceCorruptParcel() {
+        corruptParcel(TEST_WITH_CONSTRUCTOR);
+    }
+
+    @Test
+    public void testLocalRouterServiceCorruptParcelCreator() {
+        corruptParcel(TEST_WITH_CREATOR);
+    }
+
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
index 03c71264a..63beacb5f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
@@ -19,41 +19,42 @@ import static junit.framework.TestCase.assertNotNull;
 @RunWith(AndroidJUnit4.class)
 public class MultiplexTransportTest {
 
-	RouterServiceValidator rsvp;
-
-	
-	@Before
-	public void setUp() throws Exception {
-		rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
-		rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_NONE);
-		rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-			@Override
-			public void onFinishedValidation(boolean valid, ComponentName name) {
-
-			}
-		});
-
-		
-	}
-	// test for setting error state.
-	@Test
-	public void testSetState() {
-		MultiplexBluetoothTransport btTransport = new MultiplexBluetoothTransport(new Handler(Looper.getMainLooper()) {
-			@Override
-			public void handleMessage(Message message) {
-				assertNotNull(message);
-				if (message.arg1 == MultiplexBaseTransport.STATE_ERROR) {
-					assertNotNull(message.getData());
-					assertEquals(MultiplexBaseTransport.REASON_SPP_ERROR, message.getData().getByte(MultiplexBaseTransport.ERROR_REASON_KEY));
-				} else {
-					//It will first listen before the error state
-					assertEquals(MultiplexBaseTransport.STATE_LISTEN, message.arg1);
-				}
-			}
-		});
-		btTransport.start();
-		final Bundle bundle = new Bundle();
-		bundle.putByte(MultiplexBaseTransport.ERROR_REASON_KEY, MultiplexBaseTransport.REASON_SPP_ERROR);
-		btTransport.setState(MultiplexBaseTransport.STATE_ERROR, bundle);
-	}
+    RouterServiceValidator rsvp;
+
+
+    @Before
+    public void setUp() throws Exception {
+        rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
+        rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_NONE);
+        rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+            @Override
+            public void onFinishedValidation(boolean valid, ComponentName name) {
+
+            }
+        });
+
+
+    }
+
+    // test for setting error state.
+    @Test
+    public void testSetState() {
+        MultiplexBluetoothTransport btTransport = new MultiplexBluetoothTransport(new Handler(Looper.getMainLooper()) {
+            @Override
+            public void handleMessage(Message message) {
+                assertNotNull(message);
+                if (message.arg1 == MultiplexBaseTransport.STATE_ERROR) {
+                    assertNotNull(message.getData());
+                    assertEquals(MultiplexBaseTransport.REASON_SPP_ERROR, message.getData().getByte(MultiplexBaseTransport.ERROR_REASON_KEY));
+                } else {
+                    //It will first listen before the error state
+                    assertEquals(MultiplexBaseTransport.STATE_LISTEN, message.arg1);
+                }
+            }
+        });
+        btTransport.start();
+        final Bundle bundle = new Bundle();
+        bundle.putByte(MultiplexBaseTransport.ERROR_REASON_KEY, MultiplexBaseTransport.REASON_SPP_ERROR);
+        btTransport.setState(MultiplexBaseTransport.STATE_ERROR, bundle);
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
index 812556f2c..840bfe118 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
@@ -38,504 +38,506 @@ import static junit.framework.TestCase.fail;
 @RunWith(AndroidJUnit4.class)
 @FixMethodOrder(MethodSorters.JVM)
 public class RSVTestCase {
-	private static final String TAG = "RSVTestCase";
-	
-	private static final long REFRESH_TRUSTED_APP_LIST_TIME_DAY 	= 3600000 * 24; // A day in ms
-	private static final long REFRESH_TRUSTED_APP_LIST_TIME_WEEK 	= REFRESH_TRUSTED_APP_LIST_TIME_DAY * 7; // A week in ms
-	private static final long REFRESH_TRUSTED_APP_LIST_TIME_MONTH 	= REFRESH_TRUSTED_APP_LIST_TIME_DAY * 30; // A ~month in ms
-	private static final String TEST =  "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] },\"com.ford.fordpass\" : { \"versionBlacklist\":[] } }}";
-	RouterServiceValidator rsvp;
-	private static final String APP_ID = "com.smartdevicelink.test.RSVTestCase";
-	/**
-	 * Set this boolean if you want to test the actual validation of router service
-	 */
-	boolean liveTest = false;
-	
-	@Before
-	public void setUp() throws Exception {
-		rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
-		
-	}
-
-	private static final Semaphore TRUSTED_LIST_LOCK = new Semaphore(1);
-
-	private void requestTListLock(){
-		try {
-			TRUSTED_LIST_LOCK.acquire();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	private void releaseTListLock(){
-		TRUSTED_LIST_LOCK.release();
-	}
-
-	private RouterServiceValidator.TrustedListCallback trustedListCallback = new RouterServiceValidator.TrustedListCallback(){
-		@Override
-		public void onListObtained(boolean successful) {
-			releaseTListLock();
-		}
-	};
-	
-/*
- * These tests are a little strange because they don't test the logic behind the validation of each piece.
- * However, they allow us to test
- */
-
-	@Test
-	public void testInstalledFrom(){
-		if(liveTest){
-			rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
-			rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-				@Override
-				public void onFinishedValidation(boolean valid, ComponentName name) {
-					assertTrue(valid);
-				}
-			});
-		}
-	}
-
-	@Test
-	public void testPackageCheck(){
-		if(liveTest){
-			rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_PACKAGE_CHECK);
-			rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-				@Override
-				public void onFinishedValidation(boolean valid, ComponentName name) {
-					assertTrue(valid);
-				}
-			});
-		}
-	}
-
-	@Test
-	public void testVersionCheck(){
-		if(liveTest){
-			rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_VERSION_CHECK);
-			rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-				@Override
-				public void onFinishedValidation(boolean valid, ComponentName name) {
-					assertTrue(valid);
-				}
-			});
-		}
-	}
-
-	@Test
-	public void testNoFlags(){
-		if(liveTest){
-			rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_NONE);
-			rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-				@Override
-				public void onFinishedValidation(boolean valid, ComponentName name) {
-					assertTrue(valid);
-				}
-			});
-		}
-	}
-
-	@Test
-	public void testAllFlags(){
-		if(liveTest){
-			rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_PERFORM_ALL_CHECKS);
-			rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-				@Override
-				public void onFinishedValidation(boolean valid, ComponentName name) {
-					assertTrue(valid);
-				}
-			});
-		}
-	}
-
-	@Test
-	public void testSecuritySetting(){
-		
-		RouterServiceValidator rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext()); //Use a locally scoped instance
-		rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-		
-		try{
-			Field securityLevelField =  RouterServiceValidator.class.getDeclaredField("securityLevel");
-			securityLevelField.setAccessible(true);
-			assertEquals(securityLevelField.get(rsvp),MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-		}catch(NoSuchFieldException e1){
-			fail(e1.getMessage());
-		}catch( IllegalAccessException e2){
-			fail(e2.getMessage());
-		}
-		assertEquals(RouterServiceValidator.getSecurityLevel(getInstrumentation().getTargetContext()), MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-	}
-
-	@Test
-	public void testHighSecurity(){
-		requestTListLock();
-
-		RouterServiceValidator rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext()); //Use a locally scoped instance
-		rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-		rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
-		
-		assertTrue(checkShouldOverrideInstalledFrom(rsvp,false));
-		
-		assertEquals(RouterServiceValidator.getRefreshRate(), REFRESH_TRUSTED_APP_LIST_TIME_WEEK);
-		
-		assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), true, null, trustedListCallback));
-		
-	}
-
-	@Test
-	public void testMediumSecurity(){
-		requestTListLock();
-
-		RouterServiceValidator rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext()); //Use a locally scoped instance
-		rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED);
-		rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
-		
-		assertTrue(checkShouldOverrideInstalledFrom(rsvp,true));
-		
-		assertEquals(RouterServiceValidator.getRefreshRate(), REFRESH_TRUSTED_APP_LIST_TIME_WEEK);
-		
-		assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), true, null, trustedListCallback));
-		
-	}
-
-	@Test
-	public void testLowSecurity(){
-		requestTListLock();
-
-		RouterServiceValidator rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext()); //Use a locally scoped instance
-		rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_LOW);
-		rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
-		
-		assertTrue(checkShouldOverrideInstalledFrom(rsvp,true));
-		
-		assertEquals(RouterServiceValidator.getRefreshRate(), REFRESH_TRUSTED_APP_LIST_TIME_MONTH);
-		
-		assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), true, null, trustedListCallback));
-		
-	}
-
-	@Test
-	public void testNoSecurity(){
-		requestTListLock();
-
-		RouterServiceValidator rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext(), new ComponentName("anything", getInstrumentation().getTargetContext().getClass().getSimpleName())) {
-			@Override
-			protected boolean isServiceRunning(Context context, ComponentName service) {
-				return true;
-			}
-		};
-		rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_OFF);
-		rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
-		
-		assertTrue(checkShouldOverrideInstalledFrom(rsvp,true));
-		
-		assertEquals(RouterServiceValidator.getRefreshRate(), REFRESH_TRUSTED_APP_LIST_TIME_WEEK);
-		
-		assertFalse(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), true, null, trustedListCallback));
-		
-		//This should always return true
-		rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-			@Override
-			public void onFinishedValidation(boolean valid, ComponentName name) {
-				assertTrue(valid);
-			}
-		});
-		
-	}
-	
-	public boolean checkShouldOverrideInstalledFrom(RouterServiceValidator rsvp, boolean shouldOverride){
-		try{
-			Method shouldOverrideInstalledFrom = RouterServiceValidator.class.getDeclaredMethod("shouldOverrideInstalledFrom");
-			shouldOverrideInstalledFrom.setAccessible(true);
-			boolean should = (Boolean)shouldOverrideInstalledFrom.invoke(rsvp);
-			
-			return shouldOverride == should;
-		
-		}catch(NoSuchMethodException e1){
-			fail(e1.getMessage());
-		}catch( IllegalAccessException e2){
-			fail(e2.getMessage());
-		}catch( InvocationTargetException e3){
-			fail(e3.getMessage());
-		}
-		return false;
-	}
-
-	@Test
-	public void testJsonRecovery(){
-		assertNotNull(rsvp.stringToJson(null));
-		assertNotNull(rsvp.stringToJson("asdf235vq32{]]"));
-
-	}
-
-	@Test
-	public void testInvalidateList(){
-		requestTListLock();
-
-		assertFalse(RouterServiceValidator.invalidateList(null));
-		assertTrue(RouterServiceValidator.invalidateList(getInstrumentation().getTargetContext()));
-
-		releaseTListLock();
-	}
-
-	@Test
-	public void testGetTrustedList(){
-		requestTListLock();
-
-		assertNull(RouterServiceValidator.getTrustedList(null));
-		assertNotNull(RouterServiceValidator.getTrustedList(getInstrumentation().getTargetContext()));
-
-		releaseTListLock();
-	}
-
-	@Test
-	public void testSetTrustedList(){
-		requestTListLock();
-
-		assertFalse(RouterServiceValidator.setTrustedList(null,null));
-		assertFalse(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(),null));
-		assertFalse(RouterServiceValidator.setTrustedList(null,"test"));
-		assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(),"test"));
-		assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(),TEST));
-		assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(),TEST+TEST+TEST+TEST+TEST));
-		StringBuilder builder = new StringBuilder();
-		for(int i = 0; i<1000; i++){
-			builder.append(TEST);
-		}
-		assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(),builder.toString()));
-
-		releaseTListLock();
-	}
-
-	@Test
-	public void testTrustedListSetAndGet(){
-		requestTListLock();
-
-		assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(),TEST));
-		String retVal = RouterServiceValidator.getTrustedList(getInstrumentation().getTargetContext());
-		assertNotNull(retVal);
-		assertTrue(TEST.equals(retVal));
-
-		StringBuilder builder = new StringBuilder();
-		for(int i = 0; i<1000; i++){
-			builder.append(TEST);
-		}
-		assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(),builder.toString()));
-		retVal = RouterServiceValidator.getTrustedList(getInstrumentation().getTargetContext());
-		assertNotNull(retVal);
-		assertTrue(builder.toString().equals(retVal));
-
-		releaseTListLock();
-	}
-
-	@Test
-	public void testInvalidationSequence(){
-		requestTListLock();
-
-		assertTrue(RouterServiceValidator.invalidateList(getInstrumentation().getTargetContext()));
-		assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), false, null, trustedListCallback));
-	}
-
-	@Test
-	public void testAppStorePackages(){
-		assertTrue(TrustedAppStore.isTrustedStore(TrustedAppStore.PLAY_STORE.packageString));
-		assertTrue(TrustedAppStore.isTrustedStore("com.xiaomi.market"));
-		assertFalse(TrustedAppStore.isTrustedStore("test"));
-		assertFalse(TrustedAppStore.isTrustedStore(null));
-		
-		rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
-		rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
-		rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-		
-		PackageManager packageManager = getInstrumentation().getTargetContext().getPackageManager();
-		List<PackageInfo> packages = packageManager.getInstalledPackages(0);
-		String appStore;
-		for(PackageInfo info: packages){
-			appStore = packageManager.getInstallerPackageName(info.packageName);
-			if(TrustedAppStore.isTrustedStore(appStore)){
-				assertTrue(rsvp.wasInstalledByAppStore(info.packageName));
-			}
-		}
-		
-		assertFalse(rsvp.wasInstalledByAppStore(null));
-	}
-
-	@Test
-	public void testVersionBlackList(){
-		rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
-		JSONArray array = new JSONArray();
-		for(int i=0; i<25; i++){
-			if(i%3 == 0){
-				array.put(i);
-			}
-		}
-		assertTrue(rsvp.verifyVersion(1, null));
-		assertTrue(rsvp.verifyVersion(1, array));
-		assertTrue(rsvp.verifyVersion(100, array));
-		assertFalse(rsvp.verifyVersion(3, array));
-		assertFalse(rsvp.verifyVersion(-3, array));
-
-	}
-	
-	static boolean didFinish = false;
-	@Test
-	public void  testGetAndCheckList(){
-		requestTListLock();
-
-		final Object REQUEST_LOCK = new Object();
-		didFinish = false;
-		HttpRequestTaskCallback cb = new HttpRequestTaskCallback(){
-			
-			@Override
-			public void httpCallComplete(String response) {
-				//Might want to check if this list is ok
-				Log.d(TAG, "APPS! " + response);
-				synchronized(REQUEST_LOCK){
-					didFinish = true;
-					REQUEST_LOCK.notify();
-				}
-				releaseTListLock();
-			}
-			@Override
-			public void httpFailure(int statusCode) {
-				Log.e(TAG, "Error while requesting trusted app list: " + statusCode);
-				synchronized(REQUEST_LOCK){
-					didFinish = true;
-					REQUEST_LOCK.notify();
-				}
-				releaseTListLock();
-			}
-		};
-		
-		assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(),true, cb, null));
-		//Now wait for call to finish
-		synchronized(REQUEST_LOCK){
-			try {
-				REQUEST_LOCK.wait();
-				assertTrue(didFinish);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-		
-		
-	}
-	
-	/**
-	 * Test to check that we can save our last request which actually houses all the previous known sdl enabled apps
-	 */
-	@Test
-	public void testRequestChange(){
-		requestTListLock();
-
-		RouterServiceValidator.setLastRequest(getInstrumentation().getTargetContext(), null);
-		assertNull(RouterServiceValidator.getLastRequest(getInstrumentation().getTargetContext()));
-
-		JSONObject object = null;
-		try {
-			object = new JSONObject(TEST);
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-		assertNotNull(object);
-		assertFalse(object.equals(RouterServiceValidator.getLastRequest(getInstrumentation().getTargetContext())));
-		
-		assertTrue(RouterServiceValidator.setLastRequest(getInstrumentation().getTargetContext(), object.toString()));
-		
-		String oldRequest = RouterServiceValidator.getLastRequest(getInstrumentation().getTargetContext());
-		assertNotNull(oldRequest);
-		assertTrue(object.toString().equals(oldRequest));
-		
-		//Now test a new list
-		String test = "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.test.test\" : { \"versionBlacklist\":[] },\"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] },\"com.ford.fordpass\" : { \"versionBlacklist\":[] } }}";
-		object = null;
-		try {
-			object = new JSONObject(test);
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-		assertNotNull(object);
-		assertFalse(object.equals(RouterServiceValidator.getLastRequest(getInstrumentation().getTargetContext())));
-		//Clear it for next test
-		RouterServiceValidator.setLastRequest(getInstrumentation().getTargetContext(), null);
-
-		releaseTListLock();
-	}
-
-	/**
-	 * Test app's router validation. Validation should fail when the given context and ComponentName object are from different packages and security setting is not OFF
-	 * and app is not on trusted list. Validation should pass when the given context and ComponentName object are from the same package.
-	 */
-	@Test
-	public void testAppSelfValidation() {
-
-		class RouterServiceValidatorTest extends RouterServiceValidator{
-			public RouterServiceValidatorTest(Context context){
-				super(context);
-			}
-
-			public RouterServiceValidatorTest(Context context, ComponentName service){
-				super(context, service);
-			}
-
-			// Override this method and simply returning true for the purpose of this test
-			protected boolean isServiceRunning(Context context, ComponentName service){
-				return true;
-			}
-		}
-
-		// Fail, different package name for context and service and app security setting is not OFF and app is not on trusted list
-		RouterServiceValidatorTest rsvpFail = new RouterServiceValidatorTest(getInstrumentation().getTargetContext(), new ComponentName("anything", getInstrumentation().getTargetContext().getClass().getSimpleName()));
-		rsvpFail.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-		rsvpFail.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-			@Override
-			public void onFinishedValidation(boolean valid, ComponentName name) {
-				assertFalse(valid);
-			}
-		});
-
-		// Success, same package name for context and service
-		RouterServiceValidatorTest rsvpPass = new RouterServiceValidatorTest(getInstrumentation().getTargetContext(), new ComponentName(getInstrumentation().getTargetContext().getPackageName(), getInstrumentation().getTargetContext().getClass().getSimpleName()));
-		rsvpPass.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-		rsvpPass.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-			@Override
-			public void onFinishedValidation(boolean valid, ComponentName name) {
-				assertTrue(valid);
-			}
-		});
-	}
-
-	/**
-	 * Unit test for validateAsync.
-	 */
-	@Test
-	public void testValidateAsync() {
-		final MultiplexTransportConfig config = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), APP_ID, MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
-		final RouterServiceValidator validator = new RouterServiceValidator(config);
-		final ConditionVariable cond = new ConditionVariable();
-		validator.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-			@Override
-			public void onFinishedValidation(boolean valid, ComponentName name) {
-				Log.d(TAG, "onFinishedValidation: valid=" + valid + "; componentName=" + name);
-				assertFalse(valid); // expected valid = false for this (bogus) APP_ID..
-				cond.open();
-			}
-		});
-		cond.block();
-
-		// next, test for FLAG_MULTI_SECURITY_OFF
-		final MultiplexTransportConfig config2 = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), APP_ID, MultiplexTransportConfig.FLAG_MULTI_SECURITY_OFF);
-		final RouterServiceValidator validator2 = new RouterServiceValidator(config2);
-		cond.close();
-		validator2.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-			@Override
-			public void onFinishedValidation(boolean valid, ComponentName name) {
-				Log.d(TAG, "onFinishedValidation: valid=" + valid + "; componentName=" + name);
-				// return value does not matter when security is off.
-				cond.open();
-			}
-		});
-		cond.block();
-	}
+    private static final String TAG = "RSVTestCase";
+
+    private static final long REFRESH_TRUSTED_APP_LIST_TIME_DAY = 3600000 * 24; // A day in ms
+    private static final long REFRESH_TRUSTED_APP_LIST_TIME_WEEK = REFRESH_TRUSTED_APP_LIST_TIME_DAY * 7; // A week in ms
+    private static final long REFRESH_TRUSTED_APP_LIST_TIME_MONTH = REFRESH_TRUSTED_APP_LIST_TIME_DAY * 30; // A ~month in ms
+    private static final String TEST = "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] },\"com.ford.fordpass\" : { \"versionBlacklist\":[] } }}";
+    RouterServiceValidator rsvp;
+    private static final String APP_ID = "com.smartdevicelink.test.RSVTestCase";
+    /**
+     * Set this boolean if you want to test the actual validation of router service
+     */
+    boolean liveTest = false;
+
+    @Before
+    public void setUp() throws Exception {
+        rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
+
+    }
+
+    private static final Semaphore TRUSTED_LIST_LOCK = new Semaphore(1);
+
+    private void requestTListLock() {
+        try {
+            TRUSTED_LIST_LOCK.acquire();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void releaseTListLock() {
+        TRUSTED_LIST_LOCK.release();
+    }
+
+    private RouterServiceValidator.TrustedListCallback trustedListCallback = new RouterServiceValidator.TrustedListCallback() {
+        @Override
+        public void onListObtained(boolean successful) {
+            releaseTListLock();
+        }
+    };
+
+    /*
+     * These tests are a little strange because they don't test the logic behind the validation of each piece.
+     * However, they allow us to test
+     */
+
+    @Test
+    public void testInstalledFrom() {
+        if (liveTest) {
+            rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
+            rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+                @Override
+                public void onFinishedValidation(boolean valid, ComponentName name) {
+                    assertTrue(valid);
+                }
+            });
+        }
+    }
+
+    @Test
+    public void testPackageCheck() {
+        if (liveTest) {
+            rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_PACKAGE_CHECK);
+            rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+                @Override
+                public void onFinishedValidation(boolean valid, ComponentName name) {
+                    assertTrue(valid);
+                }
+            });
+        }
+    }
+
+    @Test
+    public void testVersionCheck() {
+        if (liveTest) {
+            rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_VERSION_CHECK);
+            rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+                @Override
+                public void onFinishedValidation(boolean valid, ComponentName name) {
+                    assertTrue(valid);
+                }
+            });
+        }
+    }
+
+    @Test
+    public void testNoFlags() {
+        if (liveTest) {
+            rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_NONE);
+            rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+                @Override
+                public void onFinishedValidation(boolean valid, ComponentName name) {
+                    assertTrue(valid);
+                }
+            });
+        }
+    }
+
+    @Test
+    public void testAllFlags() {
+        if (liveTest) {
+            rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_PERFORM_ALL_CHECKS);
+            rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+                @Override
+                public void onFinishedValidation(boolean valid, ComponentName name) {
+                    assertTrue(valid);
+                }
+            });
+        }
+    }
+
+    @Test
+    public void testSecuritySetting() {
+
+        RouterServiceValidator rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext()); //Use a locally scoped instance
+        rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+
+        try {
+            Field securityLevelField = RouterServiceValidator.class.getDeclaredField("securityLevel");
+            securityLevelField.setAccessible(true);
+            assertEquals(securityLevelField.get(rsvp), MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+        } catch (NoSuchFieldException e1) {
+            fail(e1.getMessage());
+        } catch (IllegalAccessException e2) {
+            fail(e2.getMessage());
+        }
+        assertEquals(RouterServiceValidator.getSecurityLevel(getInstrumentation().getTargetContext()), MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+    }
+
+    @Test
+    public void testHighSecurity() {
+        requestTListLock();
+
+        RouterServiceValidator rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext()); //Use a locally scoped instance
+        rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+        rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
+
+        assertTrue(checkShouldOverrideInstalledFrom(rsvp, false));
+
+        assertEquals(RouterServiceValidator.getRefreshRate(), REFRESH_TRUSTED_APP_LIST_TIME_WEEK);
+
+        assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), true, null, trustedListCallback));
+
+    }
+
+    @Test
+    public void testMediumSecurity() {
+        requestTListLock();
+
+        RouterServiceValidator rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext()); //Use a locally scoped instance
+        rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED);
+        rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
+
+        assertTrue(checkShouldOverrideInstalledFrom(rsvp, true));
+
+        assertEquals(RouterServiceValidator.getRefreshRate(), REFRESH_TRUSTED_APP_LIST_TIME_WEEK);
+
+        assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), true, null, trustedListCallback));
+
+    }
+
+    @Test
+    public void testLowSecurity() {
+        requestTListLock();
+
+        RouterServiceValidator rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext()); //Use a locally scoped instance
+        rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_LOW);
+        rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
+
+        assertTrue(checkShouldOverrideInstalledFrom(rsvp, true));
+
+        assertEquals(RouterServiceValidator.getRefreshRate(), REFRESH_TRUSTED_APP_LIST_TIME_MONTH);
+
+        assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), true, null, trustedListCallback));
+
+    }
+
+    @Test
+    public void testNoSecurity() {
+        requestTListLock();
+
+        RouterServiceValidator rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext(), new ComponentName("anything", getInstrumentation().getTargetContext().getClass().getSimpleName())) {
+            @Override
+            protected boolean isServiceRunning(Context context, ComponentName service) {
+                return true;
+            }
+        };
+        rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_OFF);
+        rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
+
+        assertTrue(checkShouldOverrideInstalledFrom(rsvp, true));
+
+        assertEquals(RouterServiceValidator.getRefreshRate(), REFRESH_TRUSTED_APP_LIST_TIME_WEEK);
+
+        assertFalse(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), true, null, trustedListCallback));
+
+        //This should always return true
+        rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+            @Override
+            public void onFinishedValidation(boolean valid, ComponentName name) {
+                assertTrue(valid);
+            }
+        });
+
+    }
+
+    public boolean checkShouldOverrideInstalledFrom(RouterServiceValidator rsvp, boolean shouldOverride) {
+        try {
+            Method shouldOverrideInstalledFrom = RouterServiceValidator.class.getDeclaredMethod("shouldOverrideInstalledFrom");
+            shouldOverrideInstalledFrom.setAccessible(true);
+            boolean should = (Boolean) shouldOverrideInstalledFrom.invoke(rsvp);
+
+            return shouldOverride == should;
+
+        } catch (NoSuchMethodException e1) {
+            fail(e1.getMessage());
+        } catch (IllegalAccessException e2) {
+            fail(e2.getMessage());
+        } catch (InvocationTargetException e3) {
+            fail(e3.getMessage());
+        }
+        return false;
+    }
+
+    @Test
+    public void testJsonRecovery() {
+        assertNotNull(rsvp.stringToJson(null));
+        assertNotNull(rsvp.stringToJson("asdf235vq32{]]"));
+
+    }
+
+    @Test
+    public void testInvalidateList() {
+        requestTListLock();
+
+        assertFalse(RouterServiceValidator.invalidateList(null));
+        assertTrue(RouterServiceValidator.invalidateList(getInstrumentation().getTargetContext()));
+
+        releaseTListLock();
+    }
+
+    @Test
+    public void testGetTrustedList() {
+        requestTListLock();
+
+        assertNull(RouterServiceValidator.getTrustedList(null));
+        assertNotNull(RouterServiceValidator.getTrustedList(getInstrumentation().getTargetContext()));
+
+        releaseTListLock();
+    }
+
+    @Test
+    public void testSetTrustedList() {
+        requestTListLock();
+
+        assertFalse(RouterServiceValidator.setTrustedList(null, null));
+        assertFalse(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(), null));
+        assertFalse(RouterServiceValidator.setTrustedList(null, "test"));
+        assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(), "test"));
+        assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(), TEST));
+        assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(), TEST + TEST + TEST + TEST + TEST));
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < 1000; i++) {
+            builder.append(TEST);
+        }
+        assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(), builder.toString()));
+
+        releaseTListLock();
+    }
+
+    @Test
+    public void testTrustedListSetAndGet() {
+        requestTListLock();
+
+        assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(), TEST));
+        String retVal = RouterServiceValidator.getTrustedList(getInstrumentation().getTargetContext());
+        assertNotNull(retVal);
+        assertTrue(TEST.equals(retVal));
+
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < 1000; i++) {
+            builder.append(TEST);
+        }
+        assertTrue(RouterServiceValidator.setTrustedList(getInstrumentation().getTargetContext(), builder.toString()));
+        retVal = RouterServiceValidator.getTrustedList(getInstrumentation().getTargetContext());
+        assertNotNull(retVal);
+        assertTrue(builder.toString().equals(retVal));
+
+        releaseTListLock();
+    }
+
+    @Test
+    public void testInvalidationSequence() {
+        requestTListLock();
+
+        assertTrue(RouterServiceValidator.invalidateList(getInstrumentation().getTargetContext()));
+        assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), false, null, trustedListCallback));
+    }
+
+    @Test
+    public void testAppStorePackages() {
+        assertTrue(TrustedAppStore.isTrustedStore(TrustedAppStore.PLAY_STORE.packageString));
+        assertTrue(TrustedAppStore.isTrustedStore("com.xiaomi.market"));
+        assertFalse(TrustedAppStore.isTrustedStore("test"));
+        assertFalse(TrustedAppStore.isTrustedStore(null));
+
+        rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
+        rsvp.setFlags(RouterServiceValidator.FLAG_DEBUG_INSTALLED_FROM_CHECK);
+        rsvp.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+
+        PackageManager packageManager = getInstrumentation().getTargetContext().getPackageManager();
+        List<PackageInfo> packages = packageManager.getInstalledPackages(0);
+        String appStore;
+        for (PackageInfo info : packages) {
+            appStore = packageManager.getInstallerPackageName(info.packageName);
+            if (TrustedAppStore.isTrustedStore(appStore)) {
+                assertTrue(rsvp.wasInstalledByAppStore(info.packageName));
+            }
+        }
+
+        assertFalse(rsvp.wasInstalledByAppStore(null));
+    }
+
+    @Test
+    public void testVersionBlackList() {
+        rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
+        JSONArray array = new JSONArray();
+        for (int i = 0; i < 25; i++) {
+            if (i % 3 == 0) {
+                array.put(i);
+            }
+        }
+        assertTrue(rsvp.verifyVersion(1, null));
+        assertTrue(rsvp.verifyVersion(1, array));
+        assertTrue(rsvp.verifyVersion(100, array));
+        assertFalse(rsvp.verifyVersion(3, array));
+        assertFalse(rsvp.verifyVersion(-3, array));
+
+    }
+
+    static boolean didFinish = false;
+
+    @Test
+    public void testGetAndCheckList() {
+        requestTListLock();
+
+        final Object REQUEST_LOCK = new Object();
+        didFinish = false;
+        HttpRequestTaskCallback cb = new HttpRequestTaskCallback() {
+
+            @Override
+            public void httpCallComplete(String response) {
+                //Might want to check if this list is ok
+                Log.d(TAG, "APPS! " + response);
+                synchronized (REQUEST_LOCK) {
+                    didFinish = true;
+                    REQUEST_LOCK.notify();
+                }
+                releaseTListLock();
+            }
+
+            @Override
+            public void httpFailure(int statusCode) {
+                Log.e(TAG, "Error while requesting trusted app list: " + statusCode);
+                synchronized (REQUEST_LOCK) {
+                    didFinish = true;
+                    REQUEST_LOCK.notify();
+                }
+                releaseTListLock();
+            }
+        };
+
+        assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(), true, cb, null));
+        //Now wait for call to finish
+        synchronized (REQUEST_LOCK) {
+            try {
+                REQUEST_LOCK.wait();
+                assertTrue(didFinish);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+
+    }
+
+    /**
+     * Test to check that we can save our last request which actually houses all the previous known sdl enabled apps
+     */
+    @Test
+    public void testRequestChange() {
+        requestTListLock();
+
+        RouterServiceValidator.setLastRequest(getInstrumentation().getTargetContext(), null);
+        assertNull(RouterServiceValidator.getLastRequest(getInstrumentation().getTargetContext()));
+
+        JSONObject object = null;
+        try {
+            object = new JSONObject(TEST);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        assertNotNull(object);
+        assertFalse(object.equals(RouterServiceValidator.getLastRequest(getInstrumentation().getTargetContext())));
+
+        assertTrue(RouterServiceValidator.setLastRequest(getInstrumentation().getTargetContext(), object.toString()));
+
+        String oldRequest = RouterServiceValidator.getLastRequest(getInstrumentation().getTargetContext());
+        assertNotNull(oldRequest);
+        assertTrue(object.toString().equals(oldRequest));
+
+        //Now test a new list
+        String test = "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.test.test\" : { \"versionBlacklist\":[] },\"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] },\"com.ford.fordpass\" : { \"versionBlacklist\":[] } }}";
+        object = null;
+        try {
+            object = new JSONObject(test);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        assertNotNull(object);
+        assertFalse(object.equals(RouterServiceValidator.getLastRequest(getInstrumentation().getTargetContext())));
+        //Clear it for next test
+        RouterServiceValidator.setLastRequest(getInstrumentation().getTargetContext(), null);
+
+        releaseTListLock();
+    }
+
+    /**
+     * Test app's router validation. Validation should fail when the given context and ComponentName object are from different packages and security setting is not OFF
+     * and app is not on trusted list. Validation should pass when the given context and ComponentName object are from the same package.
+     */
+    @Test
+    public void testAppSelfValidation() {
+
+        class RouterServiceValidatorTest extends RouterServiceValidator {
+            public RouterServiceValidatorTest(Context context) {
+                super(context);
+            }
+
+            public RouterServiceValidatorTest(Context context, ComponentName service) {
+                super(context, service);
+            }
+
+            // Override this method and simply returning true for the purpose of this test
+            protected boolean isServiceRunning(Context context, ComponentName service) {
+                return true;
+            }
+        }
+
+        // Fail, different package name for context and service and app security setting is not OFF and app is not on trusted list
+        RouterServiceValidatorTest rsvpFail = new RouterServiceValidatorTest(getInstrumentation().getTargetContext(), new ComponentName("anything", getInstrumentation().getTargetContext().getClass().getSimpleName()));
+        rsvpFail.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+        rsvpFail.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+            @Override
+            public void onFinishedValidation(boolean valid, ComponentName name) {
+                assertFalse(valid);
+            }
+        });
+
+        // Success, same package name for context and service
+        RouterServiceValidatorTest rsvpPass = new RouterServiceValidatorTest(getInstrumentation().getTargetContext(), new ComponentName(getInstrumentation().getTargetContext().getPackageName(), getInstrumentation().getTargetContext().getClass().getSimpleName()));
+        rsvpPass.setSecurityLevel(MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+        rsvpPass.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+            @Override
+            public void onFinishedValidation(boolean valid, ComponentName name) {
+                assertTrue(valid);
+            }
+        });
+    }
+
+    /**
+     * Unit test for validateAsync.
+     */
+    @Test
+    public void testValidateAsync() {
+        final MultiplexTransportConfig config = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), APP_ID, MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH);
+        final RouterServiceValidator validator = new RouterServiceValidator(config);
+        final ConditionVariable cond = new ConditionVariable();
+        validator.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+            @Override
+            public void onFinishedValidation(boolean valid, ComponentName name) {
+                Log.d(TAG, "onFinishedValidation: valid=" + valid + "; componentName=" + name);
+                assertFalse(valid); // expected valid = false for this (bogus) APP_ID..
+                cond.open();
+            }
+        });
+        cond.block();
+
+        // next, test for FLAG_MULTI_SECURITY_OFF
+        final MultiplexTransportConfig config2 = new MultiplexTransportConfig(getInstrumentation().getTargetContext(), APP_ID, MultiplexTransportConfig.FLAG_MULTI_SECURITY_OFF);
+        final RouterServiceValidator validator2 = new RouterServiceValidator(config2);
+        cond.close();
+        validator2.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+            @Override
+            public void onFinishedValidation(boolean valid, ComponentName name) {
+                Log.d(TAG, "onFinishedValidation: valid=" + valid + "; componentName=" + name);
+                // return value does not matter when security is off.
+                cond.open();
+            }
+        });
+        cond.block();
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
index d9af0faed..6a7d0b4fa 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RegisteredAppTests.java
@@ -36,7 +36,7 @@ public class RegisteredAppTests {
         SdlRouterService.RegisteredApp app = router.new RegisteredApp(APP_ID, 1, messenger);
 
         // Call Handle Message
-        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START,bytes, TransportType.BLUETOOTH);
+        app.handleMessage(TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START, bytes, TransportType.BLUETOOTH);
 
         // Insure that the buffer is not null, if it is the test will fail
         assertNotNull(app.buffer);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
index 2ab12e51a..cc5252cdd 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/SdlRouterServiceTests.java
@@ -59,15 +59,15 @@ public class SdlRouterServiceTests {
     ProtocolMessage pm = null;
     BinaryFrameHeader binFrameHeader = null;
 
-	/**
-	 * Ensure that the router service hardcoded number is the same as the integer value in
-	 * the resources.
-	 */
-	@Test
-	public void testVersionCorrectness(){
-    	int resourceVersion = getInstrumentation().getContext().getResources().getInteger(com.smartdevicelink.test.R.integer.sdl_router_service_version_value);
-		assertEquals(resourceVersion, SdlRouterService.ROUTER_SERVICE_VERSION_NUMBER);
-	}
+    /**
+     * Ensure that the router service hardcoded number is the same as the integer value in
+     * the resources.
+     */
+    @Test
+    public void testVersionCorrectness() {
+        int resourceVersion = getInstrumentation().getContext().getResources().getInteger(com.smartdevicelink.test.R.integer.sdl_router_service_version_value);
+        assertEquals(resourceVersion, SdlRouterService.ROUTER_SERVICE_VERSION_NUMBER);
+    }
 
     /**
      * Test null bundle handling in AltTransportHandler when handling messages. Only test the case of
@@ -170,535 +170,536 @@ public class SdlRouterServiceTests {
         }
     }
 
-	/**
-	 * Test sending UAI to an app whose session id is the same as a removed app
-	 * but is indeed a different app
-	 *
-	 * @see SdlRouterService#sendPacketToRegisteredApp(SdlPacket)
-	 */
-	@Test
-	public void testRegisterAppExistingSessionIDDifferentApp() {
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		Method method;
-		try {
-			// create instance of router service
-			SdlRouterService sdlRouterService = new SdlRouterService();
-
-			// We need a registered app for this to work
-			Message message = Message.obtain();
-			SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo);
-			SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo);
-			HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
-			registeredApps.put(app1.getAppId(),app1);
-			registeredApps.put(app2.getAppId(),app2);
-
-			// set registered apps array
-			Field raf = sdlRouterService.getClass().getDeclaredField("registeredApps");
-			raf.setAccessible(true);
-			raf.set(sdlRouterService, registeredApps);
-
-			// need a session map too
-			SparseArray<String> sessionMap = new SparseArray<String>();
-			sessionMap.put(1, "12345");
-			Field sessionMapField = sdlRouterService.getClass().getDeclaredField("bluetoothSessionMap");
-			sessionMapField.setAccessible(true);
-			sessionMapField.set(sdlRouterService, sessionMap);
-
-			// set cleaned session map
-			SparseIntArray testCleanedMap = new SparseIntArray();
-			testCleanedMap.put(1, 12345);
-			Field f = sdlRouterService.getClass().getDeclaredField("cleanedSessionMap");
-			f.setAccessible(true);
-			f.set(sdlRouterService, testCleanedMap);
-
-			// set session hash id map
-			SparseIntArray testHashIdMap = new SparseIntArray();
-			testHashIdMap.put(1, 12344);
-			Field f2 = sdlRouterService.getClass().getDeclaredField("sessionHashIdMap");
-			f2.setAccessible(true);
-			f2.set(sdlRouterService, testHashIdMap);
-
-			// make sure maps are set and NOT the same
-			Assert.assertNotNull(raf.get(sdlRouterService));
-			Assert.assertNotNull(sessionMapField.get(sdlRouterService));
-			Assert.assertNotNull(f.get(sdlRouterService));
-			Assert.assertNotNull(f2.get(sdlRouterService));
-
-			// make da RPC
-			UnregisterAppInterface request = new UnregisterAppInterface();
-			request.setCorrelationID(SAMPLE_RPC_CORRELATION_ID);
-
-			// build protocol message
-			byte[] msgBytes = JsonRPCMarshaller.marshall(request, (byte) version);
-			pm = new ProtocolMessage();
-			pm.setData(msgBytes);
-			pm.setSessionID((byte) sessionId);
-			pm.setMessageType(MessageType.RPC);
-			pm.setSessionType(SessionType.RPC);
-			pm.setFunctionID(FunctionID.getFunctionId(request.getFunctionName()));
-			pm.setCorrID(request.getCorrelationID());
-
-			if (request.getBulkData() != null) {
-				pm.setBulkData(request.getBulkData());
-			}
-
-			// binary frame header
-			byte[] data = new byte[12 + pm.getJsonSize()];
-			binFrameHeader = SdlPacketFactory.createBinaryFrameHeader(pm.getRPCType(), pm.getFunctionID(), pm.getCorrID(), pm.getJsonSize());
-			System.arraycopy(binFrameHeader.assembleHeaderBytes(), 0, data, 0, 12);
-			System.arraycopy(pm.getData(), 0, data, 12, pm.getJsonSize());
-
-			// create packet and invoke sendPacketToRegisteredApp
-			SdlPacket packet = new SdlPacket(4, false, SdlPacket.FRAME_TYPE_SINGLE, SdlPacket.SERVICE_TYPE_RPC, 0, sessionId, data.length, 123, data);
-			packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH,null));
-			method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
-			Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
-
-			// we do not want the UAI packet to be sent. make sure it is dropped
-			Assert.assertFalse(success);
-
-		} catch (Exception e) {
-			Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
-		}
-	}
-	/**
-	 * Test sending UAI to an app whose session id is the same as a removed app
-	 * but is indeed the SAME app
-	 *
-	 * @see SdlRouterService#sendPacketToRegisteredApp(SdlPacket)
-	 */
-	@Test
-	public void testRegisterAppExistingSessionIDSameApp() {
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		Method method;
-		try {
-			// create instance of router service
-			SdlRouterService sdlRouterService = new SdlRouterService();
-
-			// We need a registered app for this to work
-			Message message = Message.obtain();
-			SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo);
-			SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo);
-			HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
-			registeredApps.put(app1.getAppId(),app1);
-			registeredApps.put(app2.getAppId(),app2);
-
-			// set registered apps array
-			Field raf = sdlRouterService.getClass().getDeclaredField("registeredApps");
-			raf.setAccessible(true);
-			raf.set(sdlRouterService, registeredApps);
-
-			// need a session map too
-			SparseArray<String> sessionMap = new SparseArray<String>();
-			sessionMap.put(1, "12345");
-			Field sessionMapField = sdlRouterService.getClass().getDeclaredField("bluetoothSessionMap");
-			sessionMapField.setAccessible(true);
-			sessionMapField.set(sdlRouterService, sessionMap);
-
-			// set cleaned session map
-			SparseIntArray testCleanedMap = new SparseIntArray();
-			testCleanedMap.put(1, 12345);
-			Field f = sdlRouterService.getClass().getDeclaredField("cleanedSessionMap");
-			f.setAccessible(true);
-			f.set(sdlRouterService, testCleanedMap);
-
-			// set session hash id map
-			SparseIntArray testHashIdMap = new SparseIntArray();
-			testHashIdMap.put(1, 12345);
-			Field f2 = sdlRouterService.getClass().getDeclaredField("sessionHashIdMap");
-			f2.setAccessible(true);
-			f2.set(sdlRouterService, testHashIdMap);
-
-			// make sure maps are set and NOT the same
-			Assert.assertNotNull(raf.get(sdlRouterService));
-			Assert.assertNotNull(sessionMapField.get(sdlRouterService));
-			Assert.assertNotNull(f.get(sdlRouterService));
-			Assert.assertNotNull(f2.get(sdlRouterService));
-
-			// make da RPC
-			UnregisterAppInterface request = new UnregisterAppInterface();
-			request.setCorrelationID(SAMPLE_RPC_CORRELATION_ID);
-
-			// build protocol message
-			byte[] msgBytes = JsonRPCMarshaller.marshall(request, (byte) version);
-			pm = new ProtocolMessage();
-			pm.setData(msgBytes);
-			pm.setSessionID((byte) sessionId);
-			pm.setMessageType(MessageType.RPC);
-			pm.setSessionType(SessionType.RPC);
-			pm.setFunctionID(FunctionID.getFunctionId(request.getFunctionName()));
-			pm.setCorrID(request.getCorrelationID());
-
-			if (request.getBulkData() != null) {
-				pm.setBulkData(request.getBulkData());
-			}
-
-			// binary frame header
-			byte[] data = new byte[12 + pm.getJsonSize()];
-			binFrameHeader = SdlPacketFactory.createBinaryFrameHeader(pm.getRPCType(), pm.getFunctionID(), pm.getCorrID(), pm.getJsonSize());
-			System.arraycopy(binFrameHeader.assembleHeaderBytes(), 0, data, 0, 12);
-			System.arraycopy(pm.getData(), 0, data, 12, pm.getJsonSize());
-
-			// create packet and invoke sendPacketToRegisteredApp
-			SdlPacket packet = new SdlPacket(4, false, SdlPacket.FRAME_TYPE_SINGLE, SdlPacket.SERVICE_TYPE_RPC, 0, sessionId, data.length, 123, data);
-			packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH,null));
-			method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
-			Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
-
-			// Since it is the same app, allow the packet to be sent
-			Assert.assertTrue(success);
-
-		} catch (Exception e) {
-			Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
-		}
-	}
-
-	/**
-	 * Test router service correctly picks up Hash ID from start service ACK (prior to V5)
-	 */
-	@Test
-	public void testStartSessionAckHashId() {
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		Method method;
-		try {
-			SdlRouterService sdlRouterService = new SdlRouterService();
-
-			initFields(sdlRouterService);
-			addDummyRegisteredApp(sdlRouterService, "12345", sessionId);
-
-			// create packet and invoke sendPacketToRegisteredApp
-			int hashId = 0x123456;
-			byte[] payload = new byte[]{0x00, 0x12, 0x34, 0x56};
-			SdlPacket packet = new SdlPacket(4, false, SdlPacket.FRAME_TYPE_CONTROL, SdlPacket.SERVICE_TYPE_RPC, SdlPacket.FRAME_INFO_START_SERVICE_ACK, sessionId, payload.length, 2, payload);
-			packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH,null));
-
-			method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
-			method.setAccessible(true);
-			Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
-			Assert.assertTrue(success);
-
-			// verify hash id map contains the correct ID
-			Field field = sdlRouterService.getClass().getDeclaredField("sessionHashIdMap");
-			field.setAccessible(true);
-			SparseIntArray sessionHashIdMap = (SparseIntArray)field.get(sdlRouterService);
-
-			Assert.assertTrue(sessionHashIdMap.indexOfKey(sessionId) >= 0);
-			int value = sessionHashIdMap.get(sessionId, -1);
-			Assert.assertEquals(hashId, value);
-		} catch (Exception e) {
-			Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
-		}
-	}
-
-	/**
-	 * Test router service correctly acquires Hash ID from V5 start service ACK
-	 */
-	@Test
-	public void testStartSessionAckV5HashId() {
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		Method method;
-		try {
-			SdlRouterService sdlRouterService = new SdlRouterService();
-
-			initFields(sdlRouterService);
-			addDummyRegisteredApp(sdlRouterService, "12345", sessionId);
-
-			// create packet and invoke sendPacketToRegisteredApp
-			int hashId = 0x123456;
-			SdlPacket packet = new SdlPacket(5, false, SdlPacket.FRAME_TYPE_CONTROL, SdlPacket.SERVICE_TYPE_RPC, SdlPacket.FRAME_INFO_START_SERVICE_ACK, sessionId, 0, 2, null);
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION, "5.0.0");
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID, hashId);
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.MTU, 1024);
-			packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH,null));
-			packet.constructPacket(); // update 'payload' field in the packet instance
-
-			method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
-			method.setAccessible(true);
-			Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
-			Assert.assertTrue(success);
-
-			// verify hash id map contains the correct ID
-			Field field = sdlRouterService.getClass().getDeclaredField("sessionHashIdMap");
-			field.setAccessible(true);
-			SparseIntArray sessionHashIdMap = (SparseIntArray)field.get(sdlRouterService);
-
-			Assert.assertTrue(sessionHashIdMap.indexOfKey(sessionId) >= 0);
-			int value = sessionHashIdMap.get(sessionId, -1);
-			Assert.assertEquals(hashId, value);
-		} catch (Exception e) {
-			Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
-		}
-	}
-
-	/**
-	 * Test router service sends a valid end service request from attemptToCleanupModule()
-	 */
-	@Test
-	public void testEndSessionV5FromAttemptToCleanupModule() {
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		Method method;
-		try {
-			SdlRouterService sdlRouterService = new SdlRouterService();
-
-			initFields(sdlRouterService);
-			addDummyRegisteredApp(sdlRouterService, "12345", sessionId);
-
-			MultiplexBluetoothTransport mockTransport = mock(MultiplexBluetoothTransport.class);
-			Field btf = sdlRouterService.getClass().getDeclaredField("bluetoothTransport");
-			btf.setAccessible(true);
-			btf.set(sdlRouterService, mockTransport);
-
-			// create packet and invoke sendPacketToRegisteredApp
-			int hashId = 0x123456;
-			SdlPacket packet = new SdlPacket(5, false, SdlPacket.FRAME_TYPE_CONTROL, SdlPacket.SERVICE_TYPE_RPC, SdlPacket.FRAME_INFO_START_SERVICE_ACK, sessionId, 0, 2, null);
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION, "5.0.0");
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID, hashId);
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.MTU, 1024);
-			packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH,null));
-			packet.constructPacket(); // update 'payload' field in the packet instance
-
-			method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
-			method.setAccessible(true);
-			Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
-			Assert.assertTrue(success);
-
-			when(mockTransport.getState()).thenReturn(MultiplexBluetoothTransport.STATE_CONNECTED);
-
-			// now call attemptToCleanUpModule()
-			method = sdlRouterService.getClass().getDeclaredMethod("attemptToCleanUpModule", int.class, int.class, TransportType.class);
-			method.setAccessible(true);
-			method.invoke(sdlRouterService, sessionId, 5, TransportType.BLUETOOTH);
-
-			ArgumentCaptor<byte[]> argument = ArgumentCaptor.forClass(byte[].class);
-			verify(mockTransport, times(2)).write(argument.capture(), eq(0), anyInt());
-
-			List<byte[]> frames = argument.getAllValues();
-
-			// First, we receive UnregisterAppInterface. Verifying the message is out of scope of this test.
-			Assert.assertEquals(2, frames.size());
-
-			// then we should receive a end service frame
-			byte[] expectedBsonPayload = new byte[] {
-					0x11, 0x00, 0x00, 0x00, /* total bytes */
-					0x10, 'h', 'a', 's', 'h', 'I', 'd', 0x00, 0x56, 0x34, 0x12, 0x00, /* int32: "hashId": 0x00123456 */
-					0x00, /* end of document */
-			};
-			byte[] actualFrame = frames.get(1);
-
-			Assert.assertEquals(12 + expectedBsonPayload.length, actualFrame.length);
-			Assert.assertEquals(actualFrame[2], 0x04 /* end service */);
-			Assert.assertEquals(actualFrame[3], (byte)sessionId);
-			byte[] actualPayload = Arrays.copyOfRange(actualFrame, 12, actualFrame.length);
-			Assert.assertTrue(Arrays.equals(expectedBsonPayload, actualPayload));
-		} catch (Exception e) {
-			Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
-		}
-	}
-
-	/**
-	 * Test router service sends a valid end service request when it receives a packet from Core
-	 * and the app has been unregistered
-	 */
-	@Test
-	public void testEndSessionV5WhenPacketForUnregisteredAppReceived() {
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		Method method;
-		try {
-			SdlRouterService sdlRouterService = new SdlRouterService();
-
-			initFields(sdlRouterService);
-			addDummyRegisteredApp(sdlRouterService, "12345", sessionId);
-			// The end service frame will not be sent out if there is no app in the map. Is this expected?
-			addDummyRegisteredApp(sdlRouterService, "12346", 2);
-
-			MultiplexBluetoothTransport mockTransport = mock(MultiplexBluetoothTransport.class);
-			Field btf = sdlRouterService.getClass().getDeclaredField("bluetoothTransport");
-			btf.setAccessible(true);
-			btf.set(sdlRouterService, mockTransport);
-
-			// create packet and invoke sendPacketToRegisteredApp
-			int hashId = 0x123456;
-			SdlPacket packet = new SdlPacket(5, false, SdlPacket.FRAME_TYPE_CONTROL, SdlPacket.SERVICE_TYPE_RPC, SdlPacket.FRAME_INFO_START_SERVICE_ACK, sessionId, 0, 2, null);
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION, "5.0.0");
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID, hashId);
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.MTU, 1024);
-			packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH,null));
-			packet.constructPacket(); // update 'payload' field in the packet instance
-
-			method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
-			method.setAccessible(true);
-			Boolean ret = (Boolean) method.invoke(sdlRouterService, packet);
-			Assert.assertTrue(ret);
-
-			// remove the app from "registeredApps" map
-			Field field = sdlRouterService.getClass().getDeclaredField("registeredApps");
-			field.setAccessible(true);
-			HashMap<String, SdlRouterService.RegisteredApp> registeredApps = (HashMap<String,SdlRouterService.RegisteredApp>)field.get(sdlRouterService);
-			registeredApps.remove("12345");
-
-			when(mockTransport.getState()).thenReturn(MultiplexBluetoothTransport.STATE_CONNECTED);
-
-			// call sendPacketToRegisteredApp once again with a dummy packet
-			byte[] dummyRegisterAppInterface = new byte[]{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, '{', '}'};
-			SdlPacket dummyPacket = new SdlPacket(5, false, SdlPacket.FRAME_TYPE_SINGLE, SdlPacket.SERVICE_TYPE_RPC, 0x00, sessionId, dummyRegisterAppInterface.length, 3, dummyRegisterAppInterface);
-			dummyPacket.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH,null));
-
-			ret = (Boolean) method.invoke(sdlRouterService, dummyPacket);
-			Assert.assertFalse(ret);
-
-			ArgumentCaptor<byte[]> argument = ArgumentCaptor.forClass(byte[].class);
-			verify(mockTransport, times(2)).write(argument.capture(), eq(0), anyInt());
-
-			List<byte[]> frames = argument.getAllValues();
-
-			// First, we receive UnregisterAppInterface. Verifying the message is out of scope of this test.
-			Assert.assertEquals(2, frames.size());
-
-			// then we should receive a end service frame
-			byte[] expectedBsonPayload = new byte[] {
-					0x11, 0x00, 0x00, 0x00, /* total bytes */
-					0x10, 'h', 'a', 's', 'h', 'I', 'd', 0x00, 0x56, 0x34, 0x12, 0x00, /* int32: "hashId": 0x00123456 */
-					0x00, /* end of document */
-			};
-			byte[] actualFrame = frames.get(1);
-
-			Assert.assertEquals(12 + expectedBsonPayload.length, actualFrame.length);
-			Assert.assertEquals(actualFrame[2], 0x04 /* end service */);
-			Assert.assertEquals(actualFrame[3], (byte)sessionId);
-			byte[] actualPayload = Arrays.copyOfRange(actualFrame, 12, actualFrame.length);
-			Assert.assertTrue(Arrays.equals(expectedBsonPayload, actualPayload));
-		} catch (Exception e) {
-			Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
-		}
-	}
-
-	/**
-	 * Test router service sends a valid end service request when it fails to deliver a message
-	 * to an app
-	 */
-	@Test
-	public void testEndSessionV5WhenSendMessageToClientFailed() {
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		Method method;
-		try {
-			SdlRouterService sdlRouterService = new SdlRouterService();
-			initFields(sdlRouterService);
-			addDummyRegisteredApp(sdlRouterService, "12345", sessionId);
-
-			// create packet and invoke sendPacketToRegisteredApp
-			int hashId = 0x123456;
-			SdlPacket packet = new SdlPacket(5, false, SdlPacket.FRAME_TYPE_CONTROL, SdlPacket.SERVICE_TYPE_RPC, SdlPacket.FRAME_INFO_START_SERVICE_ACK, sessionId, 0, 2, null);
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION, "5.0.0");
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID, hashId);
-			packet.putTag(ControlFrameTags.RPC.StartServiceACK.MTU, 1024);
-			packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH,null));
-			packet.constructPacket(); // update 'payload' field in the packet instance
-
-			method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
-			method.setAccessible(true);
-			Boolean ret = (Boolean) method.invoke(sdlRouterService, packet);
-			Assert.assertTrue(ret);
-
-			SdlRouterService.RegisteredApp mockApp = mock(SdlRouterService.RegisteredApp.class);
-			when(mockApp.sendMessage(any(Message.class))).thenReturn(SdlRouterService.RegisteredApp.SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT);
-			Vector<Long> dummySessionIds = new Vector<>();
-			dummySessionIds.add((long)sessionId);
-			when(mockApp.getSessionIds()).thenReturn(dummySessionIds);
-			List<TransportType> dummyTransportTypes = new ArrayList<>();
-			dummyTransportTypes.add(TransportType.BLUETOOTH);
-			when(mockApp.getTransportsForSession(sessionId)).thenReturn(dummyTransportTypes);
-
-			MultiplexBluetoothTransport mockTransport = mock(MultiplexBluetoothTransport.class);
-			Field btf = sdlRouterService.getClass().getDeclaredField("bluetoothTransport");
-			btf.setAccessible(true);
-			btf.set(sdlRouterService, mockTransport);
-
-			when(mockTransport.getState()).thenReturn(MultiplexBluetoothTransport.STATE_CONNECTED);
-
-			// invoke sendPacketMessageToClient
-			method = sdlRouterService.getClass().getDeclaredMethod("sendPacketMessageToClient", SdlRouterService.RegisteredApp.class, Message.class, byte.class);
-			method.setAccessible(true);
-			Message dummyMessage = Message.obtain();
-			ret = (Boolean) method.invoke(sdlRouterService, mockApp, dummyMessage, (byte)5);
-			Assert.assertFalse(ret);
-
-			ArgumentCaptor<byte[]> argument = ArgumentCaptor.forClass(byte[].class);
-			verify(mockTransport, times(2)).write(argument.capture(), eq(0), anyInt());
-
-			List<byte[]> frames = argument.getAllValues();
-
-			// First, we receive UnregisterAppInterface. Verifying the message is out of scope of this test.
-			Assert.assertEquals(2, frames.size());
-
-			// then we should receive a end service frame
-			byte[] expectedBsonPayload = new byte[] {
-					0x11, 0x00, 0x00, 0x00, /* total bytes */
-					0x10, 'h', 'a', 's', 'h', 'I', 'd', 0x00, 0x56, 0x34, 0x12, 0x00, /* int32: "hashId": 0x00123456 */
-					0x00, /* end of document */
-			};
-			byte[] actualFrame = frames.get(1);
-
-			Assert.assertEquals(12 + expectedBsonPayload.length, actualFrame.length);
-			Assert.assertEquals(actualFrame[2], 0x04 /* end service */);
-			Assert.assertEquals(actualFrame[3], (byte)sessionId);
-			byte[] actualPayload = Arrays.copyOfRange(actualFrame, 12, actualFrame.length);
-			Assert.assertTrue(Arrays.equals(expectedBsonPayload, actualPayload));
-		} catch (Exception e) {
-			Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
-		}
-	}
-
-	private void initFields(SdlRouterService routerService) throws IllegalAccessException, NoSuchFieldException {
-		// set registered apps array
-		HashMap<String,SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
-		Field raf = routerService.getClass().getDeclaredField("registeredApps");
-		raf.setAccessible(true);
-		raf.set(routerService, registeredApps);
-
-		// need a session map too
-		SparseArray<String> sessionMap = new SparseArray<String>();
-		Field bsmf = routerService.getClass().getDeclaredField("bluetoothSessionMap");
-		bsmf.setAccessible(true);
-		bsmf.set(routerService, sessionMap);
-
-		SparseIntArray emptyCleanedSessionMap = new SparseIntArray();
-		Field csmf = routerService.getClass().getDeclaredField("cleanedSessionMap");
-		csmf.setAccessible(true);
-		csmf.set(routerService, emptyCleanedSessionMap);
-
-		SparseIntArray emptyHashIdMap = new SparseIntArray();
-		Field shmf = routerService.getClass().getDeclaredField("sessionHashIdMap");
-		shmf.setAccessible(true);
-		shmf.set(routerService, emptyHashIdMap);
-	}
-
-	private void addDummyRegisteredApp(SdlRouterService routerService, String appId, int sessionId)
-			throws IllegalAccessException, NoSuchFieldException {
-		Message message = Message.obtain();
-		SdlRouterService.RegisteredApp app = routerService.new RegisteredApp(appId, 1, message.replyTo);
-
-		Field raf = routerService.getClass().getDeclaredField("registeredApps");
-		raf.setAccessible(true);
-		HashMap<String, SdlRouterService.RegisteredApp> registeredApps = (HashMap<String,SdlRouterService.RegisteredApp>)raf.get(routerService);
-		registeredApps.put(app.getAppId(), app);
-
-		Field bsmf = routerService.getClass().getDeclaredField("bluetoothSessionMap");
-		bsmf.setAccessible(true);
-		SparseArray<String> sessionMap = (SparseArray<String>)bsmf.get(routerService);
-		sessionMap.put(sessionId, appId);
-	}
+    /**
+     * Test sending UAI to an app whose session id is the same as a removed app
+     * but is indeed a different app
+     *
+     * @see SdlRouterService#sendPacketToRegisteredApp(SdlPacket)
+     */
+    @Test
+    public void testRegisterAppExistingSessionIDDifferentApp() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        Method method;
+        try {
+            // create instance of router service
+            SdlRouterService sdlRouterService = new SdlRouterService();
+
+            // We need a registered app for this to work
+            Message message = Message.obtain();
+            SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo);
+            SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo);
+            HashMap<String, SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
+            registeredApps.put(app1.getAppId(), app1);
+            registeredApps.put(app2.getAppId(), app2);
+
+            // set registered apps array
+            Field raf = sdlRouterService.getClass().getDeclaredField("registeredApps");
+            raf.setAccessible(true);
+            raf.set(sdlRouterService, registeredApps);
+
+            // need a session map too
+            SparseArray<String> sessionMap = new SparseArray<String>();
+            sessionMap.put(1, "12345");
+            Field sessionMapField = sdlRouterService.getClass().getDeclaredField("bluetoothSessionMap");
+            sessionMapField.setAccessible(true);
+            sessionMapField.set(sdlRouterService, sessionMap);
+
+            // set cleaned session map
+            SparseIntArray testCleanedMap = new SparseIntArray();
+            testCleanedMap.put(1, 12345);
+            Field f = sdlRouterService.getClass().getDeclaredField("cleanedSessionMap");
+            f.setAccessible(true);
+            f.set(sdlRouterService, testCleanedMap);
+
+            // set session hash id map
+            SparseIntArray testHashIdMap = new SparseIntArray();
+            testHashIdMap.put(1, 12344);
+            Field f2 = sdlRouterService.getClass().getDeclaredField("sessionHashIdMap");
+            f2.setAccessible(true);
+            f2.set(sdlRouterService, testHashIdMap);
+
+            // make sure maps are set and NOT the same
+            Assert.assertNotNull(raf.get(sdlRouterService));
+            Assert.assertNotNull(sessionMapField.get(sdlRouterService));
+            Assert.assertNotNull(f.get(sdlRouterService));
+            Assert.assertNotNull(f2.get(sdlRouterService));
+
+            // make da RPC
+            UnregisterAppInterface request = new UnregisterAppInterface();
+            request.setCorrelationID(SAMPLE_RPC_CORRELATION_ID);
+
+            // build protocol message
+            byte[] msgBytes = JsonRPCMarshaller.marshall(request, (byte) version);
+            pm = new ProtocolMessage();
+            pm.setData(msgBytes);
+            pm.setSessionID((byte) sessionId);
+            pm.setMessageType(MessageType.RPC);
+            pm.setSessionType(SessionType.RPC);
+            pm.setFunctionID(FunctionID.getFunctionId(request.getFunctionName()));
+            pm.setCorrID(request.getCorrelationID());
+
+            if (request.getBulkData() != null) {
+                pm.setBulkData(request.getBulkData());
+            }
+
+            // binary frame header
+            byte[] data = new byte[12 + pm.getJsonSize()];
+            binFrameHeader = SdlPacketFactory.createBinaryFrameHeader(pm.getRPCType(), pm.getFunctionID(), pm.getCorrID(), pm.getJsonSize());
+            System.arraycopy(binFrameHeader.assembleHeaderBytes(), 0, data, 0, 12);
+            System.arraycopy(pm.getData(), 0, data, 12, pm.getJsonSize());
+
+            // create packet and invoke sendPacketToRegisteredApp
+            SdlPacket packet = new SdlPacket(4, false, SdlPacket.FRAME_TYPE_SINGLE, SdlPacket.SERVICE_TYPE_RPC, 0, sessionId, data.length, 123, data);
+            packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH, null));
+            method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
+            Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
+
+            // we do not want the UAI packet to be sent. make sure it is dropped
+            Assert.assertFalse(success);
+
+        } catch (Exception e) {
+            Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
+        }
+    }
+
+    /**
+     * Test sending UAI to an app whose session id is the same as a removed app
+     * but is indeed the SAME app
+     *
+     * @see SdlRouterService#sendPacketToRegisteredApp(SdlPacket)
+     */
+    @Test
+    public void testRegisterAppExistingSessionIDSameApp() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        Method method;
+        try {
+            // create instance of router service
+            SdlRouterService sdlRouterService = new SdlRouterService();
+
+            // We need a registered app for this to work
+            Message message = Message.obtain();
+            SdlRouterService.RegisteredApp app1 = sdlRouterService.new RegisteredApp("12345", 1, message.replyTo);
+            SdlRouterService.RegisteredApp app2 = sdlRouterService.new RegisteredApp("12344", 1, message.replyTo);
+            HashMap<String, SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
+            registeredApps.put(app1.getAppId(), app1);
+            registeredApps.put(app2.getAppId(), app2);
+
+            // set registered apps array
+            Field raf = sdlRouterService.getClass().getDeclaredField("registeredApps");
+            raf.setAccessible(true);
+            raf.set(sdlRouterService, registeredApps);
+
+            // need a session map too
+            SparseArray<String> sessionMap = new SparseArray<String>();
+            sessionMap.put(1, "12345");
+            Field sessionMapField = sdlRouterService.getClass().getDeclaredField("bluetoothSessionMap");
+            sessionMapField.setAccessible(true);
+            sessionMapField.set(sdlRouterService, sessionMap);
+
+            // set cleaned session map
+            SparseIntArray testCleanedMap = new SparseIntArray();
+            testCleanedMap.put(1, 12345);
+            Field f = sdlRouterService.getClass().getDeclaredField("cleanedSessionMap");
+            f.setAccessible(true);
+            f.set(sdlRouterService, testCleanedMap);
+
+            // set session hash id map
+            SparseIntArray testHashIdMap = new SparseIntArray();
+            testHashIdMap.put(1, 12345);
+            Field f2 = sdlRouterService.getClass().getDeclaredField("sessionHashIdMap");
+            f2.setAccessible(true);
+            f2.set(sdlRouterService, testHashIdMap);
+
+            // make sure maps are set and NOT the same
+            Assert.assertNotNull(raf.get(sdlRouterService));
+            Assert.assertNotNull(sessionMapField.get(sdlRouterService));
+            Assert.assertNotNull(f.get(sdlRouterService));
+            Assert.assertNotNull(f2.get(sdlRouterService));
+
+            // make da RPC
+            UnregisterAppInterface request = new UnregisterAppInterface();
+            request.setCorrelationID(SAMPLE_RPC_CORRELATION_ID);
+
+            // build protocol message
+            byte[] msgBytes = JsonRPCMarshaller.marshall(request, (byte) version);
+            pm = new ProtocolMessage();
+            pm.setData(msgBytes);
+            pm.setSessionID((byte) sessionId);
+            pm.setMessageType(MessageType.RPC);
+            pm.setSessionType(SessionType.RPC);
+            pm.setFunctionID(FunctionID.getFunctionId(request.getFunctionName()));
+            pm.setCorrID(request.getCorrelationID());
+
+            if (request.getBulkData() != null) {
+                pm.setBulkData(request.getBulkData());
+            }
+
+            // binary frame header
+            byte[] data = new byte[12 + pm.getJsonSize()];
+            binFrameHeader = SdlPacketFactory.createBinaryFrameHeader(pm.getRPCType(), pm.getFunctionID(), pm.getCorrID(), pm.getJsonSize());
+            System.arraycopy(binFrameHeader.assembleHeaderBytes(), 0, data, 0, 12);
+            System.arraycopy(pm.getData(), 0, data, 12, pm.getJsonSize());
+
+            // create packet and invoke sendPacketToRegisteredApp
+            SdlPacket packet = new SdlPacket(4, false, SdlPacket.FRAME_TYPE_SINGLE, SdlPacket.SERVICE_TYPE_RPC, 0, sessionId, data.length, 123, data);
+            packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH, null));
+            method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
+            Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
+
+            // Since it is the same app, allow the packet to be sent
+            Assert.assertTrue(success);
+
+        } catch (Exception e) {
+            Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
+        }
+    }
+
+    /**
+     * Test router service correctly picks up Hash ID from start service ACK (prior to V5)
+     */
+    @Test
+    public void testStartSessionAckHashId() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        Method method;
+        try {
+            SdlRouterService sdlRouterService = new SdlRouterService();
+
+            initFields(sdlRouterService);
+            addDummyRegisteredApp(sdlRouterService, "12345", sessionId);
+
+            // create packet and invoke sendPacketToRegisteredApp
+            int hashId = 0x123456;
+            byte[] payload = new byte[]{0x00, 0x12, 0x34, 0x56};
+            SdlPacket packet = new SdlPacket(4, false, SdlPacket.FRAME_TYPE_CONTROL, SdlPacket.SERVICE_TYPE_RPC, SdlPacket.FRAME_INFO_START_SERVICE_ACK, sessionId, payload.length, 2, payload);
+            packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH, null));
+
+            method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
+            method.setAccessible(true);
+            Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
+            Assert.assertTrue(success);
+
+            // verify hash id map contains the correct ID
+            Field field = sdlRouterService.getClass().getDeclaredField("sessionHashIdMap");
+            field.setAccessible(true);
+            SparseIntArray sessionHashIdMap = (SparseIntArray) field.get(sdlRouterService);
+
+            Assert.assertTrue(sessionHashIdMap.indexOfKey(sessionId) >= 0);
+            int value = sessionHashIdMap.get(sessionId, -1);
+            Assert.assertEquals(hashId, value);
+        } catch (Exception e) {
+            Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
+        }
+    }
+
+    /**
+     * Test router service correctly acquires Hash ID from V5 start service ACK
+     */
+    @Test
+    public void testStartSessionAckV5HashId() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        Method method;
+        try {
+            SdlRouterService sdlRouterService = new SdlRouterService();
+
+            initFields(sdlRouterService);
+            addDummyRegisteredApp(sdlRouterService, "12345", sessionId);
+
+            // create packet and invoke sendPacketToRegisteredApp
+            int hashId = 0x123456;
+            SdlPacket packet = new SdlPacket(5, false, SdlPacket.FRAME_TYPE_CONTROL, SdlPacket.SERVICE_TYPE_RPC, SdlPacket.FRAME_INFO_START_SERVICE_ACK, sessionId, 0, 2, null);
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION, "5.0.0");
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID, hashId);
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.MTU, 1024);
+            packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH, null));
+            packet.constructPacket(); // update 'payload' field in the packet instance
+
+            method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
+            method.setAccessible(true);
+            Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
+            Assert.assertTrue(success);
+
+            // verify hash id map contains the correct ID
+            Field field = sdlRouterService.getClass().getDeclaredField("sessionHashIdMap");
+            field.setAccessible(true);
+            SparseIntArray sessionHashIdMap = (SparseIntArray) field.get(sdlRouterService);
+
+            Assert.assertTrue(sessionHashIdMap.indexOfKey(sessionId) >= 0);
+            int value = sessionHashIdMap.get(sessionId, -1);
+            Assert.assertEquals(hashId, value);
+        } catch (Exception e) {
+            Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
+        }
+    }
+
+    /**
+     * Test router service sends a valid end service request from attemptToCleanupModule()
+     */
+    @Test
+    public void testEndSessionV5FromAttemptToCleanupModule() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        Method method;
+        try {
+            SdlRouterService sdlRouterService = new SdlRouterService();
+
+            initFields(sdlRouterService);
+            addDummyRegisteredApp(sdlRouterService, "12345", sessionId);
+
+            MultiplexBluetoothTransport mockTransport = mock(MultiplexBluetoothTransport.class);
+            Field btf = sdlRouterService.getClass().getDeclaredField("bluetoothTransport");
+            btf.setAccessible(true);
+            btf.set(sdlRouterService, mockTransport);
+
+            // create packet and invoke sendPacketToRegisteredApp
+            int hashId = 0x123456;
+            SdlPacket packet = new SdlPacket(5, false, SdlPacket.FRAME_TYPE_CONTROL, SdlPacket.SERVICE_TYPE_RPC, SdlPacket.FRAME_INFO_START_SERVICE_ACK, sessionId, 0, 2, null);
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION, "5.0.0");
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID, hashId);
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.MTU, 1024);
+            packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH, null));
+            packet.constructPacket(); // update 'payload' field in the packet instance
+
+            method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
+            method.setAccessible(true);
+            Boolean success = (Boolean) method.invoke(sdlRouterService, packet);
+            Assert.assertTrue(success);
+
+            when(mockTransport.getState()).thenReturn(MultiplexBluetoothTransport.STATE_CONNECTED);
+
+            // now call attemptToCleanUpModule()
+            method = sdlRouterService.getClass().getDeclaredMethod("attemptToCleanUpModule", int.class, int.class, TransportType.class);
+            method.setAccessible(true);
+            method.invoke(sdlRouterService, sessionId, 5, TransportType.BLUETOOTH);
+
+            ArgumentCaptor<byte[]> argument = ArgumentCaptor.forClass(byte[].class);
+            verify(mockTransport, times(2)).write(argument.capture(), eq(0), anyInt());
+
+            List<byte[]> frames = argument.getAllValues();
+
+            // First, we receive UnregisterAppInterface. Verifying the message is out of scope of this test.
+            Assert.assertEquals(2, frames.size());
+
+            // then we should receive a end service frame
+            byte[] expectedBsonPayload = new byte[]{
+                    0x11, 0x00, 0x00, 0x00, /* total bytes */
+                    0x10, 'h', 'a', 's', 'h', 'I', 'd', 0x00, 0x56, 0x34, 0x12, 0x00, /* int32: "hashId": 0x00123456 */
+                    0x00, /* end of document */
+            };
+            byte[] actualFrame = frames.get(1);
+
+            Assert.assertEquals(12 + expectedBsonPayload.length, actualFrame.length);
+            Assert.assertEquals(actualFrame[2], 0x04 /* end service */);
+            Assert.assertEquals(actualFrame[3], (byte) sessionId);
+            byte[] actualPayload = Arrays.copyOfRange(actualFrame, 12, actualFrame.length);
+            Assert.assertTrue(Arrays.equals(expectedBsonPayload, actualPayload));
+        } catch (Exception e) {
+            Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
+        }
+    }
+
+    /**
+     * Test router service sends a valid end service request when it receives a packet from Core
+     * and the app has been unregistered
+     */
+    @Test
+    public void testEndSessionV5WhenPacketForUnregisteredAppReceived() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        Method method;
+        try {
+            SdlRouterService sdlRouterService = new SdlRouterService();
+
+            initFields(sdlRouterService);
+            addDummyRegisteredApp(sdlRouterService, "12345", sessionId);
+            // The end service frame will not be sent out if there is no app in the map. Is this expected?
+            addDummyRegisteredApp(sdlRouterService, "12346", 2);
+
+            MultiplexBluetoothTransport mockTransport = mock(MultiplexBluetoothTransport.class);
+            Field btf = sdlRouterService.getClass().getDeclaredField("bluetoothTransport");
+            btf.setAccessible(true);
+            btf.set(sdlRouterService, mockTransport);
+
+            // create packet and invoke sendPacketToRegisteredApp
+            int hashId = 0x123456;
+            SdlPacket packet = new SdlPacket(5, false, SdlPacket.FRAME_TYPE_CONTROL, SdlPacket.SERVICE_TYPE_RPC, SdlPacket.FRAME_INFO_START_SERVICE_ACK, sessionId, 0, 2, null);
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION, "5.0.0");
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID, hashId);
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.MTU, 1024);
+            packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH, null));
+            packet.constructPacket(); // update 'payload' field in the packet instance
+
+            method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
+            method.setAccessible(true);
+            Boolean ret = (Boolean) method.invoke(sdlRouterService, packet);
+            Assert.assertTrue(ret);
+
+            // remove the app from "registeredApps" map
+            Field field = sdlRouterService.getClass().getDeclaredField("registeredApps");
+            field.setAccessible(true);
+            HashMap<String, SdlRouterService.RegisteredApp> registeredApps = (HashMap<String, SdlRouterService.RegisteredApp>) field.get(sdlRouterService);
+            registeredApps.remove("12345");
+
+            when(mockTransport.getState()).thenReturn(MultiplexBluetoothTransport.STATE_CONNECTED);
+
+            // call sendPacketToRegisteredApp once again with a dummy packet
+            byte[] dummyRegisterAppInterface = new byte[]{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, '{', '}'};
+            SdlPacket dummyPacket = new SdlPacket(5, false, SdlPacket.FRAME_TYPE_SINGLE, SdlPacket.SERVICE_TYPE_RPC, 0x00, sessionId, dummyRegisterAppInterface.length, 3, dummyRegisterAppInterface);
+            dummyPacket.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH, null));
+
+            ret = (Boolean) method.invoke(sdlRouterService, dummyPacket);
+            Assert.assertFalse(ret);
+
+            ArgumentCaptor<byte[]> argument = ArgumentCaptor.forClass(byte[].class);
+            verify(mockTransport, times(2)).write(argument.capture(), eq(0), anyInt());
+
+            List<byte[]> frames = argument.getAllValues();
+
+            // First, we receive UnregisterAppInterface. Verifying the message is out of scope of this test.
+            Assert.assertEquals(2, frames.size());
+
+            // then we should receive a end service frame
+            byte[] expectedBsonPayload = new byte[]{
+                    0x11, 0x00, 0x00, 0x00, /* total bytes */
+                    0x10, 'h', 'a', 's', 'h', 'I', 'd', 0x00, 0x56, 0x34, 0x12, 0x00, /* int32: "hashId": 0x00123456 */
+                    0x00, /* end of document */
+            };
+            byte[] actualFrame = frames.get(1);
+
+            Assert.assertEquals(12 + expectedBsonPayload.length, actualFrame.length);
+            Assert.assertEquals(actualFrame[2], 0x04 /* end service */);
+            Assert.assertEquals(actualFrame[3], (byte) sessionId);
+            byte[] actualPayload = Arrays.copyOfRange(actualFrame, 12, actualFrame.length);
+            Assert.assertTrue(Arrays.equals(expectedBsonPayload, actualPayload));
+        } catch (Exception e) {
+            Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
+        }
+    }
+
+    /**
+     * Test router service sends a valid end service request when it fails to deliver a message
+     * to an app
+     */
+    @Test
+    public void testEndSessionV5WhenSendMessageToClientFailed() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        Method method;
+        try {
+            SdlRouterService sdlRouterService = new SdlRouterService();
+            initFields(sdlRouterService);
+            addDummyRegisteredApp(sdlRouterService, "12345", sessionId);
+
+            // create packet and invoke sendPacketToRegisteredApp
+            int hashId = 0x123456;
+            SdlPacket packet = new SdlPacket(5, false, SdlPacket.FRAME_TYPE_CONTROL, SdlPacket.SERVICE_TYPE_RPC, SdlPacket.FRAME_INFO_START_SERVICE_ACK, sessionId, 0, 2, null);
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.PROTOCOL_VERSION, "5.0.0");
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID, hashId);
+            packet.putTag(ControlFrameTags.RPC.StartServiceACK.MTU, 1024);
+            packet.setTransportRecord(new TransportRecord(TransportType.BLUETOOTH, null));
+            packet.constructPacket(); // update 'payload' field in the packet instance
+
+            method = sdlRouterService.getClass().getDeclaredMethod("sendPacketToRegisteredApp", SdlPacket.class);
+            method.setAccessible(true);
+            Boolean ret = (Boolean) method.invoke(sdlRouterService, packet);
+            Assert.assertTrue(ret);
+
+            SdlRouterService.RegisteredApp mockApp = mock(SdlRouterService.RegisteredApp.class);
+            when(mockApp.sendMessage(any(Message.class))).thenReturn(SdlRouterService.RegisteredApp.SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT);
+            Vector<Long> dummySessionIds = new Vector<>();
+            dummySessionIds.add((long) sessionId);
+            when(mockApp.getSessionIds()).thenReturn(dummySessionIds);
+            List<TransportType> dummyTransportTypes = new ArrayList<>();
+            dummyTransportTypes.add(TransportType.BLUETOOTH);
+            when(mockApp.getTransportsForSession(sessionId)).thenReturn(dummyTransportTypes);
+
+            MultiplexBluetoothTransport mockTransport = mock(MultiplexBluetoothTransport.class);
+            Field btf = sdlRouterService.getClass().getDeclaredField("bluetoothTransport");
+            btf.setAccessible(true);
+            btf.set(sdlRouterService, mockTransport);
+
+            when(mockTransport.getState()).thenReturn(MultiplexBluetoothTransport.STATE_CONNECTED);
+
+            // invoke sendPacketMessageToClient
+            method = sdlRouterService.getClass().getDeclaredMethod("sendPacketMessageToClient", SdlRouterService.RegisteredApp.class, Message.class, byte.class);
+            method.setAccessible(true);
+            Message dummyMessage = Message.obtain();
+            ret = (Boolean) method.invoke(sdlRouterService, mockApp, dummyMessage, (byte) 5);
+            Assert.assertFalse(ret);
+
+            ArgumentCaptor<byte[]> argument = ArgumentCaptor.forClass(byte[].class);
+            verify(mockTransport, times(2)).write(argument.capture(), eq(0), anyInt());
+
+            List<byte[]> frames = argument.getAllValues();
+
+            // First, we receive UnregisterAppInterface. Verifying the message is out of scope of this test.
+            Assert.assertEquals(2, frames.size());
+
+            // then we should receive a end service frame
+            byte[] expectedBsonPayload = new byte[]{
+                    0x11, 0x00, 0x00, 0x00, /* total bytes */
+                    0x10, 'h', 'a', 's', 'h', 'I', 'd', 0x00, 0x56, 0x34, 0x12, 0x00, /* int32: "hashId": 0x00123456 */
+                    0x00, /* end of document */
+            };
+            byte[] actualFrame = frames.get(1);
+
+            Assert.assertEquals(12 + expectedBsonPayload.length, actualFrame.length);
+            Assert.assertEquals(actualFrame[2], 0x04 /* end service */);
+            Assert.assertEquals(actualFrame[3], (byte) sessionId);
+            byte[] actualPayload = Arrays.copyOfRange(actualFrame, 12, actualFrame.length);
+            Assert.assertTrue(Arrays.equals(expectedBsonPayload, actualPayload));
+        } catch (Exception e) {
+            Assert.fail("Exception in sendPacketToRegisteredApp, " + e);
+        }
+    }
+
+    private void initFields(SdlRouterService routerService) throws IllegalAccessException, NoSuchFieldException {
+        // set registered apps array
+        HashMap<String, SdlRouterService.RegisteredApp> registeredApps = new HashMap<>();
+        Field raf = routerService.getClass().getDeclaredField("registeredApps");
+        raf.setAccessible(true);
+        raf.set(routerService, registeredApps);
+
+        // need a session map too
+        SparseArray<String> sessionMap = new SparseArray<String>();
+        Field bsmf = routerService.getClass().getDeclaredField("bluetoothSessionMap");
+        bsmf.setAccessible(true);
+        bsmf.set(routerService, sessionMap);
+
+        SparseIntArray emptyCleanedSessionMap = new SparseIntArray();
+        Field csmf = routerService.getClass().getDeclaredField("cleanedSessionMap");
+        csmf.setAccessible(true);
+        csmf.set(routerService, emptyCleanedSessionMap);
+
+        SparseIntArray emptyHashIdMap = new SparseIntArray();
+        Field shmf = routerService.getClass().getDeclaredField("sessionHashIdMap");
+        shmf.setAccessible(true);
+        shmf.set(routerService, emptyHashIdMap);
+    }
+
+    private void addDummyRegisteredApp(SdlRouterService routerService, String appId, int sessionId)
+            throws IllegalAccessException, NoSuchFieldException {
+        Message message = Message.obtain();
+        SdlRouterService.RegisteredApp app = routerService.new RegisteredApp(appId, 1, message.replyTo);
+
+        Field raf = routerService.getClass().getDeclaredField("registeredApps");
+        raf.setAccessible(true);
+        HashMap<String, SdlRouterService.RegisteredApp> registeredApps = (HashMap<String, SdlRouterService.RegisteredApp>) raf.get(routerService);
+        registeredApps.put(app.getAppId(), app);
+
+        Field bsmf = routerService.getClass().getDeclaredField("bluetoothSessionMap");
+        bsmf.setAccessible(true);
+        SparseArray<String> sessionMap = (SparseArray<String>) bsmf.get(routerService);
+        sessionMap.put(sessionId, appId);
+    }
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
index 811fd8307..977bb3020 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
@@ -23,118 +23,119 @@ import static junit.framework.TestCase.assertTrue;
 
 @RunWith(AndroidJUnit4.class)
 public class TransportBrokerTest { //FIXME this test class needs to be fixed. At this point these tests are not helpful
-	RouterServiceValidator rsvp;
-	//		public TransportBrokerThread(Context context, String appId, ComponentName service){
-
-	@Before
-	public void setUp() throws Exception {
-		rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
-		rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
-			@Override
-			public void onFinishedValidation(boolean valid, ComponentName name) {
-				
-			}
-		});
-		
-	}
-	
-	private void sleep(){
-		try{
-			Thread.sleep(500);
-		}catch(Exception e){}
-	}
-
-	@Test
-	public void testStart(){
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		TransportBroker broker = new TransportBroker(getInstrumentation().getTargetContext(), SdlUnitTestContants.TEST_APP_ID,rsvp.getService());
-		if(!DeviceUtil.isEmulator()){ // Cannot perform MBT operations in emulator
-			assertTrue(broker.start());
-		}
-		broker.stop();
-
-	}
-
-	@Test
-	public void testSendPacket(){
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-
-		TransportBroker broker = new TransportBroker(getInstrumentation().getTargetContext(), SdlUnitTestContants.TEST_APP_ID,rsvp.getService());
-
-		if(!DeviceUtil.isEmulator()){ // Cannot perform MBT operations in emulator
-			assertTrue(broker.start());
-		}
-		BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-		if(!DeviceUtil.isEmulator()){ // Cannot perform BT adapter operations in emulator
-			assertNotNull(adapter);
-			assertTrue(adapter.isEnabled());
-		}
-		//Not ideal, but not implementing callbacks just for unit tests
-		int count = 0;
-		while(broker.routerServiceMessenger == null && count<10){
-			sleep();
-			count++;
-		}
-		if(!DeviceUtil.isEmulator()){ // Cannot perform BT adapter operations in emulator
-			assertNotNull(broker.routerServiceMessenger);
-		}
-
-		//assertFalse(broker.sendPacketToRouterService(null, 0, 0));
-		//assertFalse(broker.sendPacketToRouterService(new byte[3], -1, 0));
-		//assertFalse(broker.sendPacketToRouterService(new byte[3], 0, 4));
-		//assertTrue(broker.sendPacketToRouterService(new byte[3],0, 3));
-
-		broker.stop();
-
-	}
-
-	@Test
-	public void testOnPacketReceived(){
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-		TransportBroker broker = new TransportBroker(getInstrumentation().getTargetContext(), SdlUnitTestContants.TEST_APP_ID, rsvp.getService());
-		if(!DeviceUtil.isEmulator()){ // Cannot perform MBT operations in emulator
-			assertTrue(broker.start());
-		}
-
-	}
-
-	@Test
-	public void testSendMessageToRouterService(){
-		if (Looper.myLooper() == null) {
-			Looper.prepare();
-		}
-
-		TransportBroker broker = new TransportBroker(getInstrumentation().getTargetContext(), SdlUnitTestContants.TEST_APP_ID, rsvp.getService());
-		Handler handler = new Handler();
-		Message message = new Message();
-		broker.routerServiceMessenger = null;
-		broker.isBound = true;
-
-		assertFalse(broker.sendMessageToRouterService(message));
-
-		broker.routerServiceMessenger = new Messenger(handler); //So it's not ambiguous
-
-		broker.isBound = false;
-
-		assertFalse(broker.sendMessageToRouterService(message));
-
-		broker.isBound = true;
-		broker.registeredWithRouterService = true;
-
-		message = null;
-
-		assertFalse(broker.sendMessageToRouterService(message));
-
-		message = new Message();
-
-		assertTrue(broker.sendMessageToRouterService(message));
-
-	}
+    RouterServiceValidator rsvp;
+    //		public TransportBrokerThread(Context context, String appId, ComponentName service){
+
+    @Before
+    public void setUp() throws Exception {
+        rsvp = new RouterServiceValidator(getInstrumentation().getTargetContext());
+        rsvp.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
+            @Override
+            public void onFinishedValidation(boolean valid, ComponentName name) {
+
+            }
+        });
+
+    }
+
+    private void sleep() {
+        try {
+            Thread.sleep(500);
+        } catch (Exception e) {
+        }
+    }
+
+    @Test
+    public void testStart() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        TransportBroker broker = new TransportBroker(getInstrumentation().getTargetContext(), SdlUnitTestContants.TEST_APP_ID, rsvp.getService());
+        if (!DeviceUtil.isEmulator()) { // Cannot perform MBT operations in emulator
+            assertTrue(broker.start());
+        }
+        broker.stop();
+
+    }
+
+    @Test
+    public void testSendPacket() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        TransportBroker broker = new TransportBroker(getInstrumentation().getTargetContext(), SdlUnitTestContants.TEST_APP_ID, rsvp.getService());
+
+        if (!DeviceUtil.isEmulator()) { // Cannot perform MBT operations in emulator
+            assertTrue(broker.start());
+        }
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (!DeviceUtil.isEmulator()) { // Cannot perform BT adapter operations in emulator
+            assertNotNull(adapter);
+            assertTrue(adapter.isEnabled());
+        }
+        //Not ideal, but not implementing callbacks just for unit tests
+        int count = 0;
+        while (broker.routerServiceMessenger == null && count < 10) {
+            sleep();
+            count++;
+        }
+        if (!DeviceUtil.isEmulator()) { // Cannot perform BT adapter operations in emulator
+            assertNotNull(broker.routerServiceMessenger);
+        }
+
+        //assertFalse(broker.sendPacketToRouterService(null, 0, 0));
+        //assertFalse(broker.sendPacketToRouterService(new byte[3], -1, 0));
+        //assertFalse(broker.sendPacketToRouterService(new byte[3], 0, 4));
+        //assertTrue(broker.sendPacketToRouterService(new byte[3],0, 3));
+
+        broker.stop();
+
+    }
+
+    @Test
+    public void testOnPacketReceived() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        TransportBroker broker = new TransportBroker(getInstrumentation().getTargetContext(), SdlUnitTestContants.TEST_APP_ID, rsvp.getService());
+        if (!DeviceUtil.isEmulator()) { // Cannot perform MBT operations in emulator
+            assertTrue(broker.start());
+        }
+
+    }
+
+    @Test
+    public void testSendMessageToRouterService() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        TransportBroker broker = new TransportBroker(getInstrumentation().getTargetContext(), SdlUnitTestContants.TEST_APP_ID, rsvp.getService());
+        Handler handler = new Handler();
+        Message message = new Message();
+        broker.routerServiceMessenger = null;
+        broker.isBound = true;
+
+        assertFalse(broker.sendMessageToRouterService(message));
+
+        broker.routerServiceMessenger = new Messenger(handler); //So it's not ambiguous
+
+        broker.isBound = false;
+
+        assertFalse(broker.sendMessageToRouterService(message));
+
+        broker.isBound = true;
+        broker.registeredWithRouterService = true;
+
+        message = null;
+
+        assertFalse(broker.sendMessageToRouterService(message));
+
+        message = new Message();
+
+        assertTrue(broker.sendMessageToRouterService(message));
+
+    }
 
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java
index a808ba936..06a31bc59 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java
@@ -31,21 +31,32 @@ public class TransportManagerTests {
 
     MultiplexTransportConfig config;
     final TransportRecord defaultBtRecord = new TransportRecord(TransportType.BLUETOOTH, "12:34:56:78:90");
-    final ComponentName routerServiceComponentName = new ComponentName("com.smartdevicelink.test","com.smartdevicelink.test.SdlRouterService");
-    final SdlPacket defaultPacket = SdlPacketFactory.createStartSessionACK(SessionType.RPC,(byte)1,100,(byte)5);
+    final ComponentName routerServiceComponentName = new ComponentName("com.smartdevicelink.test", "com.smartdevicelink.test.SdlRouterService");
+    final SdlPacket defaultPacket = SdlPacketFactory.createStartSessionACK(SessionType.RPC, (byte) 1, 100, (byte) 5);
 
 
     TransportManager.TransportEventListener defaultListener = new TransportManager.TransportEventListener() {
         @Override
-        public void onPacketReceived(SdlPacket packet) { assertEquals(defaultPacket,packet);}
+        public void onPacketReceived(SdlPacket packet) {
+            assertEquals(defaultPacket, packet);
+        }
+
         @Override
-        public void onTransportConnected(List<TransportRecord> transports) {}
+        public void onTransportConnected(List<TransportRecord> transports) {
+        }
+
         @Override
-        public void onTransportDisconnected(String info, TransportRecord type, List<TransportRecord> connectedTransports) {}
+        public void onTransportDisconnected(String info, TransportRecord type, List<TransportRecord> connectedTransports) {
+        }
+
         @Override
-        public void onError(String info) {}
+        public void onError(String info) {
+        }
+
         @Override
-        public boolean onLegacyModeEnabled(String info) {return false; }
+        public boolean onLegacyModeEnabled(String info) {
+            return false;
+        }
     };
 
 
@@ -60,8 +71,8 @@ public class TransportManagerTests {
 
     }
 
-    public TransportManager createTransportManager(){
-        TransportManager manager = new TransportManager(config,defaultListener);
+    public TransportManager createTransportManager() {
+        TransportManager manager = new TransportManager(config, defaultListener);
 
         //The default listener returns false as legacy is unacceptable
         assertNull(manager.legacyBluetoothHandler);
@@ -75,14 +86,14 @@ public class TransportManagerTests {
     }
 
     @Test
-    public void testBase(){
-        TransportManager manager = new TransportManager(config,defaultListener);
+    public void testBase() {
+        TransportManager manager = new TransportManager(config, defaultListener);
         assertNotNull(manager);
     }
 
     @Test
-    public void testConnectionStatus(){
-        TransportManager manager = new TransportManager(config,defaultListener);
+    public void testConnectionStatus() {
+        TransportManager manager = new TransportManager(config, defaultListener);
 
         manager.transportStatus.clear();
         manager.transportStatus.add(defaultBtRecord);
@@ -100,14 +111,14 @@ public class TransportManagerTests {
 
         assertFalse(manager.isHighBandwidthAvailable());
 
-        manager.transportStatus.add(new TransportRecord(TransportType.USB,"test"));
+        manager.transportStatus.add(new TransportRecord(TransportType.USB, "test"));
         assertTrue(manager.isHighBandwidthAvailable());
         assertNotNull(manager.getTransportRecord(TransportType.USB, null));
 
     }
 
     @Test
-    public void testOnTransportConnections(){
+    public void testOnTransportConnections() {
 
         TransportManager manager = createTransportManager();
 
@@ -129,7 +140,7 @@ public class TransportManagerTests {
     }
 
     @Test
-    public void testOnPacket(){
+    public void testOnPacket() {
         TransportManager manager = createTransportManager();
         assertNotNull(manager.transportListener);
 
@@ -138,5 +149,4 @@ public class TransportManagerTests {
     }
 
 
-
 }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java
index 4a80343ad..b2d1cf890 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java
@@ -35,7 +35,6 @@ import static org.mockito.Mockito.spy;
 public class MediaStreamingStatusTests {
 
 
-
     @Mock
     private AudioManager audioManager = mock(AudioManager.class);
 
@@ -49,9 +48,9 @@ public class MediaStreamingStatusTests {
         public Object answer(InvocationOnMock invocation) {
             Object[] args = invocation.getArguments();
             String serviceName = (String) args[0];
-            if(serviceName != null && serviceName.equalsIgnoreCase(Context.AUDIO_SERVICE)){
+            if (serviceName != null && serviceName.equalsIgnoreCase(Context.AUDIO_SERVICE)) {
                 return audioManager;
-            }else{
+            } else {
                 return null;
             }
         }
@@ -59,7 +58,7 @@ public class MediaStreamingStatusTests {
 
 
     @Before
-    public void setUp() throws Exception{
+    public void setUp() throws Exception {
         mockedContext = mock(Context.class);
         doAnswer(onGetSystemService).when(mockedContext).getSystemService(Context.AUDIO_SERVICE);
         defaultMediaStreamingStatus = new MediaStreamingStatus(mockedContext, mock(MediaStreamingStatus.Callback.class));
@@ -67,7 +66,7 @@ public class MediaStreamingStatusTests {
 
 
     @Test
-    public void testEmptyAudioDeviceInfoList(){
+    public void testEmptyAudioDeviceInfoList() {
         if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             assertNotNull(mockedContext);
             MediaStreamingStatus mediaStreamingStatus = new MediaStreamingStatus(mockedContext, new MediaStreamingStatus.Callback() {
@@ -89,7 +88,7 @@ public class MediaStreamingStatusTests {
     }
 
     @Test
-    public void testNullAudioDeviceInfoList(){
+    public void testNullAudioDeviceInfoList() {
         if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             assertNotNull(mockedContext);
             MediaStreamingStatus mediaStreamingStatus = new MediaStreamingStatus(mockedContext, mock(MediaStreamingStatus.Callback.class));
@@ -106,7 +105,7 @@ public class MediaStreamingStatusTests {
 
 
     @Test
-    public void testSdlManagerMedia(){
+    public void testSdlManagerMedia() {
         SdlManager.Builder builder = new SdlManager.Builder(getInstrumentation().getTargetContext(), TestValues.GENERAL_FULL_APP_ID, TestValues.GENERAL_STRING, mock(SdlManagerListener.class));
         Vector<AppHMIType> appType = new Vector<>();
         appType.add(AppHMIType.MEDIA);
@@ -124,7 +123,7 @@ public class MediaStreamingStatusTests {
     }
 
     @Test
-    public void testSdlManagerNonMedia(){
+    public void testSdlManagerNonMedia() {
         SdlManager.Builder builder = new SdlManager.Builder(getInstrumentation().getTargetContext(), TestValues.GENERAL_FULL_APP_ID, TestValues.GENERAL_STRING, mock(SdlManagerListener.class));
         Vector<AppHMIType> appType = new Vector<>();
         appType.add(AppHMIType.DEFAULT);
@@ -142,7 +141,7 @@ public class MediaStreamingStatusTests {
     }
 
     @Test
-    public void testAcceptedBTDevices(){
+    public void testAcceptedBTDevices() {
         MediaStreamingStatus mediaStreamingStatus = spy(new MediaStreamingStatus(getInstrumentation().getTargetContext(), mock(MediaStreamingStatus.Callback.class)));
 
         doAnswer(new Answer() {
@@ -157,7 +156,7 @@ public class MediaStreamingStatusTests {
     }
 
     @Test
-    public void testAcceptedUSBDevices(){
+    public void testAcceptedUSBDevices() {
         MediaStreamingStatus mediaStreamingStatus = spy(new MediaStreamingStatus(getInstrumentation().getTargetContext(), mock(MediaStreamingStatus.Callback.class)));
 
         doAnswer(new Answer() {
@@ -175,7 +174,7 @@ public class MediaStreamingStatusTests {
     }
 
     @Test
-    public void testAcceptedLineDevices(){
+    public void testAcceptedLineDevices() {
         assertTrue(defaultMediaStreamingStatus.isSupportedAudioDevice(AudioDeviceInfo.TYPE_LINE_ANALOG));
         assertTrue(defaultMediaStreamingStatus.isSupportedAudioDevice(AudioDeviceInfo.TYPE_LINE_DIGITAL));
         assertTrue(defaultMediaStreamingStatus.isSupportedAudioDevice(AudioDeviceInfo.TYPE_AUX_LINE));
diff --git a/android/sdl_android/src/main/AndroidManifest.xml b/android/sdl_android/src/main/AndroidManifest.xml
index 32a1590e5..4efa349fb 100644
--- a/android/sdl_android/src/main/AndroidManifest.xml
+++ b/android/sdl_android/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <manifest package="com.smartdevicelink"

-          xmlns:tools="http://schemas.android.com/tools">

+    xmlns:tools="http://schemas.android.com/tools">

+

     <uses-sdk tools:overrideLibrary="android.arch.lifecycle, android.arch.lifecycle.extensions, android.arch.lifecycle.livedata, android.arch.lifecycle.livedata.core, android.arch.core, android.arch.lifecycle.viewmodel, android.support.fragment, android.support.coreui, android.support.coreutils, android.support.compat" />

 </manifest>

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java
index 5fd3f417d..7b9869a3a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java
@@ -44,7 +44,7 @@ public final class EncoderUtils {
 
     /**
      * Extracts codec-specific data from MediaFormat instance
-     *
+     * <p>
      * Currently, only AVC is supported.
      *
      * @param format MediaFormat instance retrieved from MediaCodec
@@ -71,7 +71,7 @@ public final class EncoderUtils {
 
     /**
      * Extracts H.264 codec-specific data (SPS and PPS) from MediaFormat instance
-     *
+     * <p>
      * The codec-specific data is in byte-stream format; 4-byte start codes (0x00 0x00 0x00 0x01)
      * are added in front of SPS and PPS NAL units.
      *
@@ -108,5 +108,6 @@ public final class EncoderUtils {
         return output;
     }
 
-    private EncoderUtils() {}
+    private EncoderUtils() {
+    }
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
index 251c3ad3a..4bff42396 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
+ * contributors may be used to endorse or promote products derived from this
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -48,217 +48,229 @@ import java.nio.ByteBuffer;
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
 public class SdlEncoder {
 
-	private static final String TAG = "SdlEncoder";
-
-	// parameters for the encoder
-	private static final String _MIME_TYPE = "video/avc"; // H.264/AVC video
-	private static final long KEEPALIVE_INTERVAL_MSEC = 100;
-
-	// private static final String MIME_TYPE = "video/mp4v-es"; //MPEG4 video
-	private int frameRate = 30;
-	private int frameInterval = 5;
-	private int frameWidth = 800;
-	private int frameHeight = 480;
-	private int bitrate = 6000000;
-
-	// encoder state
-	private MediaCodec mEncoder;
-	private PipedOutputStream mOutputStream;
-	private IVideoStreamListener mOutputListener;
-	private long mLastEmittedFrameTimestamp;
-
-	// allocate one of these up front so we don't need to do it every time
-	private MediaCodec.BufferInfo mBufferInfo;
-
-	// Codec-specific data (SPS and PPS)
-	private byte[] mH264CodecSpecificData = null;
-
-	public SdlEncoder () {
-	}
-	public void setFrameRate(int iVal){
-		frameRate = iVal;
-	}
-	public void setFrameInterval(int iVal){
-		frameInterval = iVal;
-	}
-	public void setFrameWidth(int iVal){
-		frameWidth = iVal;
-	}
-	public void setFrameHeight(int iVal){
-		frameHeight = iVal;
-	}
-	public void setBitrate(int iVal){
-		bitrate = iVal;
-	}
-	public void setOutputStream(PipedOutputStream mStream){
-		mOutputStream = mStream;
-	}
-	public void setOutputListener(IVideoStreamListener listener) {
-		mOutputListener = listener;
-	}
-	public Surface prepareEncoder () {
-
-		mBufferInfo = new MediaCodec.BufferInfo();
-
-		MediaFormat format = MediaFormat.createVideoFormat(_MIME_TYPE, frameWidth,
-				frameHeight);
-
-		// Set some properties. Failing to specify some of these can cause the
-		// MediaCodec
-		// configure() call to throw an unhelpful exception.
-		format.setInteger(MediaFormat.KEY_COLOR_FORMAT,
-				MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface);
-		format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
-		format.setInteger(MediaFormat.KEY_FRAME_RATE, frameRate);
-		format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, frameInterval);
-
-		// Create a MediaCodec encoder, and configure it with our format. Get a
-		// Surface
-		// we can use for input and wrap it with a class that handles the EGL
-		// work.
-		//
-		// If you want to have two EGL contexts -- one for display, one for
-		// recording --
-		// you will likely want to defer instantiation of CodecInputSurface
-		// until after the
-		// "display" EGL context is created, then modify the eglCreateContext
-		// call to
-		// take eglGetCurrentContext() as the share_context argument.
-		try {
-			mEncoder = MediaCodec.createEncoderByType(_MIME_TYPE);
-		} catch (Exception e) {e.printStackTrace();}
-
-		if(mEncoder != null) {
-		   mEncoder.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
-           return mEncoder.createInputSurface();
-		} else {
-			return null;
-		}
-	}
-
-	public void startEncoder () {
-		if(mEncoder != null) {
-		  mEncoder.start();
-		}
-	}
-
-	/**
-	 * Releases encoder resources.
-	 */
-	public void releaseEncoder() {
-		if (mEncoder != null) {
-			mEncoder.stop();
-			mEncoder.release();
-			mEncoder = null;
-		}
-		if (mOutputStream != null) {
-			try {
-				mOutputStream.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			mOutputStream = null;
-		}
-		mH264CodecSpecificData = null;
-	}
-
-	/**
-	 * Extracts all pending data from the encoder
-	 * <p>
-	 * If endOfStream is not set, this returns when there is no more data to
-	 * drain. If it is set, we send EOS to the encoder, and then iterate until
-	 * we see EOS on the output. Calling this with endOfStream set should be
-	 * done once, right before stopping the muxer.
-	 */
-	public void drainEncoder(boolean endOfStream) {
-		final int TIMEOUT_USEC = 10000;
-
-		if(mEncoder == null || (mOutputStream == null && mOutputListener == null)) {
-		   return;
-		}
-		if (endOfStream) {
-			  mEncoder.signalEndOfInputStream();
-		}
-
-		ByteBuffer[] encoderOutputBuffers = mEncoder.getOutputBuffers();
-		while (true) {
-			int encoderStatus = mEncoder.dequeueOutputBuffer(mBufferInfo,
-					TIMEOUT_USEC);
-			if (encoderStatus == MediaCodec.INFO_TRY_AGAIN_LATER) {
-				// no output available yet
-				if (!endOfStream) {
-					trySendVideoKeepalive();
-					break; // out of while
-				}
-			} else if (encoderStatus == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
-				// not expected for an encoder
-				encoderOutputBuffers = mEncoder.getOutputBuffers();
-			} else if (encoderStatus == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
-				if (mH264CodecSpecificData == null) {
-					MediaFormat format = mEncoder.getOutputFormat();
-					mH264CodecSpecificData = EncoderUtils.getCodecSpecificData(format);
-				} else {
-					DebugTool.logWarning(TAG, "Output format change notified more than once, ignoring.");
-				}
-			} else if (encoderStatus < 0) {
-			} else {
-				if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
-					// If we already retrieve codec specific data via OUTPUT_FORMAT_CHANGED event,
-					// we do not need this data.
-					if (mH264CodecSpecificData != null) {
-						mBufferInfo.size = 0;
-					} else {
-						DebugTool.logInfo(TAG, "H264 codec specific data not retrieved yet.");
-					}
-				}
-
-				if (mBufferInfo.size != 0) {
-					ByteBuffer encoderOutputBuffer = encoderOutputBuffers[encoderStatus];
-					byte[] dataToWrite;
-					int dataOffset = 0;
-
-					// append SPS and PPS in front of every IDR NAL unit
-					if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0
-							&& mH264CodecSpecificData != null) {
-						dataToWrite = new byte[mH264CodecSpecificData.length + mBufferInfo.size];
-						System.arraycopy(mH264CodecSpecificData, 0,
-								dataToWrite, 0, mH264CodecSpecificData.length);
-						dataOffset = mH264CodecSpecificData.length;
-					} else {
-						dataToWrite = new byte[mBufferInfo.size];
-					}
-
-					try {
-						encoderOutputBuffer.position(mBufferInfo.offset);
-						encoderOutputBuffer.limit(mBufferInfo.offset + mBufferInfo.size);
-
-						encoderOutputBuffer.get(dataToWrite, dataOffset, mBufferInfo.size);
+    private static final String TAG = "SdlEncoder";
+
+    // parameters for the encoder
+    private static final String _MIME_TYPE = "video/avc"; // H.264/AVC video
+    private static final long KEEPALIVE_INTERVAL_MSEC = 100;
+
+    // private static final String MIME_TYPE = "video/mp4v-es"; //MPEG4 video
+    private int frameRate = 30;
+    private int frameInterval = 5;
+    private int frameWidth = 800;
+    private int frameHeight = 480;
+    private int bitrate = 6000000;
+
+    // encoder state
+    private MediaCodec mEncoder;
+    private PipedOutputStream mOutputStream;
+    private IVideoStreamListener mOutputListener;
+    private long mLastEmittedFrameTimestamp;
+
+    // allocate one of these up front so we don't need to do it every time
+    private MediaCodec.BufferInfo mBufferInfo;
+
+    // Codec-specific data (SPS and PPS)
+    private byte[] mH264CodecSpecificData = null;
+
+    public SdlEncoder() {
+    }
+
+    public void setFrameRate(int iVal) {
+        frameRate = iVal;
+    }
+
+    public void setFrameInterval(int iVal) {
+        frameInterval = iVal;
+    }
+
+    public void setFrameWidth(int iVal) {
+        frameWidth = iVal;
+    }
+
+    public void setFrameHeight(int iVal) {
+        frameHeight = iVal;
+    }
+
+    public void setBitrate(int iVal) {
+        bitrate = iVal;
+    }
+
+    public void setOutputStream(PipedOutputStream mStream) {
+        mOutputStream = mStream;
+    }
+
+    public void setOutputListener(IVideoStreamListener listener) {
+        mOutputListener = listener;
+    }
+
+    public Surface prepareEncoder() {
+
+        mBufferInfo = new MediaCodec.BufferInfo();
+
+        MediaFormat format = MediaFormat.createVideoFormat(_MIME_TYPE, frameWidth,
+                frameHeight);
+
+        // Set some properties. Failing to specify some of these can cause the
+        // MediaCodec
+        // configure() call to throw an unhelpful exception.
+        format.setInteger(MediaFormat.KEY_COLOR_FORMAT,
+                MediaCodecInfo.CodecCapabilities.COLOR_FormatSurface);
+        format.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
+        format.setInteger(MediaFormat.KEY_FRAME_RATE, frameRate);
+        format.setInteger(MediaFormat.KEY_I_FRAME_INTERVAL, frameInterval);
+
+        // Create a MediaCodec encoder, and configure it with our format. Get a
+        // Surface
+        // we can use for input and wrap it with a class that handles the EGL
+        // work.
+        //
+        // If you want to have two EGL contexts -- one for display, one for
+        // recording --
+        // you will likely want to defer instantiation of CodecInputSurface
+        // until after the
+        // "display" EGL context is created, then modify the eglCreateContext
+        // call to
+        // take eglGetCurrentContext() as the share_context argument.
+        try {
+            mEncoder = MediaCodec.createEncoderByType(_MIME_TYPE);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (mEncoder != null) {
+            mEncoder.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+            return mEncoder.createInputSurface();
+        } else {
+            return null;
+        }
+    }
+
+    public void startEncoder() {
+        if (mEncoder != null) {
+            mEncoder.start();
+        }
+    }
+
+    /**
+     * Releases encoder resources.
+     */
+    public void releaseEncoder() {
+        if (mEncoder != null) {
+            mEncoder.stop();
+            mEncoder.release();
+            mEncoder = null;
+        }
+        if (mOutputStream != null) {
+            try {
+                mOutputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            mOutputStream = null;
+        }
+        mH264CodecSpecificData = null;
+    }
+
+    /**
+     * Extracts all pending data from the encoder
+     * <p>
+     * If endOfStream is not set, this returns when there is no more data to
+     * drain. If it is set, we send EOS to the encoder, and then iterate until
+     * we see EOS on the output. Calling this with endOfStream set should be
+     * done once, right before stopping the muxer.
+     */
+    public void drainEncoder(boolean endOfStream) {
+        final int TIMEOUT_USEC = 10000;
+
+        if (mEncoder == null || (mOutputStream == null && mOutputListener == null)) {
+            return;
+        }
+        if (endOfStream) {
+            mEncoder.signalEndOfInputStream();
+        }
+
+        ByteBuffer[] encoderOutputBuffers = mEncoder.getOutputBuffers();
+        while (true) {
+            int encoderStatus = mEncoder.dequeueOutputBuffer(mBufferInfo,
+                    TIMEOUT_USEC);
+            if (encoderStatus == MediaCodec.INFO_TRY_AGAIN_LATER) {
+                // no output available yet
+                if (!endOfStream) {
+                    trySendVideoKeepalive();
+                    break; // out of while
+                }
+            } else if (encoderStatus == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
+                // not expected for an encoder
+                encoderOutputBuffers = mEncoder.getOutputBuffers();
+            } else if (encoderStatus == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+                if (mH264CodecSpecificData == null) {
+                    MediaFormat format = mEncoder.getOutputFormat();
+                    mH264CodecSpecificData = EncoderUtils.getCodecSpecificData(format);
+                } else {
+                    DebugTool.logWarning(TAG, "Output format change notified more than once, ignoring.");
+                }
+            } else if (encoderStatus < 0) {
+            } else {
+                if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
+                    // If we already retrieve codec specific data via OUTPUT_FORMAT_CHANGED event,
+                    // we do not need this data.
+                    if (mH264CodecSpecificData != null) {
+                        mBufferInfo.size = 0;
+                    } else {
+                        DebugTool.logInfo(TAG, "H264 codec specific data not retrieved yet.");
+                    }
+                }
+
+                if (mBufferInfo.size != 0) {
+                    ByteBuffer encoderOutputBuffer = encoderOutputBuffers[encoderStatus];
+                    byte[] dataToWrite;
+                    int dataOffset = 0;
+
+                    // append SPS and PPS in front of every IDR NAL unit
+                    if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0
+                            && mH264CodecSpecificData != null) {
+                        dataToWrite = new byte[mH264CodecSpecificData.length + mBufferInfo.size];
+                        System.arraycopy(mH264CodecSpecificData, 0,
+                                dataToWrite, 0, mH264CodecSpecificData.length);
+                        dataOffset = mH264CodecSpecificData.length;
+                    } else {
+                        dataToWrite = new byte[mBufferInfo.size];
+                    }
+
+                    try {
+                        encoderOutputBuffer.position(mBufferInfo.offset);
+                        encoderOutputBuffer.limit(mBufferInfo.offset + mBufferInfo.size);
+
+                        encoderOutputBuffer.get(dataToWrite, dataOffset, mBufferInfo.size);
 
                         emitFrame(dataToWrite);
-                    } catch (Exception e) {}
-				}
+                    } catch (Exception e) {
+                    }
+                }
 
-				mEncoder.releaseOutputBuffer(encoderStatus, false);
+                mEncoder.releaseOutputBuffer(encoderStatus, false);
 
-				if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-					break; // out of while
-				}
-			}
-		}
-	}
+                if ((mBufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+                    break; // out of while
+                }
+            }
+        }
+    }
 
-	private void trySendVideoKeepalive() {
-		if (mH264CodecSpecificData == null) {
-			return;
-		}
+    private void trySendVideoKeepalive() {
+        if (mH264CodecSpecificData == null) {
+            return;
+        }
 
         try {
-		    long timeSinceLastEmitted = System.currentTimeMillis() - mLastEmittedFrameTimestamp;
-		    if (timeSinceLastEmitted >= KEEPALIVE_INTERVAL_MSEC) {
-				emitFrame(mH264CodecSpecificData);
-			}
-        } catch (IOException e) {}
-	}
+            long timeSinceLastEmitted = System.currentTimeMillis() - mLastEmittedFrameTimestamp;
+            if (timeSinceLastEmitted >= KEEPALIVE_INTERVAL_MSEC) {
+                emitFrame(mH264CodecSpecificData);
+            }
+        } catch (IOException e) {
+        }
+    }
 
     private void emitFrame(final byte[] dataToWrite) throws IOException {
         if (mOutputStream != null) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
index de342f7c9..6a670dba3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
@@ -76,8 +76,9 @@ public class VirtualDisplayEncoder {
     /**
      * Initialization method for VirtualDisplayEncoder object. MUST be called before start() or shutdown()
      * Will overwrite previously set videoWeight and videoHeight
-     * @param context to create the virtual display
-     * @param outputListener the listener that the video frames will be sent through
+     *
+     * @param context         to create the virtual display
+     * @param outputListener  the listener that the video frames will be sent through
      * @param streamingParams parameters to create the virtual display and encoder
      * @throws Exception if the API level is <19 or supplied parameters were null
      */
@@ -101,7 +102,7 @@ public class VirtualDisplayEncoder {
         initPassed = true;
     }
 
-    public VideoStreamingParameters getStreamingParams(){
+    public VideoStreamingParameters getStreamingParams() {
         return this.streamingParams;
     }
 
@@ -331,7 +332,7 @@ public class VirtualDisplayEncoder {
             Thread currentThread = Thread.currentThread();
             while (!currentThread.isInterrupted()) {
                 int encoderStatus = mVideoEncoder.dequeueOutputBuffer(mVideoBufferInfo, -1);
-                if(encoderStatus < 0){
+                if (encoderStatus < 0) {
                     if (encoderStatus == MediaCodec.INFO_TRY_AGAIN_LATER) {
                         // no output available yet
                         if (!endOfStream) {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
index 8bd1f6259..99af62a74 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
@@ -35,36 +35,37 @@ package com.smartdevicelink.managers;
 import com.smartdevicelink.managers.lifecycle.LifecycleConfigurationUpdate;
 import com.smartdevicelink.proxy.rpc.enums.Language;
 
-public interface SdlManagerListener extends BaseSdlManagerListener{
+public interface SdlManagerListener extends BaseSdlManagerListener {
 
-	/**
-	 * Called when a manager is ready for use
-	 */
-	void onStart();
+    /**
+     * Called when a manager is ready for use
+     */
+    void onStart();
 
-	/**
-	 * Called when the manager is destroyed
-	 */
-	void onDestroy();
+    /**
+     * Called when the manager is destroyed
+     */
+    void onDestroy();
 
-	/**
-	 * Called when the manager encounters an error
-	 * @param info info regarding the error
-	 * @param e the exception
-	 */
-	void onError(String info, Exception e);
+    /**
+     * Called when the manager encounters an error
+     *
+     * @param info info regarding the error
+     * @param e    the exception
+     */
+    void onError(String info, Exception e);
 
-	/**
-	 * Called when the SDL manager detected a language mismatch. In case of a language mismatch the
-	 * manager should change the apps registration by updating the lifecycle configuration to the
-	 * specified language. If the app can support the specified language it should return an Object
-	 * of LifecycleConfigurationUpdate, otherwise it should return null to indicate that the language
-	 * is not supported.
-	 *
-	 * @param language The VR+TTS language of the connected head unit the manager is trying to update the configuration.
-	 * @param hmiLanguage The HMI display language of the connected head unit the manager is trying to update the configuration.
-	 * @return An object of LifecycleConfigurationUpdate if the head unit language is supported,
-	 * otherwise null to indicate that the language is not supported.
-	 */
-	LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language, Language hmiLanguage);
+    /**
+     * Called when the SDL manager detected a language mismatch. In case of a language mismatch the
+     * manager should change the apps registration by updating the lifecycle configuration to the
+     * specified language. If the app can support the specified language it should return an Object
+     * of LifecycleConfigurationUpdate, otherwise it should return null to indicate that the language
+     * is not supported.
+     *
+     * @param language    The VR+TTS language of the connected head unit the manager is trying to update the configuration.
+     * @param hmiLanguage The HMI display language of the connected head unit the manager is trying to update the configuration.
+     * @return An object of LifecycleConfigurationUpdate if the head unit language is supported,
+     * otherwise null to indicate that the language is not supported.
+     */
+    LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language, Language hmiLanguage);
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java
index 141a2b020..9d15dcbe1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java
@@ -14,7 +14,7 @@
  * distribution.

  *

  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

+ * contributors may be used to endorse or promote products derived from this

  * software without specific prior written permission.

  *

  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

@@ -54,11 +54,12 @@ public class AudioDecoder extends BaseAudioDecoder {
 

     /**

      * Creates a new object of AudioDecoder.

+     *

      * @param audioSource The audio source to decode.

-     * @param context The context object to use to open the audio source.

-     * @param sampleRate The desired sample rate for decoded audio data.

-     * @param sampleType The desired sample type (8bit, 16bit, float).

-     * @param listener A listener who receives the decoded audio.

+     * @param context     The context object to use to open the audio source.

+     * @param sampleRate  The desired sample rate for decoded audio data.

+     * @param sampleType  The desired sample type (8bit, 16bit, float).

+     * @param listener    A listener who receives the decoded audio.

      */

     AudioDecoder(Uri audioSource, Context context, int sampleRate, @SampleType int sampleType, AudioDecoderListener listener) {

         super(audioSource, context, sampleRate, sampleType, listener);

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java
index 7e32d3261..db6c56fe5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderCompat.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
+ * contributors may be used to endorse or promote products derived from this
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -56,11 +56,12 @@ public class AudioDecoderCompat extends BaseAudioDecoder {
 
     /**
      * Creates a new object of AudioDecoder.
+     *
      * @param audioSource The audio source to decode.
-     * @param context The context object to use to open the audio source.
-     * @param sampleRate The desired sample rate for decoded audio data.
-     * @param sampleType The desired sample type (8bit, 16bit, float).
-     * @param listener A listener who receives the decoded audio.
+     * @param context     The context object to use to open the audio source.
+     * @param sampleRate  The desired sample rate for decoded audio data.
+     * @param sampleType  The desired sample type (8bit, 16bit, float).
+     * @param listener    A listener who receives the decoded audio.
      */
     AudioDecoderCompat(@NonNull Uri audioSource, @NonNull Context context, int sampleRate, @SampleType int sampleType, AudioDecoderListener listener) {
         super(audioSource, context, sampleRate, sampleType, listener);
@@ -78,7 +79,7 @@ public class AudioDecoderCompat extends BaseAudioDecoder {
 
         } catch (Exception e) {
             e.printStackTrace();
-            if(this.listener != null) {
+            if (this.listener != null) {
                 this.listener.onDecoderError(e);
                 this.listener.onDecoderFinish(false);
             }
@@ -95,12 +96,14 @@ public class AudioDecoderCompat extends BaseAudioDecoder {
 
         /**
          * Decodes all audio data from source
+         *
          * @param audioDecoderCompat instance of this class
          */
-        DecoderRunnable(@NonNull AudioDecoderCompat audioDecoderCompat){
+        DecoderRunnable(@NonNull AudioDecoderCompat audioDecoderCompat) {
             weakReference = new WeakReference<>(audioDecoderCompat);
 
         }
+
         @Override
         public void run() {
             final AudioDecoderCompat reference = weakReference.get();
@@ -115,7 +118,7 @@ public class AudioDecoderCompat extends BaseAudioDecoder {
             ByteBuffer inputBuffer, outputBuffer;
             SampleBuffer sampleBuffer;
 
-            while (reference!= null && !reference.mThread.isInterrupted()) {
+            while (reference != null && !reference.mThread.isInterrupted()) {
                 int inputBuffersArrayIndex = 0;
                 while (inputBuffersArrayIndex != MediaCodec.INFO_TRY_AGAIN_LATER) {
                     inputBuffersArrayIndex = reference.decoder.dequeueInputBuffer(DEQUEUE_TIMEOUT);
@@ -135,7 +138,7 @@ public class AudioDecoderCompat extends BaseAudioDecoder {
                             reference.decoder.releaseOutputBuffer(outputBuffersArrayIndex, false);
                         } else if (outputBuffer.limit() > 0) {
                             sampleBuffer = reference.onOutputBufferAvailable(outputBuffer);
-                            if(reference.listener!=null){
+                            if (reference.listener != null) {
                                 reference.listener.onAudioDataAvailable(sampleBuffer);
                             }
                             reference.decoder.releaseOutputBuffer(outputBuffersArrayIndex, false);
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderListener.java
index 5962ac09e..6a53425e2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoderListener.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
+ * contributors may be used to endorse or promote products derived from this
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -29,30 +29,33 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package com.smartdevicelink.managers.audio;

-

-/**

- * An interface for the audio decoder classes.

- * The caller using the audio decoder will be

- * notified when the decoding is finished or if an error occurred.

- * During decoding the caller receives sample buffers with decoded audio data.

- */

-public interface AudioDecoderListener {

-    /**

-     * Notifies that decoded audio data is available.

-     * @param sampleBuffer The sample buffer holding the decoded audio data.

-     */

-    void onAudioDataAvailable(SampleBuffer sampleBuffer);

-

-    /**

-     * Notifies that the audio decoding is finished.

-     * @param success Indicates whether audio decoding was successful or if an error occurred.

-     */

-    void onDecoderFinish(boolean success);

-

-    /**

-     * Notifies the caller that an error/exception occurred during audio decoding.

-     * @param e The exception storing information about the error.

-     */

-    void onDecoderError(Exception e);

-}

+package com.smartdevicelink.managers.audio;
+
+/**
+ * An interface for the audio decoder classes.
+ * The caller using the audio decoder will be
+ * notified when the decoding is finished or if an error occurred.
+ * During decoding the caller receives sample buffers with decoded audio data.
+ */
+public interface AudioDecoderListener {
+    /**
+     * Notifies that decoded audio data is available.
+     *
+     * @param sampleBuffer The sample buffer holding the decoded audio data.
+     */
+    void onAudioDataAvailable(SampleBuffer sampleBuffer);
+
+    /**
+     * Notifies that the audio decoding is finished.
+     *
+     * @param success Indicates whether audio decoding was successful or if an error occurred.
+     */
+    void onDecoderFinish(boolean success);
+
+    /**
+     * Notifies the caller that an error/exception occurred during audio decoding.
+     *
+     * @param e The exception storing information about the error.
+     */
+    void onDecoderError(Exception e);
+}
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
index 0e4a2ed2c..bb7269e57 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
@@ -14,7 +14,7 @@
  * distribution.

  *

  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

+ * contributors may be used to endorse or promote products derived from this

  * software without specific prior written permission.

  *

  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

@@ -43,22 +43,22 @@ import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;

 import androidx.annotation.RestrictTo;

 

-import com.smartdevicelink.session.SdlSession;

 import com.smartdevicelink.managers.CompletionListener;

+import com.smartdevicelink.managers.ISdl;

 import com.smartdevicelink.managers.StreamingStateMachine;

 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;

+import com.smartdevicelink.protocol.ISdlServiceListener;

 import com.smartdevicelink.protocol.ProtocolMessage;

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.protocol.enums.SessionType;

 import com.smartdevicelink.proxy.RPCNotification;

-import com.smartdevicelink.managers.ISdl;

-import com.smartdevicelink.protocol.ISdlServiceListener;

 import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities;

 import com.smartdevicelink.proxy.rpc.OnHMIStatus;

 import com.smartdevicelink.proxy.rpc.enums.HMILevel;

 import com.smartdevicelink.proxy.rpc.enums.PredefinedWindows;

 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;

 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;

+import com.smartdevicelink.session.SdlSession;

 import com.smartdevicelink.streaming.IStreamListener;

 import com.smartdevicelink.streaming.StreamPacketizer;

 import com.smartdevicelink.streaming.audio.IAudioStreamListener;

@@ -86,7 +86,8 @@ public class AudioStreamManager extends BaseAudioStreamManager {
 

     private IAudioStreamListener sdlAudioStream;

     private int sdlSampleRate;

-    private @SampleType int sdlSampleType;

+    private @SampleType

+    int sdlSampleType;

     private final Queue<BaseAudioDecoder> queue;

     private final WeakReference<Context> context;

     private final StreamingStateMachine streamingStateMachine;

@@ -109,7 +110,6 @@ public class AudioStreamManager extends BaseAudioStreamManager {
     };

 

 

-

     // INTERNAL INTERFACE

 

     private final ISdlServiceListener serviceListener = new ISdlServiceListener() {

@@ -170,13 +170,13 @@ public class AudioStreamManager extends BaseAudioStreamManager {
     private final OnRPCNotificationListener hmiListener = new OnRPCNotificationListener() {

         @Override

         public void onNotified(RPCNotification notification) {

-            if(notification != null){

-                OnHMIStatus onHMIStatus = (OnHMIStatus)notification;

+            if (notification != null) {

+                OnHMIStatus onHMIStatus = (OnHMIStatus) notification;

                 if (onHMIStatus.getWindowID() != null && onHMIStatus.getWindowID() != PredefinedWindows.DEFAULT_WINDOW.getValue()) {

                     return;

                 }

                 hmiLevel = onHMIStatus.getHmiLevel();

-                if(hmiLevel.equals(HMILevel.HMI_FULL) || hmiLevel.equals(HMILevel.HMI_LIMITED)){

+                if (hmiLevel.equals(HMILevel.HMI_FULL) || hmiLevel.equals(HMILevel.HMI_LIMITED)) {

                     checkState();

                 }

             }

@@ -185,6 +185,7 @@ public class AudioStreamManager extends BaseAudioStreamManager {
 

     /**

      * Creates a new object of AudioStreamManager

+     *

      * @param internalInterface The internal interface to the connected device.

      */

     @RestrictTo(RestrictTo.Scope.LIBRARY)

@@ -211,16 +212,16 @@ public class AudioStreamManager extends BaseAudioStreamManager {
         super.start(listener);

     }

 

-    private void checkState(){

-        if(audioStreamingCapabilities != null

+    private void checkState() {

+        if (audioStreamingCapabilities != null

                 && isTransportAvailable

                 && hmiLevel != null

-                && (hmiLevel.equals(HMILevel.HMI_LIMITED) || hmiLevel.equals(HMILevel.HMI_FULL))){

+                && (hmiLevel.equals(HMILevel.HMI_LIMITED) || hmiLevel.equals(HMILevel.HMI_FULL))) {

             transitionToState(READY);

         }

     }

 

-    private void getAudioStreamingCapabilities(){

+    private void getAudioStreamingCapabilities() {

         if (internalInterface.getSystemCapabilityManager() != null) {

             internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.PCM_STREAMING, new OnSystemCapabilityListener() {

                 @Override

@@ -257,6 +258,7 @@ public class AudioStreamManager extends BaseAudioStreamManager {
     /**

      * Starts the audio service and audio stream to the connected device.

      * The method is non-blocking.

+     *

      * @param encrypted Specify whether or not the audio stream should be encrypted.

      */

     public void startAudioStream(boolean encrypted, final CompletionListener completionListener) {

@@ -327,7 +329,8 @@ public class AudioStreamManager extends BaseAudioStreamManager {
 

     /**

      * Makes the callback to the listener

-     * @param listener the listener to notify

+     *

+     * @param listener  the listener to notify

      * @param isSuccess flag to notify

      */

     private void finish(CompletionListener listener, boolean isSuccess) {

@@ -365,7 +368,8 @@ public class AudioStreamManager extends BaseAudioStreamManager {
      * Pushes the specified resource file to the playback queue.

      * The audio file will be played immediately. If another audio file is currently playing

      * the specified file will stay queued and automatically played when ready.

-     * @param resourceId The specified resource file to be played.

+     *

+     * @param resourceId         The specified resource file to be played.

      * @param completionListener A completion listener that informs when the audio file is played.

      */

     public void pushResource(int resourceId, final CompletionListener completionListener) {

@@ -385,7 +389,8 @@ public class AudioStreamManager extends BaseAudioStreamManager {
      * Pushes the specified audio file to the playback queue.

      * The audio file will be played immediately. If another audio file is currently playing

      * the specified file will stay queued and automatically played when ready.

-     * @param audioSource The specified audio file to be played.

+     *

+     * @param audioSource        The specified audio file to be played.

      * @param completionListener A completion listener that informs when the audio file is played.

      */

     @SuppressWarnings("WeakerAccess")

@@ -448,7 +453,8 @@ public class AudioStreamManager extends BaseAudioStreamManager {
      * Pushes raw audio data to SDL Core.

      * The audio file will be played immediately. If another audio file is currently playing,

      * the specified file will stay queued and automatically played when ready.

-     * @param data Audio raw data to send.

+     *

+     * @param data               Audio raw data to send.

      * @param completionListener A completion listener that informs when the audio file is played.

      */

     public void pushBuffer(ByteBuffer data, CompletionListener completionListener) {

@@ -464,17 +470,17 @@ public class AudioStreamManager extends BaseAudioStreamManager {
     }

 

     @Override

-    protected void onTransportUpdate(List<TransportRecord> connectedTransports, boolean audioStreamTransportAvail, boolean videoStreamTransportAvail){

+    protected void onTransportUpdate(List<TransportRecord> connectedTransports, boolean audioStreamTransportAvail, boolean videoStreamTransportAvail) {

 

         isTransportAvailable = audioStreamTransportAvail;

 

-        if(internalInterface.getProtocolVersion().isNewerThan(new Version(5,1,0)) >= 0){

-            if(audioStreamTransportAvail){

+        if (internalInterface.getProtocolVersion().isNewerThan(new Version(5, 1, 0)) >= 0) {

+            if (audioStreamTransportAvail) {

                 checkState();

             }

-        }else{

+        } else {

             //The protocol version doesn't support simultaneous transports.

-            if(!audioStreamTransportAvail){

+            if (!audioStreamTransportAvail) {

                 //If video streaming isn't available on primary transport then it is not possible to

                 //use the video streaming manager until a complete register on a transport that

                 //supports video

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java
index d7f4f3a7c..e35d0d113 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java
@@ -14,7 +14,7 @@
  * distribution.

  *

  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

+ * contributors may be used to endorse or promote products derived from this

  * software without specific prior written permission.

  *

  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

@@ -54,11 +54,13 @@ public abstract class BaseAudioDecoder {
     private static final String TAG = AudioDecoder.class.getSimpleName();

 

     protected final int targetSampleRate;

-    protected @SampleType final int targetSampleType;

+    protected @SampleType

+    final int targetSampleType;

 

     private int outputChannelCount;

     private int outputSampleRate;

-    private @SampleType int outputSampleType;

+    private @SampleType

+    int outputSampleType;

 

     private double lastOutputSample = 0;

 

@@ -73,14 +75,13 @@ public abstract class BaseAudioDecoder {
     protected final AudioDecoderListener listener;

 

     /**

-     *

      * @param audioSource Uri of the audio source to be converted

-     * @param context the context

-     * @param sampleRate can be either 8000, 16000, 22050 or 44100

+     * @param context     the context

+     * @param sampleRate  can be either 8000, 16000, 22050 or 44100

+     * @param sampleType  can be either UNSIGNED_8_BIT, SIGNED_16_BIT, FLOAT

+     * @param listener    listener for event callbacks

      * @see AudioPassThruCapabilities#getSamplingRate()

-     * @param sampleType can be either UNSIGNED_8_BIT, SIGNED_16_BIT, FLOAT

      * @see SampleType

-     * @param listener listener for event callbacks

      */

     public BaseAudioDecoder(@NonNull Uri audioSource, @NonNull Context context, int sampleRate, @SampleType int sampleType, AudioDecoderListener listener) {

         this.audioSource = audioSource;

@@ -92,13 +93,13 @@ public abstract class BaseAudioDecoder {
     }

 

     protected void initMediaComponents() throws Exception {

-        if(targetSampleRate <= 0){

+        if (targetSampleRate <= 0) {

             throw new InstantiationException("Target sample rate of " + targetSampleRate + " is unsupported");

         }

 

         extractor = new MediaExtractor();

         Context contextRef = contextWeakReference.get();

-        if(contextRef == null){

+        if (contextRef == null) {

             throw new InstantiationException("Context reference was null");

         }

         extractor.setDataSource(contextRef, audioSource, null);

@@ -187,20 +188,20 @@ public abstract class BaseAudioDecoder {
 

     protected SampleBuffer onOutputBufferAvailable(@NonNull ByteBuffer outputBuffer) {

         double outputPresentationTimeUs = lastOutputPresentationTimeUs;

-        double outputDurationPerSampleUs = 1000000.0 / (double)outputSampleRate;

+        double outputDurationPerSampleUs = 1000000.0 / (double) outputSampleRate;

 

         double targetPresentationTimeUs = lastTargetPresentationTimeUs;

-        double targetDurationPerSampleUs = 1000000.0 / (double)targetSampleRate;

+        double targetDurationPerSampleUs = 1000000.0 / (double) targetSampleRate;

 

         // wrap the output buffer to make it provide audio samples

-        SampleBuffer outputSampleBuffer = SampleBuffer.wrap(outputBuffer, outputSampleType, outputChannelCount, (long)outputPresentationTimeUs);

+        SampleBuffer outputSampleBuffer = SampleBuffer.wrap(outputBuffer, outputSampleType, outputChannelCount, (long) outputPresentationTimeUs);

         outputSampleBuffer.position(0);

 

         // the buffer size is related to the output and target sample rate

         // add 2 samples to round up and add an extra sample

         int sampleSize = outputSampleBuffer.limit() * targetSampleRate / outputSampleRate + 2;

 

-        SampleBuffer targetSampleBuffer = SampleBuffer.allocate(sampleSize, targetSampleType, ByteOrder.LITTLE_ENDIAN, (long)targetPresentationTimeUs);

+        SampleBuffer targetSampleBuffer = SampleBuffer.allocate(sampleSize, targetSampleType, ByteOrder.LITTLE_ENDIAN, (long) targetPresentationTimeUs);

         Double sample;

 

         do {

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java
index 0993b2ec2..dfeb147ab 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java
@@ -14,7 +14,7 @@
  * distribution.

  *

  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

+ * contributors may be used to endorse or promote products derived from this

  * software without specific prior written permission.

  *

  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

@@ -44,15 +44,17 @@ import java.nio.ByteOrder;
 public class SampleBuffer {

     private static final String TAG = SampleBuffer.class.getSimpleName();

 

-    private @SampleType final int sampleType;

+    private @SampleType

+    final int sampleType;

     private final ByteBuffer byteBuffer;

     private final int channelCount;

     private final long presentationTimeUs;

 

     /**

      * Wraps a raw (mono) byte buffer to a new sample buffer.

-     * @param buffer The raw buffer to be wrapped.

-     * @param sampleType The sample type of the samples in the raw buffer.

+     *

+     * @param buffer             The raw buffer to be wrapped.

+     * @param sampleType         The sample type of the samples in the raw buffer.

      * @param presentationTimeUs The presentation time of the buffer.

      * @return A new sample buffer wrapping the specified raw buffer.

      */

@@ -62,9 +64,10 @@ public class SampleBuffer {
 

     /**

      * Wraps a raw byte buffer to a new sample buffer.

-     * @param buffer The raw buffer to be wrapped.

-     * @param sampleType The sample type of the samples in the raw buffer.

-     * @param channelCount The number of channels (1 = mono, 2 = stereo).

+     *

+     * @param buffer             The raw buffer to be wrapped.

+     * @param sampleType         The sample type of the samples in the raw buffer.

+     * @param channelCount       The number of channels (1 = mono, 2 = stereo).

      * @param presentationTimeUs The presentation time of the buffer.

      * @return A new sample buffer wrapping the specified raw buffer.

      */

@@ -74,9 +77,10 @@ public class SampleBuffer {
 

     /**

      * Allocates a new sample buffer.

-     * @param capacity The specified sample capacity of the sample buffer.

-     * @param sampleType The sample type of the samples the buffer should store.

-     * @param byteOrder The byte order for the samples (little or big endian).

+     *

+     * @param capacity           The specified sample capacity of the sample buffer.

+     * @param sampleType         The sample type of the samples the buffer should store.

+     * @param byteOrder          The byte order for the samples (little or big endian).

      * @param presentationTimeUs The presentation time for the buffer.

      * @return A new and empty sample buffer.

      */

@@ -86,10 +90,11 @@ public class SampleBuffer {
 

     /**

      * Allocates a new sample buffer.

-     * @param capacity The specified sample capacity of the sample buffer.

-     * @param sampleType The sample type of the samples the buffer should store.

-     * @param channelCount The number of channels (1 = mono, 2 = stereo).

-     * @param byteOrder The byte order for the samples (little or big endian).

+     *

+     * @param capacity           The specified sample capacity of the sample buffer.

+     * @param sampleType         The sample type of the samples the buffer should store.

+     * @param channelCount       The number of channels (1 = mono, 2 = stereo).

+     * @param byteOrder          The byte order for the samples (little or big endian).

      * @param presentationTimeUs The presentation time for the buffer.

      * @return A new and empty sample buffer.

      */

@@ -128,6 +133,7 @@ public class SampleBuffer {
 

     /**

      * Sets the number of samples in the buffer to the new limit.

+     *

      * @param newLimit The new limit of the sample buffer.

      */

     public void limit(int newLimit) {

@@ -136,6 +142,7 @@ public class SampleBuffer {
 

     /**

      * Returns the current position in the buffer per channel.

+     *

      * @return The position of the sample buffer.

      */

     public int position() {

@@ -143,7 +150,8 @@ public class SampleBuffer {
     }

 

     /**

-     *Sets the position of the sample buffer to the new index.

+     * Sets the position of the sample buffer to the new index.

+     *

      * @param newPosition The new position of the sample buffer.

      */

     public void position(int newPosition) {

@@ -153,6 +161,7 @@ public class SampleBuffer {
     /**

      * Returns the sample of the current position and then increments the position.

      * The sample returned is a mixed sample getting all samples from each channel.

+     *

      * @return The mixed sample.

      */

     public double get() {

@@ -164,6 +173,7 @@ public class SampleBuffer {
      * Returns the sample from the given index in the buffer.

      * If the buffer's channel count is > 1 the sample returned

      * is a mixed sample getting all samples from each channel.

+     *

      * @param index The index of the sample requested.

      * @return The sample requested.

      */

@@ -178,7 +188,7 @@ public class SampleBuffer {
                 for (int i = 0; i < channelCount; i++) {

                     byte b = index == -1 ? byteBuffer.get() : byteBuffer.get(internalIndex + i * sampleType);

                     int a = b & 0xff; // convert the 8 bits into int so we can calc > 127

-                    avg += a / (double)channelCount;

+                    avg += a / (double) channelCount;

                 }

 

                 return avg * 2.0 / 255.0 - 1.0; //magic? check out SampleType

@@ -189,7 +199,7 @@ public class SampleBuffer {
                 // get a sample mix to mono from the index

                 for (int i = 0; i < channelCount; i++) {

                     short a = index == -1 ? byteBuffer.getShort() : byteBuffer.getShort(internalIndex + i * sampleType);

-                    avg += a / (double)channelCount;

+                    avg += a / (double) channelCount;

                 }

 

                 return (avg + 32768.0) * 2.0 / 65535.0 - 1.0; //magic? check out SampleType

@@ -200,7 +210,7 @@ public class SampleBuffer {
                 // get a sample mix to mono from the index

                 for (int i = 0; i < channelCount; i++) {

                     double a = index == -1 ? byteBuffer.getFloat() : byteBuffer.getFloat(internalIndex + i * sampleType);

-                    avg += a / (double)channelCount;

+                    avg += a / (double) channelCount;

                 }

 

                 return avg;

@@ -214,6 +224,7 @@ public class SampleBuffer {
 

     /**

      * Puts a sample to the current position and increments the position.

+     *

      * @param sample The sample to put into the buffer.

      */

     public void put(double sample) {

@@ -224,15 +235,16 @@ public class SampleBuffer {
      * Puts a sample to the given index in the buffer.

      * If the buffer's channel count is > 1 the sample

      * will be stored in each channel at the given index.

-     * @param index The index to put the sample.

+     *

+     * @param index  The index to put the sample.

      * @param sample The sample to store in the buffer.

      */

     public void put(int index, double sample) {

         int internalIndex = index * channelCount * sampleType;

         switch (sampleType) {

             case SampleType.UNSIGNED_8_BIT: {

-                int a = (int)Math.round((sample + 1.0) * 255.0 / 2.0); //magic? check out SampleType

-                byte b = (byte)a;

+                int a = (int) Math.round((sample + 1.0) * 255.0 / 2.0); //magic? check out SampleType

+                byte b = (byte) a;

                 if (index == -1) {

                     for (int i = 0; i < channelCount; i++) {

                         byteBuffer.put(b);

@@ -245,7 +257,7 @@ public class SampleBuffer {
                 break;

             }

             case SampleType.SIGNED_16_BIT: {

-                short a = (short)Math.round((sample + 1.0) * 65535 / 2.0 - 32767.0); //magic? check out SampleType

+                short a = (short) Math.round((sample + 1.0) * 65535 / 2.0 - 32767.0); //magic? check out SampleType

                 if (index == -1) {

                     for (int i = 0; i < channelCount; i++) {

                         byteBuffer.putShort(a);

@@ -277,6 +289,7 @@ public class SampleBuffer {
 

     /**

      * Returns the raw byte buffer managed by this sample buffer.

+     *

      * @return The raw byte buffer managed by this sample buffer.

      */

     public ByteBuffer getByteBuffer() {

@@ -285,6 +298,7 @@ public class SampleBuffer {
 

     /**

      * Returns a copy of the bytes from position 0 to the current limit.

+     *

      * @return A copy of the bytes.

      */

     public byte[] getBytes() {

@@ -300,6 +314,7 @@ public class SampleBuffer {
 

     /**

      * The presentation time of this sample buffer.

+     *

      * @return The presentation time of this sample buffer.

      */

     public long getPresentationTimeUs() {

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
index 6b98e9b58..252ee09f2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
@@ -50,127 +50,131 @@ import java.lang.ref.WeakReference;
 
 /**
  * <strong>FileManager</strong> <br>
- *
+ * <p>
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
- *
+ * <p>
  * The SDLFileManager uploads files and keeps track of all the uploaded files names during a session. <br>
- *
+ * <p>
  * We need to add the following struct: SDLFile<br>
- *
+ * <p>
  * It is broken down to these areas: <br>
- *
+ * <p>
  * 1. Getters <br>
  * 2. Deletion methods <br>
  * 3. Uploading Files / Artwork
  */
 public class FileManager extends BaseFileManager {
 
-	private final WeakReference<Context> context;
+    private final WeakReference<Context> context;
 
-	/**
-	 * Constructor for FileManager
-	 * @param internalInterface an instance of the ISdl interface that can be used for common SDL operations (sendRpc, addRpcListener, etc)
-	 * @param context an instances of Context interface to global information for application
-	 * @param fileManagerConfig an instance of the FileManagerConfig gives access to artworkRetryCount and fileRetryCount to let us if those file types can be re-upload if they fail
-	 */
-	@RestrictTo(RestrictTo.Scope.LIBRARY)
-	public FileManager(ISdl internalInterface, Context context, FileManagerConfig fileManagerConfig) {
-		// setup
-		super(internalInterface, fileManagerConfig);
-		this.context = new WeakReference<>(context);
-	}
+    /**
+     * Constructor for FileManager
+     *
+     * @param internalInterface an instance of the ISdl interface that can be used for common SDL operations (sendRpc, addRpcListener, etc)
+     * @param context           an instances of Context interface to global information for application
+     * @param fileManagerConfig an instance of the FileManagerConfig gives access to artworkRetryCount and fileRetryCount to let us if those file types can be re-upload if they fail
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public FileManager(ISdl internalInterface, Context context, FileManagerConfig fileManagerConfig) {
+        // setup
+        super(internalInterface, fileManagerConfig);
+        this.context = new WeakReference<>(context);
+    }
 
-	/**
-	 * Creates and returns a PutFile request that would upload a given SdlFile
-	 * @param file SdlFile with fileName and one of A) fileData, B) Uri, or C) resourceID set
-	 * @return a valid PutFile request if SdlFile contained a fileName and sufficient data
-	 */
-	@Override
-	PutFile createPutFile(@NonNull final SdlFile file){
-		PutFile putFile = new PutFile();
-		if(file.getName() == null){
-			throw new IllegalArgumentException("You must specify an file name in the SdlFile");
-		}else{
-			putFile.setSdlFileName(file.getName());
-		}
+    /**
+     * Creates and returns a PutFile request that would upload a given SdlFile
+     *
+     * @param file SdlFile with fileName and one of A) fileData, B) Uri, or C) resourceID set
+     * @return a valid PutFile request if SdlFile contained a fileName and sufficient data
+     */
+    @Override
+    PutFile createPutFile(@NonNull final SdlFile file) {
+        PutFile putFile = new PutFile();
+        if (file.getName() == null) {
+            throw new IllegalArgumentException("You must specify an file name in the SdlFile");
+        } else {
+            putFile.setSdlFileName(file.getName());
+        }
 
-		if(file.getResourceId() > 0){
-			// Use resource id to upload file
-			byte[] contents = contentsOfResource(file.getResourceId());
-			if(contents != null){
-				putFile.setFileData(contents);
-			}else{
-				throw new IllegalArgumentException("Resource file id was empty");
-			}
-		}else if(file.getUri() != null){
-			// Use URI to upload file
-			byte[] contents = contentsOfUri(file.getUri());
-			if(contents != null){
-				putFile.setFileData(contents);
-			}else{
-				throw new IllegalArgumentException("Uri was empty");
-			}
-		}else if(file.getFileData() != null){
-			// Use file data (raw bytes) to upload file
-			putFile.setFileData(file.getFileData());
-		}else{
-			throw new IllegalArgumentException("The SdlFile to upload does " +
-					"not specify its resourceId, Uri, or file data");
-		}
+        if (file.getResourceId() > 0) {
+            // Use resource id to upload file
+            byte[] contents = contentsOfResource(file.getResourceId());
+            if (contents != null) {
+                putFile.setFileData(contents);
+            } else {
+                throw new IllegalArgumentException("Resource file id was empty");
+            }
+        } else if (file.getUri() != null) {
+            // Use URI to upload file
+            byte[] contents = contentsOfUri(file.getUri());
+            if (contents != null) {
+                putFile.setFileData(contents);
+            } else {
+                throw new IllegalArgumentException("Uri was empty");
+            }
+        } else if (file.getFileData() != null) {
+            // Use file data (raw bytes) to upload file
+            putFile.setFileData(file.getFileData());
+        } else {
+            throw new IllegalArgumentException("The SdlFile to upload does " +
+                    "not specify its resourceId, Uri, or file data");
+        }
 
-		if(file.getType() != null){
-			putFile.setFileType(file.getType());
-		}
-		putFile.setPersistentFile(file.isPersistent());
+        if (file.getType() != null) {
+            putFile.setFileType(file.getType());
+        }
+        putFile.setPersistentFile(file.isPersistent());
 
-		return putFile;
-	}
+        return putFile;
+    }
 
-	/**
-	 * Helper method to take resource files and turn them into byte arrays
-	 * @param resource Resource file id
-	 * @return Resulting byte array
-	 */
-	private byte[] contentsOfResource(int resource) {
-		InputStream is = null;
-		try {
-			is = context.get().getResources().openRawResource(resource);
-			return contentsOfInputStream(is);
-		} catch (Resources.NotFoundException e) {
-			DebugTool.logError(TAG, "Can't read from resource", e);
-			return null;
-		} finally {
-			if (is != null) {
-				try {
-					is.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
+    /**
+     * Helper method to take resource files and turn them into byte arrays
+     *
+     * @param resource Resource file id
+     * @return Resulting byte array
+     */
+    private byte[] contentsOfResource(int resource) {
+        InputStream is = null;
+        try {
+            is = context.get().getResources().openRawResource(resource);
+            return contentsOfInputStream(is);
+        } catch (Resources.NotFoundException e) {
+            DebugTool.logError(TAG, "Can't read from resource", e);
+            return null;
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
 
-	/**
-	 * Helper method to take Uri and turn it into byte array
-	 * @param uri Uri for desired file
-	 * @return Resulting byte array
-	 */
-	private byte[] contentsOfUri(Uri uri){
-		InputStream is = null;
-		try{
-			is = context.get().getContentResolver().openInputStream(uri);
-			return contentsOfInputStream(is);
-		} catch (IOException e){
-			DebugTool.logError(TAG, "Can't read from Uri", e);
-			return null;
-		} finally {
-			if (is != null) {
-				try {
-					is.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
+    /**
+     * Helper method to take Uri and turn it into byte array
+     *
+     * @param uri Uri for desired file
+     * @return Resulting byte array
+     */
+    private byte[] contentsOfUri(Uri uri) {
+        InputStream is = null;
+        try {
+            is = context.get().getContentResolver().openInputStream(uri);
+            return contentsOfInputStream(is);
+        } catch (IOException e) {
+            DebugTool.logError(TAG, "Can't read from Uri", e);
+            return null;
+        } finally {
+            if (is != null) {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
index afceb04a1..c8887d4e1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlArtwork.java
@@ -45,20 +45,22 @@ import com.smartdevicelink.util.DebugTool;
 /**
  * A class that extends SdlFile, representing artwork (JPEG, PNG, or BMP) to be uploaded to core
  */
-public class SdlArtwork extends SdlFile implements Cloneable{
+public class SdlArtwork extends SdlFile implements Cloneable {
     private boolean isTemplate;
     private Image imageRPC;
 
     /**
      * Creates a new instance of SdlArtwork
      */
-    public SdlArtwork() {}
+    public SdlArtwork() {
+    }
 
     /**
      * Creates a new instance of SdlArtwork
-     * @param fileName a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
-     * @param fileType a FileType enum value representing the type of the file
-     * @param id an int value representing the android resource id of the file
+     *
+     * @param fileName       a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
+     * @param fileType       a FileType enum value representing the type of the file
+     * @param id             an int value representing the android resource id of the file
      * @param persistentFile a boolean value that indicates if the file is meant to persist between sessions / ignition cycles
      */
     public SdlArtwork(String fileName, @NonNull FileType fileType, int id, boolean persistentFile) {
@@ -67,9 +69,10 @@ public class SdlArtwork extends SdlFile implements Cloneable{
 
     /**
      * Creates a new instance of SdlArtwork
-     * @param fileName a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
-     * @param fileType a FileType enum value representing the type of the file
-     * @param uri a URI value representing a file's location. Currently, it only supports local files
+     *
+     * @param fileName       a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
+     * @param fileType       a FileType enum value representing the type of the file
+     * @param uri            a URI value representing a file's location. Currently, it only supports local files
      * @param persistentFile a boolean value that indicates if the file is meant to persist between sessions / ignition cycles
      */
     public SdlArtwork(String fileName, @NonNull FileType fileType, Uri uri, boolean persistentFile) {
@@ -78,9 +81,10 @@ public class SdlArtwork extends SdlFile implements Cloneable{
 
     /**
      * Creates a new instance of SdlArtwork
-     * @param fileName a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
-     * @param fileType a FileType enum value representing the type of the file
-     * @param data a byte array representing the data of the file
+     *
+     * @param fileName       a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
+     * @param fileType       a FileType enum value representing the type of the file
+     * @param data           a byte array representing the data of the file
      * @param persistentFile a boolean value that indicates if the file is meant to persist between sessions / ignition cycles
      */
     public SdlArtwork(String fileName, @NonNull FileType fileType, byte[] data, boolean persistentFile) {
@@ -89,6 +93,7 @@ public class SdlArtwork extends SdlFile implements Cloneable{
 
     /**
      * Creates a new instance of SdlArtwork
+     *
      * @param staticIconName a StaticIconName enum value representing the name of a static file that comes pre-shipped with the head unit
      */
     public SdlArtwork(@NonNull StaticIconName staticIconName) {
@@ -97,32 +102,35 @@ public class SdlArtwork extends SdlFile implements Cloneable{
 
     /**
      * Sets whether this SdlArtwork is a template image whose coloring should be decided by the HMI
+     *
      * @param isTemplate boolean that tells whether this SdlArtwork is a template image
      */
-    public void setTemplateImage(boolean isTemplate){
+    public void setTemplateImage(boolean isTemplate) {
         this.isTemplate = isTemplate;
     }
 
     /**
      * Gets whether this SdlArtwork is a template image whose coloring should be decided by the HMI
+     *
      * @return boolean that tells whether this SdlArtwork is a template image
      */
-    public boolean isTemplateImage(){
+    public boolean isTemplateImage() {
         return isTemplate;
     }
 
     @Override
     public void setType(@NonNull FileType fileType) {
-        if(fileType == null || fileType.equals(FileType.GRAPHIC_JPEG) || fileType.equals(FileType.GRAPHIC_PNG)
-                || fileType.equals(FileType.GRAPHIC_BMP)){
+        if (fileType == null || fileType.equals(FileType.GRAPHIC_JPEG) || fileType.equals(FileType.GRAPHIC_PNG)
+                || fileType.equals(FileType.GRAPHIC_BMP)) {
             super.setType(fileType);
-        }else{
+        } else {
             throw new IllegalArgumentException("Only JPEG, PNG, and BMP image types are supported.");
         }
     }
 
     /**
      * Gets the Image RPC representing this artwork. Generally for use internally, you should instead pass an artwork to a Screen Manager method
+     *
      * @return The Image RPC representing this artwork
      */
     public Image getImageRPC() {
@@ -132,7 +140,7 @@ public class SdlArtwork extends SdlFile implements Cloneable{
         return imageRPC;
     }
 
-    private Image createImageRPC(){
+    private Image createImageRPC() {
         Image image;
         if (isStaticIcon()) {
             image = new Image(getName(), ImageType.STATIC);
@@ -146,18 +154,19 @@ public class SdlArtwork extends SdlFile implements Cloneable{
 
     /**
      * Creates a deep copy of the object
+     *
      * @return deep copy of the object, null if an exception occurred
      */
     @Override
     public SdlArtwork clone() {
-        try{
+        try {
             SdlArtwork artwork = (SdlArtwork) super.clone();
-            if(artwork != null){
-               artwork.imageRPC = artwork.createImageRPC();
+            if (artwork != null) {
+                artwork.imageRPC = artwork.createImageRPC();
             }
             return artwork;
         } catch (CloneNotSupportedException e) {
-            if(DebugTool.isDebugEnabled()){
+            if (DebugTool.isDebugEnabled()) {
                 throw new RuntimeException("Clone not supported by super class");
             }
         }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
index 2b978c790..13c7d3119 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/filetypes/SdlFile.java
@@ -46,7 +46,7 @@ import java.util.Arrays;
 /**
  * A class representing data to be uploaded to core
  */
-public class SdlFile{
+public class SdlFile {
     private String fileName;
     private int id = -1;
     private Uri uri;
@@ -61,16 +61,18 @@ public class SdlFile{
     /**
      * Creates a new instance of SdlFile
      */
-    public SdlFile() { }
+    public SdlFile() {
+    }
 
     /**
      * Creates a new instance of SdlFile
-     * @param fileName a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
-     * @param fileType a FileType enum value representing the type of the file
-     * @param id an int value representing the android resource id of the file
+     *
+     * @param fileName       a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
+     * @param fileType       a FileType enum value representing the type of the file
+     * @param id             an int value representing the android resource id of the file
      * @param persistentFile a boolean value that indicates if the file is meant to persist between sessions / ignition cycles
      */
-    public SdlFile(String fileName, @NonNull FileType fileType, int id, boolean persistentFile){
+    public SdlFile(String fileName, @NonNull FileType fileType, int id, boolean persistentFile) {
         setName(fileName);
         setType(fileType);
         setResourceId(id);
@@ -79,12 +81,13 @@ public class SdlFile{
 
     /**
      * Creates a new instance of SdlFile
-     * @param fileName a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
-     * @param fileType a FileType enum value representing the type of the file
-     * @param uri a URI value representing a file's location. Currently, it only supports local files
+     *
+     * @param fileName       a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
+     * @param fileType       a FileType enum value representing the type of the file
+     * @param uri            a URI value representing a file's location. Currently, it only supports local files
      * @param persistentFile a boolean value that indicates if the file is meant to persist between sessions / ignition cycles
      */
-    public SdlFile(String fileName, @NonNull FileType fileType, Uri uri, boolean persistentFile){
+    public SdlFile(String fileName, @NonNull FileType fileType, Uri uri, boolean persistentFile) {
         setName(fileName);
         setType(fileType);
         setUri(uri);
@@ -93,12 +96,13 @@ public class SdlFile{
 
     /**
      * Creates a new instance of SdlFile
-     * @param fileName a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
-     * @param fileType a FileType enum value representing the type of the file
-     * @param data a byte array representing the data of the file
+     *
+     * @param fileName       a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
+     * @param fileType       a FileType enum value representing the type of the file
+     * @param data           a byte array representing the data of the file
      * @param persistentFile a boolean value that indicates if the file is meant to persist between sessions / ignition cycles
      */
-    public SdlFile(String fileName, @NonNull FileType fileType, byte[] data, boolean persistentFile){
+    public SdlFile(String fileName, @NonNull FileType fileType, byte[] data, boolean persistentFile) {
         setName(fileName);
         setType(fileType);
         setFileData(data);
@@ -107,9 +111,10 @@ public class SdlFile{
 
     /**
      * Creates a new instance of SdlFile
+     *
      * @param staticIconName a StaticIconName enum value representing the name of a static file that comes pre-shipped with the head unit
      */
-    public SdlFile(@NonNull StaticIconName staticIconName){
+    public SdlFile(@NonNull StaticIconName staticIconName) {
         setName(staticIconName.toString());
         setFileData(staticIconName.toString().getBytes());
         setPersistent(false);
@@ -118,6 +123,7 @@ public class SdlFile{
 
     /**
      * Sets the name of the file
+     *
      * @param fileName a String value representing the name that will be used to store the file in the head unit. You can pass null if you want the library to auto generate the name
      */
     public void setName(String fileName) {
@@ -138,17 +144,19 @@ public class SdlFile{
 
     /**
      * Gets the name of the file
+     *
      * @return a String value representing the name that will be used to store the file in the head unit
      */
-    public String getName(){
+    public String getName() {
         return fileName;
     }
 
     /**
      * Sets the resource ID of the file
+     *
      * @param id an int value representing the android resource id of the file
      */
-    public void setResourceId(int id){
+    public void setResourceId(int id) {
         this.id = id;
         if (shouldAutoGenerateName) {
             this.fileName = generateFileNameFromResourceId(id);
@@ -157,17 +165,19 @@ public class SdlFile{
 
     /**
      * Gets the resource id of the file
+     *
      * @return an int value representing the android resource id of the file
      */
-    public int getResourceId(){
+    public int getResourceId() {
         return id;
     }
 
     /**
      * Sets the uri of the file
+     *
      * @param uri a URI value representing a file's location. Currently, it only supports local files
      */
-    public void setUri(Uri uri){
+    public void setUri(Uri uri) {
         this.uri = uri;
         if (shouldAutoGenerateName && uri != null) {
             this.fileName = generateFileNameFromUri(uri);
@@ -176,17 +186,19 @@ public class SdlFile{
 
     /**
      * Gets the uri of the file
+     *
      * @return a URI value representing a file's location. Currently, it only supports local files
      */
-    public Uri getUri(){
+    public Uri getUri() {
         return uri;
     }
 
     /**
      * Sets the byte array that represents the content of the file
+     *
      * @param data a byte array representing the data of the file
      */
-    public void setFileData(byte[] data){
+    public void setFileData(byte[] data) {
         this.fileData = data;
         if (shouldAutoGenerateName && data != null) {
             this.fileName = generateFileNameFromData(data);
@@ -195,46 +207,52 @@ public class SdlFile{
 
     /**
      * Gets the byte array that represents the content of the file
+     *
      * @return a byte array representing the data of the file
      */
-    public byte[] getFileData(){
+    public byte[] getFileData() {
         return fileData;
     }
 
     /**
      * Sets the type of the file
+     *
      * @param fileType a FileType enum value representing the type of the file
      */
-    public void setType(@NonNull FileType fileType){
+    public void setType(@NonNull FileType fileType) {
         this.fileType = fileType;
     }
 
     /**
      * Gets the type of the file
+     *
      * @return a FileType enum value representing the type of the file
      */
-    public FileType getType(){
+    public FileType getType() {
         return fileType;
     }
 
     /**
      * Sets whether the file should persist between sessions / ignition cycles
+     *
      * @param persistentFile a boolean value that indicates if the file is meant to persist between sessions / ignition cycles
      */
-    public void setPersistent(boolean persistentFile){
+    public void setPersistent(boolean persistentFile) {
         this.persistentFile = persistentFile;
     }
 
     /**
      * Gets whether the file should persist between sessions / ignition cycles
+     *
      * @return a boolean value that indicates if the file is meant to persist between sessions / ignition cycles
      */
-    public boolean isPersistent(){
+    public boolean isPersistent() {
         return this.persistentFile;
     }
 
     /**
      * Sets the the name of the static file. Static files comes pre-shipped with the head unit
+     *
      * @param staticIcon a StaticIconName enum value representing the name of a static file that comes pre-shipped with the head unit
      */
     public void setStaticIcon(boolean staticIcon) {
@@ -243,6 +261,7 @@ public class SdlFile{
 
     /**
      * Gets the the name of the static file. Static files comes pre-shipped with the head unit
+     *
      * @return a StaticIconName enum value representing the name of a static file that comes pre-shipped with the head unit
      */
     public boolean isStaticIcon() {
@@ -251,6 +270,7 @@ public class SdlFile{
 
     /**
      * Gets the overwrite property for an SdlFile by default its set to false
+     *
      * @return a boolean value that indicates if a file can be overwritten.
      */
     public boolean getOverwrite() {
@@ -259,6 +279,7 @@ public class SdlFile{
 
     /**
      * Sets the overwrite property for an SdlFile by default its set to false
+     *
      * @param overwrite a boolean value that indicates if a file can be overwritten
      */
     public void setOverwrite(boolean overwrite) {
@@ -267,6 +288,7 @@ public class SdlFile{
 
     /**
      * Generates a file name from data by hashing the data and returning the last 16 chars
+     *
      * @param data a byte array representing the data of the file
      * @return a String value representing the name that will be used to store the file in the head unit
      */
@@ -294,6 +316,7 @@ public class SdlFile{
 
     /**
      * Generates a file name from uri by hashing the uri string and returning the last 16 chars
+     *
      * @param uri a URI value representing a file's location
      * @return a String value representing the name that will be used to store the file in the head unit
      */
@@ -303,6 +326,7 @@ public class SdlFile{
 
     /**
      * Generates a file name from resourceId by hashing the id and returning the last 16 chars
+     *
      * @param id an int value representing the android resource id of the file
      * @return a String value representing the name that will be used to store the file in the head unit
      */
@@ -312,6 +336,7 @@ public class SdlFile{
 
     /**
      * Used to compile hashcode for SdlFile for use to compare in overridden equals method
+     *
      * @return Custom hashcode of SdlFile variables
      */
     @Override
@@ -329,6 +354,7 @@ public class SdlFile{
 
     /**
      * Uses our custom hashCode for SdlFile objects
+     *
      * @param o - The object to compare
      * @return boolean of whether the objects are the same or not
      */
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
index e5aee6c3e..e53ec106c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -36,7 +36,6 @@ import android.content.Context;
 
 import androidx.annotation.RestrictTo;
 
-import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.exception.SdlExceptionCause;
 import com.smartdevicelink.protocol.ISdlServiceListener;
@@ -44,6 +43,7 @@ import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.security.SdlSecurityBase;
+import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.streaming.video.VideoStreamingParameters;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
@@ -56,7 +56,6 @@ import java.lang.ref.WeakReference;
 /**
  * The lifecycle manager creates a central point for all SDL session logic to converge. It should only be used by
  * the library itself. Usage outside the library is not permitted and will not be protected for in the future.
- *
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class LifecycleManager extends BaseLifecycleManager {
@@ -78,7 +77,7 @@ public class LifecycleManager extends BaseLifecycleManager {
         } else if (_transportConfig != null && _transportConfig.getTransportType().equals(TransportType.TCP)) {
             this.session = new SdlSession(sdlSessionListener, (TCPTransportConfig) _transportConfig);
         } else {
-            DebugTool.logError(TAG,"Unable to create session for transport type");
+            DebugTool.logError(TAG, "Unable to create session for transport type");
         }
     }
 
@@ -109,7 +108,7 @@ public class LifecycleManager extends BaseLifecycleManager {
         super.setSdlSecurityStaticVars();
 
         Context context = null;
-        if(this.contextWeakReference != null){
+        if (this.contextWeakReference != null) {
             context = contextWeakReference.get();
         }
         SdlSecurityBase.setContext(context);
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java
index e10693770..4ca79c893 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManager.java
@@ -35,7 +35,7 @@ import com.smartdevicelink.managers.ISdl;
 
 /**
  * <strong>SystemCapabilityManager</strong> <br>
- *
+ * <p>
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
  */
 public class SystemCapabilityManager extends BaseSystemCapabilityManager {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java
index df1db5475..c5c932a8e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java
@@ -39,7 +39,7 @@ import java.lang.annotation.RetentionPolicy;
 
 /**
  * <strong>LockScreenConfig</strong> <br>
- *
+ * <p>
  * This is set during SdlManager instantiation. <br>
  *
  * <li> enable - if false, don't worry about the other parameters. You are responsible for creating and managing a lockscreen.
@@ -60,136 +60,152 @@ import java.lang.annotation.RetentionPolicy;
  */
 public class LockScreenConfig {
 
-	private final boolean enable;
-	private boolean deviceLogo;
-	private boolean enableDismissGesture;
-	private int backgroundColor, appIconInt, customViewInt;
-	private @DisplayMode int displayMode;
-
-	/**
-	 * DISPLAY_MODE_NEVER - The lock screen should never be shown. This should almost always mean that you will build your own lock screen.
-	 * DISPLAY_MODE_REQUIRED_ONLY - The lock screen should only be shown when it is required by the head unit.
-	 * DISPLAY_MODE_OPTIONAL_OR_REQUIRED - The lock screen should be shown when required by the head unit or when the head unit says that
-	 * its optional, but *not* in other cases, such as before the user has interacted with your app on the head unit.
-	 * DISPLAY_MODE_ALWAYS - The lock screen should always be shown after connection.
-	 */
-	@IntDef({DISPLAY_MODE_NEVER, DISPLAY_MODE_REQUIRED_ONLY, DISPLAY_MODE_OPTIONAL_OR_REQUIRED, DISPLAY_MODE_ALWAYS})
-	@Retention(RetentionPolicy.SOURCE)
-	public @interface DisplayMode {}
-	public static final int DISPLAY_MODE_NEVER = 0;
-	public static final int DISPLAY_MODE_REQUIRED_ONLY = 1;
-	public static final int DISPLAY_MODE_OPTIONAL_OR_REQUIRED = 2;
-	public static final int DISPLAY_MODE_ALWAYS = 3;
-
-	public LockScreenConfig(){
-		// set default values
-		this.enable = true;
-		this.deviceLogo = true;
-		this.displayMode = DISPLAY_MODE_REQUIRED_ONLY;
-		this.enableDismissGesture = true;
-	}
-
-	/**
-	 * Set the resource int of the background color. Colors should define colors in your Colors.xml file
-	 * @param resourceColor resource int of the color
-	 */
-	public void setBackgroundColor(int resourceColor){
-		this.backgroundColor = resourceColor;
-	}
-
-	/**
-	 * Gets the int reference to the custom lock screen background color
-	 * @return the color reference
-	 */
-	public int getBackgroundColor() {
-		return backgroundColor;
-	}
-
-	/**
-	 * int of the drawable icon.
-	 * @param appIconInt the drawable of the icon to be displayed on the lock screen
-	 */
-	public void setAppIcon(int appIconInt) {
-		this.appIconInt = appIconInt;
-	}
-
-	/**
-	 * Gets the resource reference of the icon to be displayed on the lock screen
-	 * @return the icon reference
-	 */
-	public int getAppIcon() {
-		return appIconInt;
-	}
-
-	/**
-	 * Sets the reference to the custom layout to be used for the lock screen <br>
-	 * <strong>If set, the color and icon setters will be ignored</strong>
-	 * @param customViewInt the layout
-	 */
-	public void setCustomView(int customViewInt) {
-		this.customViewInt = customViewInt;
-	}
-
-	/**
-	 * Gets the reference to the custom lockscreen layout to be used
-	 * @return the layout reference
-	 */
-	public int getCustomView() {
-		return customViewInt;
-	}
-
-	/**
-	 * Whether or not to show the device's logo on the default lock screen <br>
-	 * The logo will come from the connected hardware, if set by the manufacturer <br>
-	 * If using a Custom View, this will be ignored.
-	 * @param deviceLogo - boolean
-	 */
-	public void showDeviceLogo(boolean deviceLogo) {
-		this.deviceLogo = deviceLogo;
-	}
-
-	/**
-	 * Get whether or not the device's Logo is shown on the default lock screen <br>
-	 * The logo will come from the connected hardware, if set by the manufacturer <br>
-	 * @return deviceLogo - boolean
-	 */
-	public boolean isDeviceLogoEnabled() {
-		return deviceLogo;
-	}
-
-
-	/**
-	 * Set the displayMode to be used
-	 * @param displayMode - Describes when the lock screen will be displayed. Defaults to `DISPLAY_MODE_REQUIRED_ONLY`.
-	 */
-	public void setDisplayMode(@DisplayMode int displayMode){
-		this.displayMode = displayMode;
-	}
-
-	/**
-	 * Get the displayMode to be used
-	 * @return displayMode - Describes when the lock screen will be displayed. Defaults to `DISPLAY_MODE_REQUIRED_ONLY`.
-	 */
-	public @DisplayMode int getDisplayMode(){
-		return this.displayMode;
-	}
-
-	/**
-	 * If true, then the lock screen can be dismissed with a downward swipe on compatible head units.
-	 * Requires a connection of SDL 6.0+ and the head unit to enable the feature. Defaults to true.
-	 * @param enableDismissGesture - enable or disable this feature
-	 */
-	public void enableDismissGesture(boolean enableDismissGesture) {
-		this.enableDismissGesture = enableDismissGesture;
-	}
-
-	/**
-	 * If true, then the lock screen can be dismissed with a downward swipe on compatible head units.
-	 * Requires a connection of SDL 6.0+ and the head unit to enable the feature. Defaults to true.
-	 * @return - whether or not this is enabled or disabled
-	 */
-	public boolean enableDismissGesture() {
-		return enableDismissGesture;
-	}
+    private final boolean enable;
+    private boolean deviceLogo;
+    private boolean enableDismissGesture;
+    private int backgroundColor, appIconInt, customViewInt;
+    private @DisplayMode
+    int displayMode;
+
+    /**
+     * DISPLAY_MODE_NEVER - The lock screen should never be shown. This should almost always mean that you will build your own lock screen.
+     * DISPLAY_MODE_REQUIRED_ONLY - The lock screen should only be shown when it is required by the head unit.
+     * DISPLAY_MODE_OPTIONAL_OR_REQUIRED - The lock screen should be shown when required by the head unit or when the head unit says that
+     * its optional, but *not* in other cases, such as before the user has interacted with your app on the head unit.
+     * DISPLAY_MODE_ALWAYS - The lock screen should always be shown after connection.
+     */
+    @IntDef({DISPLAY_MODE_NEVER, DISPLAY_MODE_REQUIRED_ONLY, DISPLAY_MODE_OPTIONAL_OR_REQUIRED, DISPLAY_MODE_ALWAYS})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface DisplayMode {
+    }
+
+    public static final int DISPLAY_MODE_NEVER = 0;
+    public static final int DISPLAY_MODE_REQUIRED_ONLY = 1;
+    public static final int DISPLAY_MODE_OPTIONAL_OR_REQUIRED = 2;
+    public static final int DISPLAY_MODE_ALWAYS = 3;
+
+    public LockScreenConfig() {
+        // set default values
+        this.enable = true;
+        this.deviceLogo = true;
+        this.displayMode = DISPLAY_MODE_REQUIRED_ONLY;
+        this.enableDismissGesture = true;
+    }
+
+    /**
+     * Set the resource int of the background color. Colors should define colors in your Colors.xml file
+     *
+     * @param resourceColor resource int of the color
+     */
+    public void setBackgroundColor(int resourceColor) {
+        this.backgroundColor = resourceColor;
+    }
+
+    /**
+     * Gets the int reference to the custom lock screen background color
+     *
+     * @return the color reference
+     */
+    public int getBackgroundColor() {
+        return backgroundColor;
+    }
+
+    /**
+     * int of the drawable icon.
+     *
+     * @param appIconInt the drawable of the icon to be displayed on the lock screen
+     */
+    public void setAppIcon(int appIconInt) {
+        this.appIconInt = appIconInt;
+    }
+
+    /**
+     * Gets the resource reference of the icon to be displayed on the lock screen
+     *
+     * @return the icon reference
+     */
+    public int getAppIcon() {
+        return appIconInt;
+    }
+
+    /**
+     * Sets the reference to the custom layout to be used for the lock screen <br>
+     * <strong>If set, the color and icon setters will be ignored</strong>
+     *
+     * @param customViewInt the layout
+     */
+    public void setCustomView(int customViewInt) {
+        this.customViewInt = customViewInt;
+    }
+
+    /**
+     * Gets the reference to the custom lockscreen layout to be used
+     *
+     * @return the layout reference
+     */
+    public int getCustomView() {
+        return customViewInt;
+    }
+
+    /**
+     * Whether or not to show the device's logo on the default lock screen <br>
+     * The logo will come from the connected hardware, if set by the manufacturer <br>
+     * If using a Custom View, this will be ignored.
+     *
+     * @param deviceLogo - boolean
+     */
+    public void showDeviceLogo(boolean deviceLogo) {
+        this.deviceLogo = deviceLogo;
+    }
+
+    /**
+     * Get whether or not the device's Logo is shown on the default lock screen <br>
+     * The logo will come from the connected hardware, if set by the manufacturer <br>
+     *
+     * @return deviceLogo - boolean
+     */
+    public boolean isDeviceLogoEnabled() {
+        return deviceLogo;
+    }
+
+
+    /**
+     * Set the displayMode to be used
+     *
+     * @param displayMode - Describes when the lock screen will be displayed. Defaults to `DISPLAY_MODE_REQUIRED_ONLY`.
+     */
+    public void setDisplayMode(@DisplayMode int displayMode) {
+        this.displayMode = displayMode;
+    }
+
+    /**
+     * Get the displayMode to be used
+     *
+     * @return displayMode - Describes when the lock screen will be displayed. Defaults to `DISPLAY_MODE_REQUIRED_ONLY`.
+     */
+    public @DisplayMode
+    int getDisplayMode() {
+        return this.displayMode;
+    }
+
+    /**
+     * If true, then the lock screen can be dismissed with a downward swipe on compatible head units.
+     * Requires a connection of SDL 6.0+ and the head unit to enable the feature. Defaults to true.
+     *
+     * @param enableDismissGesture - enable or disable this feature
+     */
+    public void enableDismissGesture(boolean enableDismissGesture) {
+        this.enableDismissGesture = enableDismissGesture;
+    }
+
+    /**
+     * If true, then the lock screen can be dismissed with a downward swipe on compatible head units.
+     * Requires a connection of SDL 6.0+ and the head unit to enable the feature. Defaults to true.
+     *
+     * @return - whether or not this is enabled or disabled
+     */
+    public boolean enableDismissGesture() {
+        return enableDismissGesture;
+    }
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java
index 603435800..4ab38fd92 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java
@@ -18,9 +18,8 @@ import java.security.NoSuchAlgorithmException;
 
 /**
  * <strong>LockScreenDeviceIconManager</strong> <br>
- *
+ * <p>
  * The LockScreenDeviceIconManager handles the logic of caching and retrieving cached lock screen icons <br>
- *
  */
 class LockScreenDeviceIconManager {
 
@@ -31,6 +30,7 @@ class LockScreenDeviceIconManager {
 
     interface OnIconRetrievedListener {
         void onImageRetrieved(Bitmap icon);
+
         void onError(String info);
     }
 
@@ -43,7 +43,8 @@ class LockScreenDeviceIconManager {
     /**
      * Will try to return a lock screen icon either from cache or downloaded
      * if it fails iconRetrievedListener.OnError will be called with corresponding error message
-     * @param iconURL url that the lock screen icon is downloaded from
+     *
+     * @param iconURL               url that the lock screen icon is downloaded from
      * @param iconRetrievedListener an interface that will implement onIconReceived and OnError methods
      */
     void retrieveIcon(String iconURL, OnIconRetrievedListener iconRetrievedListener) {
@@ -87,6 +88,7 @@ class LockScreenDeviceIconManager {
 
     /**
      * Will decide if a cached icon is available and up to date
+     *
      * @param iconUrl url will be hashed and used to look up last updated timestamp in shared preferences
      * @return True when icon details are in shared preferences and less than 30 days old, False if icon details are too old or not found
      */
@@ -94,7 +96,7 @@ class LockScreenDeviceIconManager {
         String iconHash = getMD5HashFromIconUrl(iconUrl);
         SharedPreferences sharedPref = this.context.getSharedPreferences(SDL_DEVICE_STATUS_SHARED_PREFS, Context.MODE_PRIVATE);
         String iconLastUpdatedTime = sharedPref.getString(iconHash, null);
-        if(iconLastUpdatedTime == null) {
+        if (iconLastUpdatedTime == null) {
             DebugTool.logInfo(TAG, "No Icon Details Found In Shared Preferences");
             return false;
         } else {
@@ -117,7 +119,8 @@ class LockScreenDeviceIconManager {
 
     /**
      * Will try to save icon to cache
-     * @param icon the icon bitmap that should be saved to cache
+     *
+     * @param icon    the icon bitmap that should be saved to cache
      * @param iconUrl the url where the icon was retrieved will be hashed and used for file and file details lookup
      */
     private void saveFileToCache(Bitmap icon, String iconUrl) {
@@ -142,6 +145,7 @@ class LockScreenDeviceIconManager {
 
     /**
      * Will try to retrieve icon bitmap from cached directory
+     *
      * @param iconUrl the url where the icon was retrieved will be hashed and used to look up file location
      * @return bitmap of device icon or null if it fails to find the icon or read from shared preferences
      */
@@ -152,7 +156,7 @@ class LockScreenDeviceIconManager {
 
         if (iconLastUpdatedTime != null) {
             Bitmap cachedIcon = BitmapFactory.decodeFile(this.context.getCacheDir() + "/" + STORED_ICON_DIRECTORY_PATH + "/" + iconHash);
-            if(cachedIcon == null) {
+            if (cachedIcon == null) {
                 DebugTool.logError(TAG, "Failed to get Bitmap from decoding file cache");
                 clearIconDirectory();
                 sharedPref.edit().clear().commit();
@@ -169,6 +173,7 @@ class LockScreenDeviceIconManager {
     /**
      * Will write information about the icon to shared preferences
      * icon information will have a look up key of the hashed icon url and the current timestamp to indicated when the icon was last updated.
+     *
      * @param iconHash the url where the icon was retrieved will be hashed and used lookup key
      */
     private void writeDeviceIconParametersToSharedPreferences(String iconHash) {
@@ -180,6 +185,7 @@ class LockScreenDeviceIconManager {
 
     /**
      * Create an MD5 hash of the icon url for file storage and lookup/shared preferences look up
+     *
      * @param iconUrl the url where the icon was retrieved
      * @return MD5 hash of the icon URL
      */
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
index 56975a390..105396fa2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
@@ -42,9 +42,9 @@ import androidx.annotation.RestrictTo;
 
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
+import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
-import com.smartdevicelink.managers.ISdl;
 import com.smartdevicelink.proxy.rpc.OnDriverDistraction;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.OnSystemRequest;
@@ -60,346 +60,343 @@ import java.lang.ref.WeakReference;
 
 /**
  * <strong>LockscreenManager</strong> <br>
- *
+ * <p>
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
- *
+ * <p>
  * The LockscreenManager handles the logic of showing and hiding the lock screen. <br>
- *
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class LockScreenManager extends BaseSubManager {
 
-	private static final String TAG = "LockScreenManager";
-	private final WeakReference<Context> context;
-	HMILevel hmiLevel;
-	private OnRPCNotificationListener systemRequestListener, ddListener, hmiListener;
-	private String deviceIconUrl;
-	boolean driverDistStatus;
+    private static final String TAG = "LockScreenManager";
+    private final WeakReference<Context> context;
+    HMILevel hmiLevel;
+    private OnRPCNotificationListener systemRequestListener, ddListener, hmiListener;
+    private String deviceIconUrl;
+    boolean driverDistStatus;
     boolean mIsLockscreenDismissible;
     boolean enableDismissGesture;
     final boolean lockScreenEnabled;
     final boolean deviceLogoEnabled;
-	private volatile boolean isApplicationForegrounded;
-	private androidx.lifecycle.LifecycleObserver lifecycleObserver;
-	final int lockScreenIcon;
+    private volatile boolean isApplicationForegrounded;
+    private androidx.lifecycle.LifecycleObserver lifecycleObserver;
+    final int lockScreenIcon;
     final int lockScreenColor;
     final int customView;
     int displayMode;
-	Bitmap deviceLogo;
-	private boolean mLockScreenHasBeenDismissed, lockscreenDismissReceiverRegistered, receivedFirstDDNotification;
-	private String mLockscreenWarningMsg;
-	private BroadcastReceiver mLockscreenDismissedReceiver;
-	private final LockScreenDeviceIconManager mLockScreenDeviceIconManager;
-
-	public LockScreenManager(LockScreenConfig lockScreenConfig, Context context, ISdl internalInterface){
-
-		super(internalInterface);
-		this.context = new WeakReference<>(context);
-		this.mLockScreenDeviceIconManager = new LockScreenDeviceIconManager(context);
-
-
-		// set initial class variables
-		hmiLevel = HMILevel.HMI_NONE;
-		driverDistStatus = false;
-
-		// setup the manager
-		lockScreenIcon = lockScreenConfig.getAppIcon();
-		lockScreenColor = lockScreenConfig.getBackgroundColor();
-		customView = lockScreenConfig.getCustomView();
-		lockScreenEnabled = lockScreenConfig.getDisplayMode() != LockScreenConfig.DISPLAY_MODE_NEVER;
-		deviceLogoEnabled = lockScreenConfig.isDeviceLogoEnabled();
-		displayMode = lockScreenConfig.getDisplayMode();
-		enableDismissGesture = lockScreenConfig.enableDismissGesture();
-
-		// for older projects that may not use DisplayMode. This can
-		// be removed in a major release
-		if (!lockScreenEnabled){
-			displayMode = LockScreenConfig.DISPLAY_MODE_NEVER;
-		}
-
-		setupListeners();
-	}
-
-	@Override
-	public void start(CompletionListener listener) {
-		transitionToState(READY);
-		super.start(listener);
-	}
-
-	@Override
-	public void dispose(){
-		// send broadcast to close lock screen if open
-		if (context.get() != null) {
-			context.get().sendBroadcast(new Intent(SDLLockScreenActivity.CLOSE_LOCK_SCREEN_ACTION));
-			try {
-				context.get().unregisterReceiver(mLockscreenDismissedReceiver);
-				lockscreenDismissReceiverRegistered = false;
-			} catch (IllegalArgumentException e) {
-				//do nothing
-			}
-		}
-		// remove listeners
-		internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
-		internalInterface.removeOnRPCNotificationListener(FunctionID.ON_DRIVER_DISTRACTION, ddListener);
-		if (deviceLogoEnabled) {
-			internalInterface.removeOnRPCNotificationListener(FunctionID.ON_SYSTEM_REQUEST, systemRequestListener);
-		}
-		deviceLogo = null;
-		deviceIconUrl = null;
-
-		try {
-			if (androidx.lifecycle.ProcessLifecycleOwner.get() != null && lifecycleObserver != null) {
-				androidx.lifecycle.ProcessLifecycleOwner.get().getLifecycle().removeObserver(lifecycleObserver);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		lifecycleObserver = null;
-
-		isApplicationForegrounded = false;
-
-		super.dispose();
-	}
-
-	////
-	// SETUP
-	////
-
-	/**
-	 * Adds 3 listeners that help determine whether or not a lockscreen should be shown.
-	 * This will change the variables that we hold in the manager to the newest values and then
-	 * usually call launchLockScreenActivity
-	 *
-	 * 1. ON_HMI_STATUS
-	 * 2. ON_DRIVER_DISTRACTION
-	 * 3. ON_SYSTEM_REQUEST (used for device Icon Downloading)
-	 */
-	private void setupListeners(){
-		// add hmi listener
-		hmiListener = new OnRPCNotificationListener() {
-			@Override
-			public void onNotified(RPCNotification notification) {
-				OnHMIStatus onHMIStatus = (OnHMIStatus)notification;
-				if (onHMIStatus.getWindowID() != null && onHMIStatus.getWindowID() != PredefinedWindows.DEFAULT_WINDOW.getValue()) {
-					return;
-				}
-				hmiLevel = onHMIStatus.getHmiLevel();
-				launchLockScreenActivity();
-			}
-		};
-		internalInterface.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
-
-		// set up driver distraction listener
-		ddListener = new OnRPCNotificationListener() {
-			@Override
-			public void onNotified(RPCNotification notification) {
-				// do something with the status
-				if (notification != null) {
-					OnDriverDistraction ddState = (OnDriverDistraction) notification;
-					Boolean isDismissible = ddState.getLockscreenDismissibility();
-					DebugTool.logInfo(TAG, "Lock screen dismissible: "+ isDismissible);
-					if (isDismissible != null) {
-						// both of these conditions must be met to be able to dismiss lockscreen
-						if (isDismissible && enableDismissGesture){
-							mIsLockscreenDismissible = true;
-
-							// if DisplayMode is set to ALWAYS, it will be shown before the first DD notification.
-							// If this is our first DD notification and we are in ALWAYS mode, send another intent to
-							// enable the dismissal
-							if (!receivedFirstDDNotification && displayMode == LockScreenConfig.DISPLAY_MODE_ALWAYS ){
-								launchLockScreenActivity();
-							}
-						}
-					}
-					mLockscreenWarningMsg = ddState.getLockscreenWarningMessage();
-
-					if (ddState.getState() == DriverDistractionState.DD_ON){
-						// launch lock screen
-						driverDistStatus = true;
-						launchLockScreenActivity();
-					}else{
-						// close lock screen
-						driverDistStatus = false;
-						closeLockScreenActivity();
-					}
-					receivedFirstDDNotification = true;
-				}
-			}
-		};
-		internalInterface.addOnRPCNotificationListener(FunctionID.ON_DRIVER_DISTRACTION, ddListener);
-
-		// set up system request listener
-		if (deviceLogoEnabled) {
-			systemRequestListener = new OnRPCNotificationListener() {
-				@Override
-				public void onNotified(RPCNotification notification) {
-					// do something with the status
-					final OnSystemRequest msg = (OnSystemRequest) notification;
-					if (msg.getRequestType() == RequestType.LOCK_SCREEN_ICON_URL &&
-							msg.getUrl() != null) {
-						// send intent to activity to download icon from core
-						deviceIconUrl = msg.getUrl().replace("http://", "https://");
-						downloadDeviceIcon(deviceIconUrl);
-					}
-				}
-			};
-			internalInterface.addOnRPCNotificationListener(FunctionID.ON_SYSTEM_REQUEST, systemRequestListener);
-		}
-
-		// Set up listener for Application Foreground / Background events
-		try {
-			lifecycleObserver = new androidx.lifecycle.LifecycleObserver() {
-				@androidx.lifecycle.OnLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_START)
-				public void onMoveToForeground() {
-					isApplicationForegrounded = true;
-					launchLockScreenActivity();
-				}
-
-				@androidx.lifecycle.OnLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_STOP)
-				public void onMoveToBackground() {
-					isApplicationForegrounded = false;
-				}
-			};
-
-			if (androidx.lifecycle.ProcessLifecycleOwner.get() != null) {
-				androidx.lifecycle.ProcessLifecycleOwner.get().getLifecycle().addObserver(lifecycleObserver);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-		mLockscreenDismissedReceiver = new BroadcastReceiver() {
-			@Override
-			public void onReceive(Context context, Intent intent) {
-				if (SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED.equals(intent.getAction())) {
-					mLockScreenHasBeenDismissed = true;
-				}
-			}
-		};
-	}
-
-	////
-	// LAUNCH LOCK SCREEN LOGIC
-	////
-
-	/**
-	 * 1. Check if user wants us to manage lock screen
-	 * 2. If so, get the HMI level and LockScreenStatus from the method below
-	 * 3. Build intent and start the SDLLockScreenActivity
-	 *
-	 * X. If the status is set to OFF, Send broadcast to close lock screen if it is open
-	 */
-	private void launchLockScreenActivity(){
-		// If the user has dismissed the lockscreen for this run or has disabled it, do not show it
-		if (mLockScreenHasBeenDismissed || displayMode == LockScreenConfig.DISPLAY_MODE_NEVER) {
-			return;
-		}
-		// intent to open SDLLockScreenActivity
-		// pass in icon, background color, and custom view
-		if (lockScreenEnabled && isApplicationForegrounded && context.get() != null) {
-			if (mIsLockscreenDismissible && !lockscreenDismissReceiverRegistered) {
-				context.get().registerReceiver(mLockscreenDismissedReceiver, new IntentFilter(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED));
-				lockscreenDismissReceiverRegistered = true;
-
-			}
-			LockScreenStatus status = getLockScreenStatus();
-			if (status == LockScreenStatus.REQUIRED || displayMode == LockScreenConfig.DISPLAY_MODE_ALWAYS || (status == LockScreenStatus.OPTIONAL && displayMode == LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED)) {
-				Intent showLockScreenIntent = new Intent(context.get(), SDLLockScreenActivity.class);
-				showLockScreenIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-				// Extra parameters for customization of the lock screen view
-				showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_ICON_EXTRA, lockScreenIcon);
-				showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_COLOR_EXTRA, lockScreenColor);
-				showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_CUSTOM_VIEW_EXTRA, customView);
-				showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_EXTRA, deviceLogoEnabled);
-				showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_BITMAP, deviceLogo);
-				showLockScreenIntent.putExtra(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSIBLE, mIsLockscreenDismissible);
-				showLockScreenIntent.putExtra(SDLLockScreenActivity.KEY_LOCKSCREEN_WARNING_MSG, mLockscreenWarningMsg);
-				context.get().startActivity(showLockScreenIntent);
-			} else if (status == LockScreenStatus.OFF) {
-				closeLockScreenActivity();
-			}
-		}
-	}
-
-	private void closeLockScreenActivity(){
-
-		if (displayMode == LockScreenConfig.DISPLAY_MODE_ALWAYS){
-			return;
-		}
-
-		if (context.get() != null) {
-			LockScreenStatus status = getLockScreenStatus();
-			if (status == LockScreenStatus.OFF || (status == LockScreenStatus.OPTIONAL && displayMode != LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED)) {
-				context.get().sendBroadcast(new Intent(SDLLockScreenActivity.CLOSE_LOCK_SCREEN_ACTION));
-			}
-		}
-	}
-
-	////
-	// HELPERS
-	////
-
-	/**
-	 * Step through some logic to determine if we need to show the lock screen or not
-	 * This function is usually triggered on some sort of notification.
-	 *
-	 * @return Whether or not the Lock Screen is required
-	 */
-	synchronized LockScreenStatus getLockScreenStatus() {
-
-		if ((hmiLevel == null) || (hmiLevel.equals(HMILevel.HMI_NONE))) {
-			return LockScreenStatus.OFF;
-		}
-		else if ( hmiLevel.equals(HMILevel.HMI_BACKGROUND)) {
-			if (!driverDistStatus) {
-				//we don't have driver distraction, lock screen is entirely based on if user is using the app on the head unit
-				return LockScreenStatus.OFF;
-			} else {
-				return LockScreenStatus.REQUIRED;
-			}
-		}
-		else if ((hmiLevel.equals(HMILevel.HMI_FULL)) || (hmiLevel.equals(HMILevel.HMI_LIMITED))) {
-			if (!driverDistStatus) {
-				return LockScreenStatus.OPTIONAL;
-			} else {
-				return LockScreenStatus.REQUIRED;
-			}
-		}
-		return LockScreenStatus.OFF;
-	}
-
-	private void downloadDeviceIcon(final String url){
-
-		if (deviceLogo != null || context.get() == null){
-			return;
-		}
-
-		new Thread(new Runnable(){
-			@Override
-			public void run(){
-				mLockScreenDeviceIconManager.retrieveIcon(url, new LockScreenDeviceIconManager.OnIconRetrievedListener() {
-					@Override
-					public void onImageRetrieved(Bitmap icon) {
-						deviceLogo = icon;
-						if(deviceLogo != null) {
-							Intent intent = new Intent(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_DOWNLOADED);
-							intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_EXTRA, deviceLogoEnabled);
-							intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_BITMAP, deviceLogo);
-							if (context.get() != null) {
-								context.get().sendBroadcast(intent);
-							}
-						}
-					}
-
-					@Override
-					public void onError(String info) {
-						DebugTool.logError(TAG, info);
-					}
-				});
-			}
-		}).start();
-	}
+    Bitmap deviceLogo;
+    private boolean mLockScreenHasBeenDismissed, lockscreenDismissReceiverRegistered, receivedFirstDDNotification;
+    private String mLockscreenWarningMsg;
+    private BroadcastReceiver mLockscreenDismissedReceiver;
+    private final LockScreenDeviceIconManager mLockScreenDeviceIconManager;
+
+    public LockScreenManager(LockScreenConfig lockScreenConfig, Context context, ISdl internalInterface) {
+
+        super(internalInterface);
+        this.context = new WeakReference<>(context);
+        this.mLockScreenDeviceIconManager = new LockScreenDeviceIconManager(context);
+
+
+        // set initial class variables
+        hmiLevel = HMILevel.HMI_NONE;
+        driverDistStatus = false;
+
+        // setup the manager
+        lockScreenIcon = lockScreenConfig.getAppIcon();
+        lockScreenColor = lockScreenConfig.getBackgroundColor();
+        customView = lockScreenConfig.getCustomView();
+        lockScreenEnabled = lockScreenConfig.getDisplayMode() != LockScreenConfig.DISPLAY_MODE_NEVER;
+        deviceLogoEnabled = lockScreenConfig.isDeviceLogoEnabled();
+        displayMode = lockScreenConfig.getDisplayMode();
+        enableDismissGesture = lockScreenConfig.enableDismissGesture();
+
+        // for older projects that may not use DisplayMode. This can
+        // be removed in a major release
+        if (!lockScreenEnabled) {
+            displayMode = LockScreenConfig.DISPLAY_MODE_NEVER;
+        }
+
+        setupListeners();
+    }
+
+    @Override
+    public void start(CompletionListener listener) {
+        transitionToState(READY);
+        super.start(listener);
+    }
+
+    @Override
+    public void dispose() {
+        // send broadcast to close lock screen if open
+        if (context.get() != null) {
+            context.get().sendBroadcast(new Intent(SDLLockScreenActivity.CLOSE_LOCK_SCREEN_ACTION));
+            try {
+                context.get().unregisterReceiver(mLockscreenDismissedReceiver);
+                lockscreenDismissReceiverRegistered = false;
+            } catch (IllegalArgumentException e) {
+                //do nothing
+            }
+        }
+        // remove listeners
+        internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
+        internalInterface.removeOnRPCNotificationListener(FunctionID.ON_DRIVER_DISTRACTION, ddListener);
+        if (deviceLogoEnabled) {
+            internalInterface.removeOnRPCNotificationListener(FunctionID.ON_SYSTEM_REQUEST, systemRequestListener);
+        }
+        deviceLogo = null;
+        deviceIconUrl = null;
+
+        try {
+            if (androidx.lifecycle.ProcessLifecycleOwner.get() != null && lifecycleObserver != null) {
+                androidx.lifecycle.ProcessLifecycleOwner.get().getLifecycle().removeObserver(lifecycleObserver);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        lifecycleObserver = null;
+
+        isApplicationForegrounded = false;
+
+        super.dispose();
+    }
+
+    ////
+    // SETUP
+    ////
+
+    /**
+     * Adds 3 listeners that help determine whether or not a lockscreen should be shown.
+     * This will change the variables that we hold in the manager to the newest values and then
+     * usually call launchLockScreenActivity
+     * <p>
+     * 1. ON_HMI_STATUS
+     * 2. ON_DRIVER_DISTRACTION
+     * 3. ON_SYSTEM_REQUEST (used for device Icon Downloading)
+     */
+    private void setupListeners() {
+        // add hmi listener
+        hmiListener = new OnRPCNotificationListener() {
+            @Override
+            public void onNotified(RPCNotification notification) {
+                OnHMIStatus onHMIStatus = (OnHMIStatus) notification;
+                if (onHMIStatus.getWindowID() != null && onHMIStatus.getWindowID() != PredefinedWindows.DEFAULT_WINDOW.getValue()) {
+                    return;
+                }
+                hmiLevel = onHMIStatus.getHmiLevel();
+                launchLockScreenActivity();
+            }
+        };
+        internalInterface.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
+
+        // set up driver distraction listener
+        ddListener = new OnRPCNotificationListener() {
+            @Override
+            public void onNotified(RPCNotification notification) {
+                // do something with the status
+                if (notification != null) {
+                    OnDriverDistraction ddState = (OnDriverDistraction) notification;
+                    Boolean isDismissible = ddState.getLockscreenDismissibility();
+                    DebugTool.logInfo(TAG, "Lock screen dismissible: " + isDismissible);
+                    if (isDismissible != null) {
+                        // both of these conditions must be met to be able to dismiss lockscreen
+                        if (isDismissible && enableDismissGesture) {
+                            mIsLockscreenDismissible = true;
+
+                            // if DisplayMode is set to ALWAYS, it will be shown before the first DD notification.
+                            // If this is our first DD notification and we are in ALWAYS mode, send another intent to
+                            // enable the dismissal
+                            if (!receivedFirstDDNotification && displayMode == LockScreenConfig.DISPLAY_MODE_ALWAYS) {
+                                launchLockScreenActivity();
+                            }
+                        }
+                    }
+                    mLockscreenWarningMsg = ddState.getLockscreenWarningMessage();
+
+                    if (ddState.getState() == DriverDistractionState.DD_ON) {
+                        // launch lock screen
+                        driverDistStatus = true;
+                        launchLockScreenActivity();
+                    } else {
+                        // close lock screen
+                        driverDistStatus = false;
+                        closeLockScreenActivity();
+                    }
+                    receivedFirstDDNotification = true;
+                }
+            }
+        };
+        internalInterface.addOnRPCNotificationListener(FunctionID.ON_DRIVER_DISTRACTION, ddListener);
+
+        // set up system request listener
+        if (deviceLogoEnabled) {
+            systemRequestListener = new OnRPCNotificationListener() {
+                @Override
+                public void onNotified(RPCNotification notification) {
+                    // do something with the status
+                    final OnSystemRequest msg = (OnSystemRequest) notification;
+                    if (msg.getRequestType() == RequestType.LOCK_SCREEN_ICON_URL &&
+                            msg.getUrl() != null) {
+                        // send intent to activity to download icon from core
+                        deviceIconUrl = msg.getUrl().replace("http://", "https://");
+                        downloadDeviceIcon(deviceIconUrl);
+                    }
+                }
+            };
+            internalInterface.addOnRPCNotificationListener(FunctionID.ON_SYSTEM_REQUEST, systemRequestListener);
+        }
+
+        // Set up listener for Application Foreground / Background events
+        try {
+            lifecycleObserver = new androidx.lifecycle.LifecycleObserver() {
+                @androidx.lifecycle.OnLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_START)
+                public void onMoveToForeground() {
+                    isApplicationForegrounded = true;
+                    launchLockScreenActivity();
+                }
+
+                @androidx.lifecycle.OnLifecycleEvent(androidx.lifecycle.Lifecycle.Event.ON_STOP)
+                public void onMoveToBackground() {
+                    isApplicationForegrounded = false;
+                }
+            };
+
+            if (androidx.lifecycle.ProcessLifecycleOwner.get() != null) {
+                androidx.lifecycle.ProcessLifecycleOwner.get().getLifecycle().addObserver(lifecycleObserver);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        mLockscreenDismissedReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED.equals(intent.getAction())) {
+                    mLockScreenHasBeenDismissed = true;
+                }
+            }
+        };
+    }
+
+    ////
+    // LAUNCH LOCK SCREEN LOGIC
+    ////
+
+    /**
+     * 1. Check if user wants us to manage lock screen
+     * 2. If so, get the HMI level and LockScreenStatus from the method below
+     * 3. Build intent and start the SDLLockScreenActivity
+     * <p>
+     * X. If the status is set to OFF, Send broadcast to close lock screen if it is open
+     */
+    private void launchLockScreenActivity() {
+        // If the user has dismissed the lockscreen for this run or has disabled it, do not show it
+        if (mLockScreenHasBeenDismissed || displayMode == LockScreenConfig.DISPLAY_MODE_NEVER) {
+            return;
+        }
+        // intent to open SDLLockScreenActivity
+        // pass in icon, background color, and custom view
+        if (lockScreenEnabled && isApplicationForegrounded && context.get() != null) {
+            if (mIsLockscreenDismissible && !lockscreenDismissReceiverRegistered) {
+                context.get().registerReceiver(mLockscreenDismissedReceiver, new IntentFilter(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSED));
+                lockscreenDismissReceiverRegistered = true;
+
+            }
+            LockScreenStatus status = getLockScreenStatus();
+            if (status == LockScreenStatus.REQUIRED || displayMode == LockScreenConfig.DISPLAY_MODE_ALWAYS || (status == LockScreenStatus.OPTIONAL && displayMode == LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED)) {
+                Intent showLockScreenIntent = new Intent(context.get(), SDLLockScreenActivity.class);
+                showLockScreenIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+                // Extra parameters for customization of the lock screen view
+                showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_ICON_EXTRA, lockScreenIcon);
+                showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_COLOR_EXTRA, lockScreenColor);
+                showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_CUSTOM_VIEW_EXTRA, customView);
+                showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_EXTRA, deviceLogoEnabled);
+                showLockScreenIntent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_BITMAP, deviceLogo);
+                showLockScreenIntent.putExtra(SDLLockScreenActivity.KEY_LOCKSCREEN_DISMISSIBLE, mIsLockscreenDismissible);
+                showLockScreenIntent.putExtra(SDLLockScreenActivity.KEY_LOCKSCREEN_WARNING_MSG, mLockscreenWarningMsg);
+                context.get().startActivity(showLockScreenIntent);
+            } else if (status == LockScreenStatus.OFF) {
+                closeLockScreenActivity();
+            }
+        }
+    }
+
+    private void closeLockScreenActivity() {
+
+        if (displayMode == LockScreenConfig.DISPLAY_MODE_ALWAYS) {
+            return;
+        }
+
+        if (context.get() != null) {
+            LockScreenStatus status = getLockScreenStatus();
+            if (status == LockScreenStatus.OFF || (status == LockScreenStatus.OPTIONAL && displayMode != LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED)) {
+                context.get().sendBroadcast(new Intent(SDLLockScreenActivity.CLOSE_LOCK_SCREEN_ACTION));
+            }
+        }
+    }
+
+    ////
+    // HELPERS
+    ////
+
+    /**
+     * Step through some logic to determine if we need to show the lock screen or not
+     * This function is usually triggered on some sort of notification.
+     *
+     * @return Whether or not the Lock Screen is required
+     */
+    synchronized LockScreenStatus getLockScreenStatus() {
+
+        if ((hmiLevel == null) || (hmiLevel.equals(HMILevel.HMI_NONE))) {
+            return LockScreenStatus.OFF;
+        } else if (hmiLevel.equals(HMILevel.HMI_BACKGROUND)) {
+            if (!driverDistStatus) {
+                //we don't have driver distraction, lock screen is entirely based on if user is using the app on the head unit
+                return LockScreenStatus.OFF;
+            } else {
+                return LockScreenStatus.REQUIRED;
+            }
+        } else if ((hmiLevel.equals(HMILevel.HMI_FULL)) || (hmiLevel.equals(HMILevel.HMI_LIMITED))) {
+            if (!driverDistStatus) {
+                return LockScreenStatus.OPTIONAL;
+            } else {
+                return LockScreenStatus.REQUIRED;
+            }
+        }
+        return LockScreenStatus.OFF;
+    }
+
+    private void downloadDeviceIcon(final String url) {
+
+        if (deviceLogo != null || context.get() == null) {
+            return;
+        }
+
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                mLockScreenDeviceIconManager.retrieveIcon(url, new LockScreenDeviceIconManager.OnIconRetrievedListener() {
+                    @Override
+                    public void onImageRetrieved(Bitmap icon) {
+                        deviceLogo = icon;
+                        if (deviceLogo != null) {
+                            Intent intent = new Intent(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_DOWNLOADED);
+                            intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_EXTRA, deviceLogoEnabled);
+                            intent.putExtra(SDLLockScreenActivity.LOCKSCREEN_DEVICE_LOGO_BITMAP, deviceLogo);
+                            if (context.get() != null) {
+                                context.get().sendBroadcast(intent);
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onError(String info) {
+                        DebugTool.logError(TAG, info);
+                    }
+                });
+            }
+        }).start();
+    }
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java
index 3007d081a..e74e9db6e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java
@@ -55,229 +55,231 @@ import com.smartdevicelink.R;
 
 public class SDLLockScreenActivity extends Activity {
 
-	public static final String LOCKSCREEN_COLOR_EXTRA = "LOCKSCREEN_COLOR_EXTRA";
-	public static final String LOCKSCREEN_ICON_EXTRA = "LOCKSCREEN_ICON_EXTRA";
-	public static final String LOCKSCREEN_DEVICE_LOGO_EXTRA = "LOCKSCREEN_DEVICE_LOGO_EXTRA";
-	public static final String LOCKSCREEN_DEVICE_LOGO_BITMAP = "LOCKSCREEN_DEVICE_LOGO_BITMAP";
-	public static final String LOCKSCREEN_CUSTOM_VIEW_EXTRA = "LOCKSCREEN_CUSTOM_VIEW_EXTRA";
-	public static final String LOCKSCREEN_DEVICE_LOGO_DOWNLOADED = "LOCKSCREEN_DEVICE_LOGO_DOWNLOADED";
-	public static final String CLOSE_LOCK_SCREEN_ACTION = "CLOSE_LOCK_SCREEN";
-	public static final String KEY_LOCKSCREEN_DISMISSED = "KEY_LOCKSCREEN_DISMISSED";
-	public static final String KEY_LOCKSCREEN_DISMISSIBLE = "KEY_LOCKSCREEN_DISMISSIBLE";
-	public static final String KEY_LOCKSCREEN_WARNING_MSG = "KEY_LOCKSCREEN_WARNING_MSG";
-	private static final int MIN_SWIPE_DISTANCE = 200;
-	private boolean mIsDismissible;
-	private GestureDetector mGestureDetector;
-	private int backgroundColor = Color.parseColor("#394e60");
-	private boolean useWhiteIconAndTextColor;
-
-
-	private final BroadcastReceiver lockScreenBroadcastReceiver = new BroadcastReceiver() {
-		@Override
-		public void onReceive(Context context, Intent intent) {
-			if (intent != null){
-				String action = intent.getAction();
-				if (action != null){
-					if (action.equalsIgnoreCase(CLOSE_LOCK_SCREEN_ACTION)){
-						finish();
-					} else if (action.equalsIgnoreCase(LOCKSCREEN_DEVICE_LOGO_DOWNLOADED)){
-						boolean deviceLogoEnabled = intent.getBooleanExtra(LOCKSCREEN_DEVICE_LOGO_EXTRA, true);
-						Bitmap deviceLogo = intent.getParcelableExtra(LOCKSCREEN_DEVICE_LOGO_BITMAP);
-						if (deviceLogoEnabled && deviceLogo != null){
-							setDeviceLogo(deviceLogo);
-						}
-					}
-				}
-			}
-		}
-	};
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-		mGestureDetector = new GestureDetector(this, new SwipeUpGestureListener());
-		// set any parameters that came from the lock screen manager
-		initializeActivity(getIntent());
-
-		// create intent filter
-		IntentFilter lockscreenFilter = new IntentFilter();
-		lockscreenFilter.addAction(CLOSE_LOCK_SCREEN_ACTION);
-		lockscreenFilter.addAction(LOCKSCREEN_DEVICE_LOGO_DOWNLOADED);
-
-		// register broadcast receivers
-		registerReceiver(lockScreenBroadcastReceiver, lockscreenFilter);
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-		if (mIsDismissible) {
-			return mGestureDetector.onTouchEvent(event);
-		}
-		return super.onTouchEvent(event);
-	}
-
-	@Override
-	protected void onDestroy() {
-		unregisterReceiver(lockScreenBroadcastReceiver);
-		super.onDestroy();
-	}
-
-	@Override
-	public void onBackPressed() {
-	}
-
-	@Override
-	protected void onNewIntent(Intent intent) {
-		super.onNewIntent(intent);
-		setIntent(intent);
-		if (intent != null && intent.getBooleanExtra(KEY_LOCKSCREEN_DISMISSIBLE, false)){
-			initializeActivity(intent);
-		}
-	}
-
-	public void initializeActivity(Intent intent){
-		if (intent != null){
-			boolean deviceLogoEnabled = intent.getBooleanExtra(LOCKSCREEN_DEVICE_LOGO_EXTRA, true);
-			int customColor = intent.getIntExtra(LOCKSCREEN_COLOR_EXTRA, 0);
-			int customIcon = intent.getIntExtra(LOCKSCREEN_ICON_EXTRA, 0);
-			int customView = intent.getIntExtra(LOCKSCREEN_CUSTOM_VIEW_EXTRA, 0);
-			Bitmap deviceIcon = intent.getParcelableExtra(LOCKSCREEN_DEVICE_LOGO_BITMAP);
-			backgroundColor = (customColor != 0) ? customColor : backgroundColor;
-
-			if (customView != 0){
-				setCustomView(customView);
-			} else {
-				setContentView(R.layout.activity_sdllock_screen);
-				setBackgroundColor();
-				useWhiteIconAndTextColor = shouldUseWhiteForegroundForBackgroundColor();
-
-				// set Lock Screen Icon
-				if (customIcon != 0){
-					changeIcon(customIcon);
-				} else {
-					setSdlLogo();
-				}
-
-				if (deviceLogoEnabled && deviceIcon != null){
-					setDeviceLogo(deviceIcon);
-				}
-				mIsDismissible = intent.getBooleanExtra(KEY_LOCKSCREEN_DISMISSIBLE, false);
-				String warningMsg = intent.getStringExtra(KEY_LOCKSCREEN_WARNING_MSG);
-				if (mIsDismissible) {
-					setLockscreenWarningMessage(warningMsg);
-				} else if (!useWhiteIconAndTextColor) {
-					setTextColorBlack();
-				}
-			}
-		}
-	}
-
-	/**
-	 *  Sets the lockScreen logo
-	 */
-	private void setSdlLogo() {
-		ImageView lockScreen_iv = findViewById(R.id.lockscreen_image);
-		Drawable sdlIcon = getResources().getDrawable(R.drawable.sdl_lockscreen_icon);
-		// Checks color contrast and determines if the logo should be black or white
-		if (useWhiteIconAndTextColor) {
-			int color = Color.parseColor("#ffffff");
-
-			int red = (color & 0xFF0000) / 0xFFFF;
-			int green = (color & 0xFF00) / 0xFF;
-			int blue = color & 0xFF;
-
-			float[] matrix = {0, 0, 0, 0, red,
-					0, 0, 0, 0, green,
-					0, 0, 0, 0, blue,
-					0, 0, 0, 1, 0};
-
-			ColorFilter colorFilter = new ColorMatrixColorFilter(matrix);
-			sdlIcon.setColorFilter(colorFilter);
-		}
-		lockScreen_iv.setImageDrawable(sdlIcon);
-	}
-
-	/**
-	 * Changes the text color to white on the lockScreen
-	 */
-	private void setTextColorBlack() {
-		TextView tv = findViewById(R.id.lockscreen_text);
-		tv.setTextColor(Color.parseColor("#000000"));
-	}
-
-	/**
-	 *  Calculates the contrast of the background to determine if the Icon and Text color
-	 *  should be white or black
-	 * @return True if Background and Icon should be white, False if black
-	 */
-	private boolean shouldUseWhiteForegroundForBackgroundColor() {
-		float r = Color.red(backgroundColor) / 255f;
-		float b = Color.blue(backgroundColor) / 255f;
-		float g = Color.green(backgroundColor) / 255f;
-
-		// http://stackoverflow.com/a/3943023
-		r = (r <= 0.3928f) ? (r / 12.92f) : (float) Math.pow(((r + 0.055f) / 1.055f), 2.4f);
-		g = (g <= 0.3928f) ? (g / 12.92f) : (float) Math.pow(((g + 0.055f) / 1.055f), 2.4f);
-		b = (b <= 0.3928f) ? (b / 12.92f) : (float) Math.pow(((b + 0.055f) / 1.055f), 2.4f);
-
-		float luminescence = 0.2126f * r + 0.7152f * g + 0.0722f * b;
-		return luminescence <= 0.179;
-	}
-
-	/**
-	 * Sets the color of the background
-	 * Will use default color if not set in LockScreenConfig
-	 */
-	private void setBackgroundColor() {
-		RelativeLayout layout = findViewById(R.id.lockscreen_relative_layout);
-		layout.setBackgroundColor(backgroundColor);
-	}
-
-	/**
-	 * Used to change LockScreen default Icon to customIcon set in LockScreenConfig
-	 * @param customIcon
-	 */
-	private void changeIcon(int customIcon) {
-		ImageView lockScreen_iv = findViewById(R.id.lockscreen_image);
-		lockScreen_iv.setVisibility(View.GONE);
-
-		ImageView lockScreenCustom_iv = findViewById(R.id.appIcon);
-		lockScreenCustom_iv.setVisibility(View.VISIBLE);
-		lockScreenCustom_iv.setBackgroundResource(customIcon);
-	}
-
-	private void setDeviceLogo(Bitmap deviceLogo) {
-		ImageView device_iv = findViewById(R.id.device_image);
-		if (deviceLogo != null) {
-			device_iv.setImageBitmap(deviceLogo);
-		}
-	}
-
-	private void setLockscreenWarningMessage(String msg) {
-		TextView tv = findViewById(R.id.lockscreen_text);
-		if (tv != null) {
-			if (!useWhiteIconAndTextColor) {
-				tv.setTextColor(Color.parseColor("#000000"));
-			}
-			tv.setText(msg != null ? msg : getString(R.string.default_lockscreen_warning_message));
-		}
-	}
-
-	private void setCustomView(int customView) {
-		setContentView(customView);
-	}
-
-	private class SwipeUpGestureListener extends GestureDetector.SimpleOnGestureListener {
-		@Override
-		public boolean onFling(MotionEvent event1, MotionEvent event2,
-							   float velocityX, float velocityY) {
-			if ((event2.getY() - event1.getY()) > MIN_SWIPE_DISTANCE) {
-				sendBroadcast(new Intent(KEY_LOCKSCREEN_DISMISSED));
-				finish();
-			}
-			return true;
-		}
-	}
+    public static final String LOCKSCREEN_COLOR_EXTRA = "LOCKSCREEN_COLOR_EXTRA";
+    public static final String LOCKSCREEN_ICON_EXTRA = "LOCKSCREEN_ICON_EXTRA";
+    public static final String LOCKSCREEN_DEVICE_LOGO_EXTRA = "LOCKSCREEN_DEVICE_LOGO_EXTRA";
+    public static final String LOCKSCREEN_DEVICE_LOGO_BITMAP = "LOCKSCREEN_DEVICE_LOGO_BITMAP";
+    public static final String LOCKSCREEN_CUSTOM_VIEW_EXTRA = "LOCKSCREEN_CUSTOM_VIEW_EXTRA";
+    public static final String LOCKSCREEN_DEVICE_LOGO_DOWNLOADED = "LOCKSCREEN_DEVICE_LOGO_DOWNLOADED";
+    public static final String CLOSE_LOCK_SCREEN_ACTION = "CLOSE_LOCK_SCREEN";
+    public static final String KEY_LOCKSCREEN_DISMISSED = "KEY_LOCKSCREEN_DISMISSED";
+    public static final String KEY_LOCKSCREEN_DISMISSIBLE = "KEY_LOCKSCREEN_DISMISSIBLE";
+    public static final String KEY_LOCKSCREEN_WARNING_MSG = "KEY_LOCKSCREEN_WARNING_MSG";
+    private static final int MIN_SWIPE_DISTANCE = 200;
+    private boolean mIsDismissible;
+    private GestureDetector mGestureDetector;
+    private int backgroundColor = Color.parseColor("#394e60");
+    private boolean useWhiteIconAndTextColor;
+
+
+    private final BroadcastReceiver lockScreenBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent != null) {
+                String action = intent.getAction();
+                if (action != null) {
+                    if (action.equalsIgnoreCase(CLOSE_LOCK_SCREEN_ACTION)) {
+                        finish();
+                    } else if (action.equalsIgnoreCase(LOCKSCREEN_DEVICE_LOGO_DOWNLOADED)) {
+                        boolean deviceLogoEnabled = intent.getBooleanExtra(LOCKSCREEN_DEVICE_LOGO_EXTRA, true);
+                        Bitmap deviceLogo = intent.getParcelableExtra(LOCKSCREEN_DEVICE_LOGO_BITMAP);
+                        if (deviceLogoEnabled && deviceLogo != null) {
+                            setDeviceLogo(deviceLogo);
+                        }
+                    }
+                }
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        mGestureDetector = new GestureDetector(this, new SwipeUpGestureListener());
+        // set any parameters that came from the lock screen manager
+        initializeActivity(getIntent());
+
+        // create intent filter
+        IntentFilter lockscreenFilter = new IntentFilter();
+        lockscreenFilter.addAction(CLOSE_LOCK_SCREEN_ACTION);
+        lockscreenFilter.addAction(LOCKSCREEN_DEVICE_LOGO_DOWNLOADED);
+
+        // register broadcast receivers
+        registerReceiver(lockScreenBroadcastReceiver, lockscreenFilter);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (mIsDismissible) {
+            return mGestureDetector.onTouchEvent(event);
+        }
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    protected void onDestroy() {
+        unregisterReceiver(lockScreenBroadcastReceiver);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onBackPressed() {
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        if (intent != null && intent.getBooleanExtra(KEY_LOCKSCREEN_DISMISSIBLE, false)) {
+            initializeActivity(intent);
+        }
+    }
+
+    public void initializeActivity(Intent intent) {
+        if (intent != null) {
+            boolean deviceLogoEnabled = intent.getBooleanExtra(LOCKSCREEN_DEVICE_LOGO_EXTRA, true);
+            int customColor = intent.getIntExtra(LOCKSCREEN_COLOR_EXTRA, 0);
+            int customIcon = intent.getIntExtra(LOCKSCREEN_ICON_EXTRA, 0);
+            int customView = intent.getIntExtra(LOCKSCREEN_CUSTOM_VIEW_EXTRA, 0);
+            Bitmap deviceIcon = intent.getParcelableExtra(LOCKSCREEN_DEVICE_LOGO_BITMAP);
+            backgroundColor = (customColor != 0) ? customColor : backgroundColor;
+
+            if (customView != 0) {
+                setCustomView(customView);
+            } else {
+                setContentView(R.layout.activity_sdllock_screen);
+                setBackgroundColor();
+                useWhiteIconAndTextColor = shouldUseWhiteForegroundForBackgroundColor();
+
+                // set Lock Screen Icon
+                if (customIcon != 0) {
+                    changeIcon(customIcon);
+                } else {
+                    setSdlLogo();
+                }
+
+                if (deviceLogoEnabled && deviceIcon != null) {
+                    setDeviceLogo(deviceIcon);
+                }
+                mIsDismissible = intent.getBooleanExtra(KEY_LOCKSCREEN_DISMISSIBLE, false);
+                String warningMsg = intent.getStringExtra(KEY_LOCKSCREEN_WARNING_MSG);
+                if (mIsDismissible) {
+                    setLockscreenWarningMessage(warningMsg);
+                } else if (!useWhiteIconAndTextColor) {
+                    setTextColorBlack();
+                }
+            }
+        }
+    }
+
+    /**
+     * Sets the lockScreen logo
+     */
+    private void setSdlLogo() {
+        ImageView lockScreen_iv = findViewById(R.id.lockscreen_image);
+        Drawable sdlIcon = getResources().getDrawable(R.drawable.sdl_lockscreen_icon);
+        // Checks color contrast and determines if the logo should be black or white
+        if (useWhiteIconAndTextColor) {
+            int color = Color.parseColor("#ffffff");
+
+            int red = (color & 0xFF0000) / 0xFFFF;
+            int green = (color & 0xFF00) / 0xFF;
+            int blue = color & 0xFF;
+
+            float[] matrix = {0, 0, 0, 0, red,
+                    0, 0, 0, 0, green,
+                    0, 0, 0, 0, blue,
+                    0, 0, 0, 1, 0};
+
+            ColorFilter colorFilter = new ColorMatrixColorFilter(matrix);
+            sdlIcon.setColorFilter(colorFilter);
+        }
+        lockScreen_iv.setImageDrawable(sdlIcon);
+    }
+
+    /**
+     * Changes the text color to white on the lockScreen
+     */
+    private void setTextColorBlack() {
+        TextView tv = findViewById(R.id.lockscreen_text);
+        tv.setTextColor(Color.parseColor("#000000"));
+    }
+
+    /**
+     * Calculates the contrast of the background to determine if the Icon and Text color
+     * should be white or black
+     *
+     * @return True if Background and Icon should be white, False if black
+     */
+    private boolean shouldUseWhiteForegroundForBackgroundColor() {
+        float r = Color.red(backgroundColor) / 255f;
+        float b = Color.blue(backgroundColor) / 255f;
+        float g = Color.green(backgroundColor) / 255f;
+
+        // http://stackoverflow.com/a/3943023
+        r = (r <= 0.3928f) ? (r / 12.92f) : (float) Math.pow(((r + 0.055f) / 1.055f), 2.4f);
+        g = (g <= 0.3928f) ? (g / 12.92f) : (float) Math.pow(((g + 0.055f) / 1.055f), 2.4f);
+        b = (b <= 0.3928f) ? (b / 12.92f) : (float) Math.pow(((b + 0.055f) / 1.055f), 2.4f);
+
+        float luminescence = 0.2126f * r + 0.7152f * g + 0.0722f * b;
+        return luminescence <= 0.179;
+    }
+
+    /**
+     * Sets the color of the background
+     * Will use default color if not set in LockScreenConfig
+     */
+    private void setBackgroundColor() {
+        RelativeLayout layout = findViewById(R.id.lockscreen_relative_layout);
+        layout.setBackgroundColor(backgroundColor);
+    }
+
+    /**
+     * Used to change LockScreen default Icon to customIcon set in LockScreenConfig
+     *
+     * @param customIcon
+     */
+    private void changeIcon(int customIcon) {
+        ImageView lockScreen_iv = findViewById(R.id.lockscreen_image);
+        lockScreen_iv.setVisibility(View.GONE);
+
+        ImageView lockScreenCustom_iv = findViewById(R.id.appIcon);
+        lockScreenCustom_iv.setVisibility(View.VISIBLE);
+        lockScreenCustom_iv.setBackgroundResource(customIcon);
+    }
+
+    private void setDeviceLogo(Bitmap deviceLogo) {
+        ImageView device_iv = findViewById(R.id.device_image);
+        if (deviceLogo != null) {
+            device_iv.setImageBitmap(deviceLogo);
+        }
+    }
+
+    private void setLockscreenWarningMessage(String msg) {
+        TextView tv = findViewById(R.id.lockscreen_text);
+        if (tv != null) {
+            if (!useWhiteIconAndTextColor) {
+                tv.setTextColor(Color.parseColor("#000000"));
+            }
+            tv.setText(msg != null ? msg : getString(R.string.default_lockscreen_warning_message));
+        }
+    }
+
+    private void setCustomView(int customView) {
+        setContentView(customView);
+    }
+
+    private class SwipeUpGestureListener extends GestureDetector.SimpleOnGestureListener {
+        @Override
+        public boolean onFling(MotionEvent event1, MotionEvent event2,
+                               float velocityX, float velocityY) {
+            if ((event2.getY() - event1.getY()) > MIN_SWIPE_DISTANCE) {
+                sendBroadcast(new Intent(KEY_LOCKSCREEN_DISMISSED));
+                finish();
+            }
+            return true;
+        }
+    }
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
index 540cbbf20..2a8c892ca 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/permission/PermissionManager.java
@@ -38,13 +38,13 @@ import androidx.annotation.RestrictTo;
 import com.smartdevicelink.managers.ISdl;
 
 /**
- PermissionManager gives the developer information about what permissions are permitted in specific HMI level
- and helps developers setup listeners to be called when specific permissions become allowed.<br>
+ * PermissionManager gives the developer information about what permissions are permitted in specific HMI level
+ * and helps developers setup listeners to be called when specific permissions become allowed.<br>
+ * <p>
+ * This should be used through the {@link com.smartdevicelink.managers.SdlManager} and not be instantiated by itself
+ **/
 
- This should be used through the {@link com.smartdevicelink.managers.SdlManager} and not be instantiated by itself
-**/
-
- public class PermissionManager extends BasePermissionManager{
+public class PermissionManager extends BasePermissionManager {
 
 
     /**
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
index 00bb57628..c8fa8cd7b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
@@ -40,13 +40,13 @@ import com.smartdevicelink.managers.file.FileManager;
 
 /**
  * <strong>ScreenManager</strong> <br>
- *
+ * <p>
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
-*/
+ */
 public class ScreenManager extends BaseScreenManager {
 
-	@RestrictTo(RestrictTo.Scope.LIBRARY)
-	public ScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager) {
-		super(internalInterface, fileManager);
-	}
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public ScreenManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager) {
+        super(internalInterface, fileManager);
+    }
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
index eba3c9b2f..e4c05b441 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/SubscribeButtonManager.java
@@ -7,9 +7,8 @@ import com.smartdevicelink.managers.ISdl;
 
 /**
  * <strong>SubscribeButtonManager</strong> <br>
- *
+ * <p>
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
- *
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 class SubscribeButtonManager extends BaseSubscribeButtonManager {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
index b4154cdf0..1c665da8c 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicManager.java
@@ -43,25 +43,24 @@ import com.smartdevicelink.proxy.rpc.enums.FileType;
 
 /**
  * <strong>TextAndGraphicManager</strong> <br>
- *
+ * <p>
  * Note: This class must be accessed through the SdlManager. Do not instantiate it by itself. <br>
- *
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 class TextAndGraphicManager extends BaseTextAndGraphicManager {
 
-	TextAndGraphicManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager, @NonNull SoftButtonManager softButtonManager) {
-		super(internalInterface, fileManager, softButtonManager);
-	}
+    TextAndGraphicManager(@NonNull ISdl internalInterface, @NonNull FileManager fileManager, @NonNull SoftButtonManager softButtonManager) {
+        super(internalInterface, fileManager, softButtonManager);
+    }
 
-	@Override
-	SdlArtwork getBlankArtwork() {
-		if (blankArtwork == null) {
-			blankArtwork = new SdlArtwork();
-			blankArtwork.setType(FileType.GRAPHIC_PNG);
-			blankArtwork.setName("blankArtwork");
-			blankArtwork.setResourceId(R.drawable.transparent);
-		}
-		return blankArtwork;
-	}
+    @Override
+    SdlArtwork getBlankArtwork() {
+        if (blankArtwork == null) {
+            blankArtwork = new SdlArtwork();
+            blankArtwork.setType(FileType.GRAPHIC_PNG);
+            blankArtwork.setName("blankArtwork");
+            blankArtwork.setResourceId(R.drawable.transparent);
+        }
+        return blankArtwork;
+    }
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
index b2055c976..ef4583968 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/MenuManager.java
@@ -39,17 +39,17 @@ import com.smartdevicelink.managers.file.FileManager;
 
 /**
  * <strong>MenuManager</strong> <br>
- *
+ * <p>
  * Note: This class must be accessed through the ScreenManager via the SdlManager. Do not instantiate it by itself. <br>
- *
+ * <p>
  * The MenuManager takes MenuCell objects and creates and sends all necessary RPCs to build out a menu
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class MenuManager extends BaseMenuManager {
 
-	public MenuManager(ISdl internalInterface, FileManager fileManager) {
-		// setup
-		super(internalInterface, fileManager);
-	}
+    public MenuManager(ISdl internalInterface, FileManager fileManager) {
+        // setup
+        super(internalInterface, fileManager);
+    }
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
index 641ab189e..40e2d27d7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/screen/menu/VoiceCommandManager.java
@@ -38,17 +38,17 @@ import com.smartdevicelink.managers.ISdl;
 
 /**
  * <strong>VoiceCommandManager</strong> <br>
- *
+ * <p>
  * Note: This class must be accessed through the ScreenManager via the SdlManager. Do not instantiate it by itself. <br>
- *
+ * <p>
  * The VoiceCommandManager takes a List of VoiceCommand objects and sets them on the Head unit for you.
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class VoiceCommandManager extends BaseVoiceCommandManager {
 
-	public VoiceCommandManager(ISdl internalInterface) {
-		// setup
-		super(internalInterface);
-	}
+    public VoiceCommandManager(ISdl internalInterface) {
+        // setup
+        super(internalInterface);
+    }
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java
index 36863bc99..e17d3f3c7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java
@@ -37,7 +37,7 @@ import java.util.List;
 
 /**
  * Created on 9/22/2017.
- * 
+ * <p>
  * Manages haptic data used to render focusable areas on the HU screen.  App developers can
  * over-ride the default logic used to find focusable Views by passing their own data to
  * {@link #setHapticData(List)}
@@ -56,12 +56,11 @@ class HapticInterfaceManager extends BaseHapticInterfaceManager {
      * Sets haptic data and sends update to the HU.  To be used by app code instead of letting
      * Presentation find the Views and automatically send to HU.
      *
-     * @param hapticData
-     *          Rect data indicating "focusable" screen elements or areas
+     * @param hapticData Rect data indicating "focusable" screen elements or areas
      */
     void setHapticData(List<HapticRect> hapticData) {
         userHapticData = hapticData;
-        if(proxyHolder.get() != null) {
+        if (proxyHolder.get() != null) {
             ISdl proxy = proxyHolder.get();
             SendHapticData msg = new SendHapticData();
             msg.setHapticRectData(userHapticData);
@@ -72,12 +71,11 @@ class HapticInterfaceManager extends BaseHapticInterfaceManager {
     /**
      * Sends haptic data found by searching for focusable and clickable Views in the view hierarchy
      * to the HU.  Should be called by Presentation's OnShowListener.
-     * 
-     * @param root
-     *          the root or parent View
+     *
+     * @param root the root or parent View
      */
     void refreshHapticData(View root) {
-        if(proxyHolder.get() != null) {
+        if (proxyHolder.get() != null) {
             ISdl proxy = proxyHolder.get();
             if (userHapticData == null) {
                 List<HapticRect> hapticRects = new ArrayList<>();
@@ -108,7 +106,7 @@ class HapticInterfaceManager extends BaseHapticInterfaceManager {
             }
         }
 
-        int [] loc = new int[2];
+        int[] loc = new int[2];
         int id = 0;
         for (View view : focusables) {
             int w = view.getWidth();
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
index a8c3a74be..714005041 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
@@ -42,7 +42,6 @@ import android.view.MotionEvent;
 
 import androidx.annotation.RestrictTo;
 
-import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.encoder.VirtualDisplayEncoder;
 import com.smartdevicelink.managers.BaseSubManager;
 import com.smartdevicelink.managers.CompletionListener;
@@ -69,6 +68,7 @@ import com.smartdevicelink.proxy.rpc.enums.TouchType;
 import com.smartdevicelink.proxy.rpc.enums.VideoStreamingProtocol;
 import com.smartdevicelink.proxy.rpc.enums.VideoStreamingState;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
+import com.smartdevicelink.session.SdlSession;
 import com.smartdevicelink.streaming.AbstractPacketizer;
 import com.smartdevicelink.streaming.IStreamListener;
 import com.smartdevicelink.streaming.StreamPacketizer;
@@ -89,707 +89,720 @@ import java.util.concurrent.FutureTask;
 
 @TargetApi(19)
 public class VideoStreamManager extends BaseVideoStreamManager {
-	private static final String TAG = "VideoStreamManager";
-
-	private WeakReference<Context> context;
-	private volatile VirtualDisplayEncoder virtualDisplayEncoder;
-	private Class<? extends SdlRemoteDisplay> remoteDisplayClass = null;
-	private SdlRemoteDisplay remoteDisplay;
-	private final float[] touchScalar = {1.0f,1.0f}; //x, y
-	private HapticInterfaceManager hapticManager;
-	private SdlMotionEvent sdlMotionEvent = null;
-	private OnHMIStatus currentOnHMIStatus;
-	private final StreamingStateMachine stateMachine;
-	private VideoStreamingParameters parameters;
-	private IVideoStreamListener streamListener;
-	private boolean isTransportAvailable = false;
-	private boolean hasStarted;
-	private String vehicleMake = null;
-	private AbstractPacketizer videoPacketizer;
-
-	// INTERNAL INTERFACES
-
-	private final ISdlServiceListener serviceListener = new ISdlServiceListener() {
-		@Override
-		public void onServiceStarted(SdlSession session, SessionType type, boolean isEncrypted) {
-			if(SessionType.NAV.equals(type)){
-				if (session != null && session.getAcceptedVideoParams() != null) {
-					parameters = session.getAcceptedVideoParams();
-					VideoStreamManager.this.streamListener = startVideoStream(session.getAcceptedVideoParams(), session);
-				}
-
-				if (VideoStreamManager.this.streamListener == null) {
-					DebugTool.logError(TAG, "Error starting video stream");
-					stateMachine.transitionToState(StreamingStateMachine.ERROR);
-					return;
-				}
-				VideoStreamingCapability capability = null;
-				if (internalInterface.getSystemCapabilityManager() != null) {
-					capability = (VideoStreamingCapability) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false);
-				}
-				if(capability != null && Boolean.TRUE.equals(capability.getIsHapticSpatialDataSupported())){
-					hapticManager = new HapticInterfaceManager(internalInterface);
-				}
-				startEncoder();
-				stateMachine.transitionToState(StreamingStateMachine.STARTED);
-				hasStarted = true;
-			}
-		}
-
-		@Override
-		public void onServiceEnded(SdlSession session, SessionType type) {
-			if(SessionType.NAV.equals(type)){
-				stopVideoStream();
-				if(remoteDisplay!=null){
-					stopStreaming();
-				}
-				stateMachine.transitionToState(StreamingStateMachine.NONE);
-				transitionToState(SETTING_UP);
-			}
-		}
-
-		@Override
-		public void onServiceError(SdlSession session, SessionType type, String reason) {
-			DebugTool.logError(TAG, "Unable to start video service: " + reason);
-			stopVideoStream();
-			stateMachine.transitionToState(StreamingStateMachine.ERROR);
-			transitionToState(BaseSubManager.ERROR);
-		}
-	};
-
-	private final OnRPCNotificationListener hmiListener = new OnRPCNotificationListener() {
-		@Override
-		public void onNotified(RPCNotification notification) {
-			if(notification != null){
-				OnHMIStatus onHMIStatus = (OnHMIStatus) notification;
-				if (onHMIStatus.getWindowID() != null && onHMIStatus.getWindowID() != PredefinedWindows.DEFAULT_WINDOW.getValue()) {
-					return;
-				}
-				OnHMIStatus prevOnHMIStatus = currentOnHMIStatus;
-				currentOnHMIStatus = onHMIStatus;
-				if (!HMILevel.HMI_NONE.equals(currentOnHMIStatus.getHmiLevel()) && VideoStreamManager.this.parameters == null) {
-					getVideoStreamingParams();
-				}
-				checkState();
-				if (hasStarted && (isHMIStateVideoStreamCapable(prevOnHMIStatus)) && (!isHMIStateVideoStreamCapable(currentOnHMIStatus))) {
-					stopVideoStream();
-				}
-			}
-		}
-	};
-
-	private final OnRPCNotificationListener touchListener = new OnRPCNotificationListener() {
-		@Override
-		public void onNotified(RPCNotification notification) {
-			if(notification != null && remoteDisplay != null){
-				List<MotionEvent> motionEventList = convertTouchEvent((OnTouchEvent)notification);
-				if (motionEventList != null && !motionEventList.isEmpty()) {
-					for (MotionEvent motionEvent : motionEventList) {
-						remoteDisplay.handleMotionEvent(motionEvent);
-					}
-				}
-			}
-		}
-	};
-
-	// MANAGER APIs
-	@RestrictTo(RestrictTo.Scope.LIBRARY)
-	public VideoStreamManager(ISdl internalInterface){
-		super(internalInterface);
-
-		if(internalInterface != null && internalInterface.getRegisterAppInterfaceResponse() != null &&
-				internalInterface.getRegisterAppInterfaceResponse().getVehicleType() != null) {
-			vehicleMake = internalInterface.getRegisterAppInterfaceResponse().getVehicleType().getMake();
-		}
-		virtualDisplayEncoder = new VirtualDisplayEncoder();
-
-		// Listen for video service events
-		internalInterface.addServiceListener(SessionType.NAV, serviceListener);
-		// Take care of the touch events
-		internalInterface.addOnRPCNotificationListener(FunctionID.ON_TOUCH_EVENT, touchListener);
-		// Listen for HMILevel changes
-		internalInterface.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
-
-		stateMachine = new StreamingStateMachine();
-	}
-
-	@Override
-	public void start(CompletionListener listener) {
-		isTransportAvailable = internalInterface.isTransportForServiceAvailable(SessionType.NAV);
-		checkState();
-		super.start(listener);
-	}
-
-	private synchronized void checkState(){
-		if(this.getState() == SETTING_UP
-				&& isTransportAvailable
-				&& isHMIStateVideoStreamCapable(currentOnHMIStatus)
-				&& parameters != null){
-			stateMachine.transitionToState(StreamingStateMachine.READY);
-			transitionToState(READY);
-		}
-	}
-
-	boolean isHMIStateVideoStreamCapable(OnHMIStatus onHMIStatus) {
-		HMILevel hmiLevel = (onHMIStatus != null && onHMIStatus.getHmiLevel() != null) ? onHMIStatus.getHmiLevel() : HMILevel.HMI_NONE;
-		VideoStreamingState videoStreamingState = (onHMIStatus != null && onHMIStatus.getVideoStreamingState() != null) ? onHMIStatus.getVideoStreamingState() : VideoStreamingState.STREAMABLE;
-		return (hmiLevel.equals(HMILevel.HMI_FULL) || hmiLevel.equals(HMILevel.HMI_LIMITED)) && videoStreamingState.equals(VideoStreamingState.STREAMABLE);
-	}
-
-	private void getVideoStreamingParams(){
-		if(internalInterface.getProtocolVersion().getMajor() >= 5) {
-			if (internalInterface.getSystemCapabilityManager() != null) {
-				internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
-					@Override
-					public void onCapabilityRetrieved(Object capability) {
-						VideoStreamingParameters params = new VideoStreamingParameters();
-						params.update((VideoStreamingCapability) capability, vehicleMake);    //Streaming parameters are ready time to stream
-						VideoStreamManager.this.parameters = params;
-
-						checkState();
-
-					}
-
-					@Override
-					public void onError(String info) {
-						DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
-						stateMachine.transitionToState(StreamingStateMachine.ERROR);
-						transitionToState(ERROR);
-					}
-				}, false);
-			}
-		}else{
-			//We just use default video streaming params
-			VideoStreamingParameters params = new VideoStreamingParameters();
-			DisplayCapabilities dispCap = null;
-			if (internalInterface.getSystemCapabilityManager() != null) {
-				dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
-			}
-			if(dispCap !=null){
-				params.setResolution(dispCap.getScreenParams().getImageResolution());
-			}
-
-			this.parameters = params;
-			checkState();
-		}
-	}
-
-	/**
-	 * Starts streaming a remote display to the module if there is a connected session. This method of streaming requires the device to be on API level 19 or higher
-	 * @param context a context that can be used to create the remote display
-	 * @param remoteDisplayClass class object of the remote display. This class will be used to create an instance of the remote display and will be projected to the module
-	 * @param parameters streaming parameters to be used when streaming. If null is sent in, the default/optimized options will be used.
-	 *                   If you are unsure about what parameters to be used it is best to just send null and let the system determine what
-	 *                   works best for the currently connected module.
-	 *
-	 * @param encrypted a flag of if the stream should be encrypted. Only set if you have a supplied encryption library that the module can understand.
-	 */
-	public void startRemoteDisplayStream(Context context, Class<? extends SdlRemoteDisplay> remoteDisplayClass, VideoStreamingParameters parameters, final boolean encrypted){
-		this.context = new WeakReference<>(context);
-		this.remoteDisplayClass = remoteDisplayClass;
-		int majorProtocolVersion = internalInterface.getProtocolVersion().getMajor();
-		boolean isCapabilitySupported = internalInterface.getSystemCapabilityManager() != null && internalInterface.getSystemCapabilityManager().isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING);
-		if(majorProtocolVersion >= 5 && !isCapabilitySupported){
-			DebugTool.logError(TAG, "Video streaming not supported on this module");
-			stateMachine.transitionToState(StreamingStateMachine.ERROR);
-			return;
-		}
-		if(parameters == null){
-			if(majorProtocolVersion >= 5) {
-				if (internalInterface.getSystemCapabilityManager() != null) {
-					internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
-						@Override
-						public void onCapabilityRetrieved(Object capability) {
-							VideoStreamingParameters params = new VideoStreamingParameters();
-							params.update((VideoStreamingCapability) capability, vehicleMake);    //Streaming parameters are ready time to stream
-							startStreaming(params, encrypted);
-						}
-
-						@Override
-						public void onError(String info) {
-							stateMachine.transitionToState(StreamingStateMachine.ERROR);
-							DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
-						}
-					}, false);
-				}
-			}else{
-				//We just use default video streaming params
-				VideoStreamingParameters params = new VideoStreamingParameters();
-				DisplayCapabilities dispCap = null;
-				if (internalInterface.getSystemCapabilityManager() != null) {
-					dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
-				}
-				if(dispCap !=null){
-					params.setResolution(dispCap.getScreenParams().getImageResolution());
-				}
-				startStreaming(params, encrypted);
-			}
-		}else{
-			startStreaming(parameters, encrypted);
-		}
-	}
-
-
-	/**
-	 * Starts video service, sets up encoder, haptic manager, and remote display. Begins streaming the remote display.
-	 * @param parameters Video streaming parameters including: codec which will be used for streaming (currently, only
-	 *                    VideoStreamingCodec.H264 is accepted), height and width of the video in pixels.
-	 * @param encrypted Specify true if packets on this service have to be encrypted
-	 */
-	protected void startStreaming(VideoStreamingParameters parameters, boolean encrypted){
-		this.parameters = parameters;
-		if (!isHMIStateVideoStreamCapable(currentOnHMIStatus)) {
-			DebugTool.logError(TAG, "Cannot start video service in the current HMI status");
-			return;
-		}
-		//Start the video service
-		this.internalInterface.startVideoService(parameters, encrypted);
-	}
-
-	/**
-	 * Initializes and starts the virtual display encoder and creates the remote display
-	 */
-	private void startEncoder(){
-		try {
-			virtualDisplayEncoder.init(this.context.get(), streamListener, parameters);
-			//We are all set so we can start streaming at at this point
-			virtualDisplayEncoder.start();
-			//Encoder should be up and running
-			createRemoteDisplay(virtualDisplayEncoder.getVirtualDisplay());
-			stateMachine.transitionToState(StreamingStateMachine.STARTED);
-			hasStarted = true;
-		} catch (Exception e) {
-			stateMachine.transitionToState(StreamingStateMachine.ERROR);
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Stops streaming from the remote display. To restart, call
-	 * @see #resumeStreaming()
-	 */
-	public void stopStreaming(){
-		if(remoteDisplay!=null){
-			remoteDisplay.stop();
-		}
-		if(virtualDisplayEncoder!=null){
-			virtualDisplayEncoder.shutDown();
-		}
-		stateMachine.transitionToState(StreamingStateMachine.STOPPED);
-	}
-
-	/**
-	 * Resumes streaming after calling
-	 * @see #startRemoteDisplayStream(android.content.Context, Class, com.smartdevicelink.streaming.video.VideoStreamingParameters, boolean)
-	 * followed by a call to
-	 * @see #stopStreaming()
-	 */
-	public void resumeStreaming(){
-		if(stateMachine.getState() != StreamingStateMachine.STOPPED){
-			return;
-		}
-		startEncoder();
-	}
-
-	/**
-	 * Stops streaming, ends video streaming service and removes service listeners.
-	 */
-	@Override
-	@RestrictTo(RestrictTo.Scope.LIBRARY)
-	public void dispose(){
-		stopStreaming();
-
-		hapticManager = null;
-		remoteDisplay = null;
-		parameters = null;
-		virtualDisplayEncoder = null;
-		if (internalInterface != null) {
-			// Remove listeners
-			internalInterface.removeServiceListener(SessionType.NAV, serviceListener);
-			internalInterface.removeOnRPCNotificationListener(FunctionID.ON_TOUCH_EVENT, touchListener);
-			internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
-		}
-
-		stopVideoStream();
-
-
-		stateMachine.transitionToState(StreamingStateMachine.NONE);
-		super.dispose();
-	}
-
-	// PUBLIC METHODS FOR CHECKING STATE
-
-	/**
-	 * Check if a video service is currently active
-	 * @return boolean (true = active, false = inactive)
-	 */
-	public boolean isServiceActive(){
-		return (stateMachine.getState() == StreamingStateMachine.READY) ||
-				(stateMachine.getState() == StreamingStateMachine.STARTED) ||
-				(stateMachine.getState() == StreamingStateMachine.STOPPED);
-	}
-
-	/**
-	 * Check if video is currently streaming and visible
-	 * @return boolean (true = yes, false = no)
-	 */
-	public boolean isStreaming(){
-		return (stateMachine.getState() == StreamingStateMachine.STARTED) && (isHMIStateVideoStreamCapable(currentOnHMIStatus));
-	}
-
-	/**
-	 * Check if video streaming has been paused due to app moving to background or manually stopped
-	 * @return boolean (true = not paused, false = paused)
-	 */
-	public boolean isPaused(){
-		return (hasStarted && stateMachine.getState() == StreamingStateMachine.STOPPED) || (!isHMIStateVideoStreamCapable(currentOnHMIStatus));
-	}
-
-	/**
-	 * Gets the current video streaming state as defined in @StreamingStateMachine
-	 * @return int representing StreamingStateMachine.StreamingState
-	 */
-	public @StreamingStateMachine.StreamingState int currentVideoStreamState(){
-		return stateMachine.getState();
-	}
-
-	// HELPER METHODS
-
-	private void createRemoteDisplay(final Display disp){
-		try{
-			if (disp == null){
-				return;
-			}
-
-			// Dismiss the current presentation if the display has changed.
-			if (remoteDisplay != null && remoteDisplay.getDisplay() != disp) {
-				remoteDisplay.dismissPresentation();
-			}
-
-			FutureTask<Boolean> fTask = new FutureTask<>(new SdlRemoteDisplay.Creator(context.get(), disp, remoteDisplay, remoteDisplayClass, new SdlRemoteDisplay.Callback() {
-				@Override
-				public void onCreated(final SdlRemoteDisplay remoteDisplay) {
-					//Remote display has been created.
-					//Now is a good time to do parsing for spatial data
-					VideoStreamManager.this.remoteDisplay = remoteDisplay;
-					if (hapticManager != null) {
-						remoteDisplay.getMainView().post(new Runnable() {
-							@Override
-							public void run() {
-								hapticManager.refreshHapticData(remoteDisplay.getMainView());
-							}
-						});
-					}
-					//Get touch scalars
-					ImageResolution resolution = null;
-					if (internalInterface.getProtocolVersion().getMajor() >= 5) { //At this point we should already have the capability
-						VideoStreamingCapability capability = null;
-						if (internalInterface.getSystemCapabilityManager() != null) {
-							capability = (VideoStreamingCapability) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false);
-						}
-						if (capability != null) {
-							resolution = capability.getPreferredResolution();
-						}
-					}
-
-					if (resolution == null) { //Either the protocol version is too low to access video streaming caps, or they were null
-						DisplayCapabilities dispCap = null;
-						if (internalInterface.getSystemCapabilityManager() != null) {
-							dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
-						}
-						if (dispCap != null) {
-							resolution = (dispCap.getScreenParams().getImageResolution());
-						}
-					}
-
-					if (resolution != null) {
-						DisplayMetrics displayMetrics = new DisplayMetrics();
-						disp.getMetrics(displayMetrics);
-						createTouchScalar(resolution, displayMetrics);
-					}
-
-				}
-
-				@Override
-				public void onInvalidated(final SdlRemoteDisplay remoteDisplay) {
-					//Our view has been invalidated
-					//A good time to refresh spatial data
-					if (hapticManager != null) {
-						remoteDisplay.getMainView().post(new Runnable() {
-							@Override
-							public void run() {
-								hapticManager.refreshHapticData(remoteDisplay.getMainView());
-							}
-						});
-					}
-				}
-			}));
-			Thread showPresentation = new Thread(fTask);
-			showPresentation.setName("RmtDispThread");
-
-			showPresentation.start();
-		} catch (Exception ex) {
-			DebugTool.logError(TAG, "Unable to create Virtual Display.");
-			if(DebugTool.isDebugEnabled()){
-				ex.printStackTrace();
-			}
-		}
-	}
-
-	@Override
-	protected void onTransportUpdate(List<TransportRecord> connectedTransports, boolean audioStreamTransportAvail, boolean videoStreamTransportAvail){
-
-		isTransportAvailable = videoStreamTransportAvail;
-
-		if(internalInterface.getProtocolVersion().isNewerThan(new Version(5,1,0)) >= 0){
-			if(videoStreamTransportAvail){
-				checkState();
-			}
-		}else{
-			//The protocol version doesn't support simultaneous transports.
-			if(!videoStreamTransportAvail){
-				//If video streaming isn't available on primary transport then it is not possible to
-				//use the video streaming manager until a complete register on a transport that
-				//supports video
-				transitionToState(ERROR);
-			}
-		}
-	}
+    private static final String TAG = "VideoStreamManager";
+
+    private WeakReference<Context> context;
+    private volatile VirtualDisplayEncoder virtualDisplayEncoder;
+    private Class<? extends SdlRemoteDisplay> remoteDisplayClass = null;
+    private SdlRemoteDisplay remoteDisplay;
+    private final float[] touchScalar = {1.0f, 1.0f}; //x, y
+    private HapticInterfaceManager hapticManager;
+    private SdlMotionEvent sdlMotionEvent = null;
+    private OnHMIStatus currentOnHMIStatus;
+    private final StreamingStateMachine stateMachine;
+    private VideoStreamingParameters parameters;
+    private IVideoStreamListener streamListener;
+    private boolean isTransportAvailable = false;
+    private boolean hasStarted;
+    private String vehicleMake = null;
+    private AbstractPacketizer videoPacketizer;
+
+    // INTERNAL INTERFACES
+
+    private final ISdlServiceListener serviceListener = new ISdlServiceListener() {
+        @Override
+        public void onServiceStarted(SdlSession session, SessionType type, boolean isEncrypted) {
+            if (SessionType.NAV.equals(type)) {
+                if (session != null && session.getAcceptedVideoParams() != null) {
+                    parameters = session.getAcceptedVideoParams();
+                    VideoStreamManager.this.streamListener = startVideoStream(session.getAcceptedVideoParams(), session);
+                }
+
+                if (VideoStreamManager.this.streamListener == null) {
+                    DebugTool.logError(TAG, "Error starting video stream");
+                    stateMachine.transitionToState(StreamingStateMachine.ERROR);
+                    return;
+                }
+                VideoStreamingCapability capability = null;
+                if (internalInterface.getSystemCapabilityManager() != null) {
+                    capability = (VideoStreamingCapability) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false);
+                }
+                if (capability != null && Boolean.TRUE.equals(capability.getIsHapticSpatialDataSupported())) {
+                    hapticManager = new HapticInterfaceManager(internalInterface);
+                }
+                startEncoder();
+                stateMachine.transitionToState(StreamingStateMachine.STARTED);
+                hasStarted = true;
+            }
+        }
+
+        @Override
+        public void onServiceEnded(SdlSession session, SessionType type) {
+            if (SessionType.NAV.equals(type)) {
+                stopVideoStream();
+                if (remoteDisplay != null) {
+                    stopStreaming();
+                }
+                stateMachine.transitionToState(StreamingStateMachine.NONE);
+                transitionToState(SETTING_UP);
+            }
+        }
+
+        @Override
+        public void onServiceError(SdlSession session, SessionType type, String reason) {
+            DebugTool.logError(TAG, "Unable to start video service: " + reason);
+            stopVideoStream();
+            stateMachine.transitionToState(StreamingStateMachine.ERROR);
+            transitionToState(BaseSubManager.ERROR);
+        }
+    };
+
+    private final OnRPCNotificationListener hmiListener = new OnRPCNotificationListener() {
+        @Override
+        public void onNotified(RPCNotification notification) {
+            if (notification != null) {
+                OnHMIStatus onHMIStatus = (OnHMIStatus) notification;
+                if (onHMIStatus.getWindowID() != null && onHMIStatus.getWindowID() != PredefinedWindows.DEFAULT_WINDOW.getValue()) {
+                    return;
+                }
+                OnHMIStatus prevOnHMIStatus = currentOnHMIStatus;
+                currentOnHMIStatus = onHMIStatus;
+                if (!HMILevel.HMI_NONE.equals(currentOnHMIStatus.getHmiLevel()) && VideoStreamManager.this.parameters == null) {
+                    getVideoStreamingParams();
+                }
+                checkState();
+                if (hasStarted && (isHMIStateVideoStreamCapable(prevOnHMIStatus)) && (!isHMIStateVideoStreamCapable(currentOnHMIStatus))) {
+                    stopVideoStream();
+                }
+            }
+        }
+    };
+
+    private final OnRPCNotificationListener touchListener = new OnRPCNotificationListener() {
+        @Override
+        public void onNotified(RPCNotification notification) {
+            if (notification != null && remoteDisplay != null) {
+                List<MotionEvent> motionEventList = convertTouchEvent((OnTouchEvent) notification);
+                if (motionEventList != null && !motionEventList.isEmpty()) {
+                    for (MotionEvent motionEvent : motionEventList) {
+                        remoteDisplay.handleMotionEvent(motionEvent);
+                    }
+                }
+            }
+        }
+    };
+
+    // MANAGER APIs
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public VideoStreamManager(ISdl internalInterface) {
+        super(internalInterface);
+
+        if (internalInterface != null && internalInterface.getRegisterAppInterfaceResponse() != null &&
+                internalInterface.getRegisterAppInterfaceResponse().getVehicleType() != null) {
+            vehicleMake = internalInterface.getRegisterAppInterfaceResponse().getVehicleType().getMake();
+        }
+        virtualDisplayEncoder = new VirtualDisplayEncoder();
+
+        // Listen for video service events
+        internalInterface.addServiceListener(SessionType.NAV, serviceListener);
+        // Take care of the touch events
+        internalInterface.addOnRPCNotificationListener(FunctionID.ON_TOUCH_EVENT, touchListener);
+        // Listen for HMILevel changes
+        internalInterface.addOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
+
+        stateMachine = new StreamingStateMachine();
+    }
+
+    @Override
+    public void start(CompletionListener listener) {
+        isTransportAvailable = internalInterface.isTransportForServiceAvailable(SessionType.NAV);
+        checkState();
+        super.start(listener);
+    }
+
+    private synchronized void checkState() {
+        if (this.getState() == SETTING_UP
+                && isTransportAvailable
+                && isHMIStateVideoStreamCapable(currentOnHMIStatus)
+                && parameters != null) {
+            stateMachine.transitionToState(StreamingStateMachine.READY);
+            transitionToState(READY);
+        }
+    }
+
+    boolean isHMIStateVideoStreamCapable(OnHMIStatus onHMIStatus) {
+        HMILevel hmiLevel = (onHMIStatus != null && onHMIStatus.getHmiLevel() != null) ? onHMIStatus.getHmiLevel() : HMILevel.HMI_NONE;
+        VideoStreamingState videoStreamingState = (onHMIStatus != null && onHMIStatus.getVideoStreamingState() != null) ? onHMIStatus.getVideoStreamingState() : VideoStreamingState.STREAMABLE;
+        return (hmiLevel.equals(HMILevel.HMI_FULL) || hmiLevel.equals(HMILevel.HMI_LIMITED)) && videoStreamingState.equals(VideoStreamingState.STREAMABLE);
+    }
+
+    private void getVideoStreamingParams() {
+        if (internalInterface.getProtocolVersion().getMajor() >= 5) {
+            if (internalInterface.getSystemCapabilityManager() != null) {
+                internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
+                    @Override
+                    public void onCapabilityRetrieved(Object capability) {
+                        VideoStreamingParameters params = new VideoStreamingParameters();
+                        params.update((VideoStreamingCapability) capability, vehicleMake);    //Streaming parameters are ready time to stream
+                        VideoStreamManager.this.parameters = params;
+
+                        checkState();
+
+                    }
+
+                    @Override
+                    public void onError(String info) {
+                        DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
+                        stateMachine.transitionToState(StreamingStateMachine.ERROR);
+                        transitionToState(ERROR);
+                    }
+                }, false);
+            }
+        } else {
+            //We just use default video streaming params
+            VideoStreamingParameters params = new VideoStreamingParameters();
+            DisplayCapabilities dispCap = null;
+            if (internalInterface.getSystemCapabilityManager() != null) {
+                dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
+            }
+            if (dispCap != null) {
+                params.setResolution(dispCap.getScreenParams().getImageResolution());
+            }
+
+            this.parameters = params;
+            checkState();
+        }
+    }
+
+    /**
+     * Starts streaming a remote display to the module if there is a connected session. This method of streaming requires the device to be on API level 19 or higher
+     *
+     * @param context            a context that can be used to create the remote display
+     * @param remoteDisplayClass class object of the remote display. This class will be used to create an instance of the remote display and will be projected to the module
+     * @param parameters         streaming parameters to be used when streaming. If null is sent in, the default/optimized options will be used.
+     *                           If you are unsure about what parameters to be used it is best to just send null and let the system determine what
+     *                           works best for the currently connected module.
+     * @param encrypted          a flag of if the stream should be encrypted. Only set if you have a supplied encryption library that the module can understand.
+     */
+    public void startRemoteDisplayStream(Context context, Class<? extends SdlRemoteDisplay> remoteDisplayClass, VideoStreamingParameters parameters, final boolean encrypted) {
+        this.context = new WeakReference<>(context);
+        this.remoteDisplayClass = remoteDisplayClass;
+        int majorProtocolVersion = internalInterface.getProtocolVersion().getMajor();
+        boolean isCapabilitySupported = internalInterface.getSystemCapabilityManager() != null && internalInterface.getSystemCapabilityManager().isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING);
+        if (majorProtocolVersion >= 5 && !isCapabilitySupported) {
+            DebugTool.logError(TAG, "Video streaming not supported on this module");
+            stateMachine.transitionToState(StreamingStateMachine.ERROR);
+            return;
+        }
+        if (parameters == null) {
+            if (majorProtocolVersion >= 5) {
+                if (internalInterface.getSystemCapabilityManager() != null) {
+                    internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
+                        @Override
+                        public void onCapabilityRetrieved(Object capability) {
+                            VideoStreamingParameters params = new VideoStreamingParameters();
+                            params.update((VideoStreamingCapability) capability, vehicleMake);    //Streaming parameters are ready time to stream
+                            startStreaming(params, encrypted);
+                        }
+
+                        @Override
+                        public void onError(String info) {
+                            stateMachine.transitionToState(StreamingStateMachine.ERROR);
+                            DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
+                        }
+                    }, false);
+                }
+            } else {
+                //We just use default video streaming params
+                VideoStreamingParameters params = new VideoStreamingParameters();
+                DisplayCapabilities dispCap = null;
+                if (internalInterface.getSystemCapabilityManager() != null) {
+                    dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
+                }
+                if (dispCap != null) {
+                    params.setResolution(dispCap.getScreenParams().getImageResolution());
+                }
+                startStreaming(params, encrypted);
+            }
+        } else {
+            startStreaming(parameters, encrypted);
+        }
+    }
+
+
+    /**
+     * Starts video service, sets up encoder, haptic manager, and remote display. Begins streaming the remote display.
+     *
+     * @param parameters Video streaming parameters including: codec which will be used for streaming (currently, only
+     *                   VideoStreamingCodec.H264 is accepted), height and width of the video in pixels.
+     * @param encrypted  Specify true if packets on this service have to be encrypted
+     */
+    protected void startStreaming(VideoStreamingParameters parameters, boolean encrypted) {
+        this.parameters = parameters;
+        if (!isHMIStateVideoStreamCapable(currentOnHMIStatus)) {
+            DebugTool.logError(TAG, "Cannot start video service in the current HMI status");
+            return;
+        }
+        //Start the video service
+        this.internalInterface.startVideoService(parameters, encrypted);
+    }
+
+    /**
+     * Initializes and starts the virtual display encoder and creates the remote display
+     */
+    private void startEncoder() {
+        try {
+            virtualDisplayEncoder.init(this.context.get(), streamListener, parameters);
+            //We are all set so we can start streaming at at this point
+            virtualDisplayEncoder.start();
+            //Encoder should be up and running
+            createRemoteDisplay(virtualDisplayEncoder.getVirtualDisplay());
+            stateMachine.transitionToState(StreamingStateMachine.STARTED);
+            hasStarted = true;
+        } catch (Exception e) {
+            stateMachine.transitionToState(StreamingStateMachine.ERROR);
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Stops streaming from the remote display. To restart, call
+     *
+     * @see #resumeStreaming()
+     */
+    public void stopStreaming() {
+        if (remoteDisplay != null) {
+            remoteDisplay.stop();
+        }
+        if (virtualDisplayEncoder != null) {
+            virtualDisplayEncoder.shutDown();
+        }
+        stateMachine.transitionToState(StreamingStateMachine.STOPPED);
+    }
+
+    /**
+     * Resumes streaming after calling
+     *
+     * @see #startRemoteDisplayStream(android.content.Context, Class, com.smartdevicelink.streaming.video.VideoStreamingParameters, boolean)
+     * followed by a call to
+     * @see #stopStreaming()
+     */
+    public void resumeStreaming() {
+        if (stateMachine.getState() != StreamingStateMachine.STOPPED) {
+            return;
+        }
+        startEncoder();
+    }
+
+    /**
+     * Stops streaming, ends video streaming service and removes service listeners.
+     */
+    @Override
+    @RestrictTo(RestrictTo.Scope.LIBRARY)
+    public void dispose() {
+        stopStreaming();
+
+        hapticManager = null;
+        remoteDisplay = null;
+        parameters = null;
+        virtualDisplayEncoder = null;
+        if (internalInterface != null) {
+            // Remove listeners
+            internalInterface.removeServiceListener(SessionType.NAV, serviceListener);
+            internalInterface.removeOnRPCNotificationListener(FunctionID.ON_TOUCH_EVENT, touchListener);
+            internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
+        }
+
+        stopVideoStream();
+
+
+        stateMachine.transitionToState(StreamingStateMachine.NONE);
+        super.dispose();
+    }
+
+    // PUBLIC METHODS FOR CHECKING STATE
+
+    /**
+     * Check if a video service is currently active
+     *
+     * @return boolean (true = active, false = inactive)
+     */
+    public boolean isServiceActive() {
+        return (stateMachine.getState() == StreamingStateMachine.READY) ||
+                (stateMachine.getState() == StreamingStateMachine.STARTED) ||
+                (stateMachine.getState() == StreamingStateMachine.STOPPED);
+    }
+
+    /**
+     * Check if video is currently streaming and visible
+     *
+     * @return boolean (true = yes, false = no)
+     */
+    public boolean isStreaming() {
+        return (stateMachine.getState() == StreamingStateMachine.STARTED) && (isHMIStateVideoStreamCapable(currentOnHMIStatus));
+    }
+
+    /**
+     * Check if video streaming has been paused due to app moving to background or manually stopped
+     *
+     * @return boolean (true = not paused, false = paused)
+     */
+    public boolean isPaused() {
+        return (hasStarted && stateMachine.getState() == StreamingStateMachine.STOPPED) || (!isHMIStateVideoStreamCapable(currentOnHMIStatus));
+    }
+
+    /**
+     * Gets the current video streaming state as defined in @StreamingStateMachine
+     *
+     * @return int representing StreamingStateMachine.StreamingState
+     */
+    public @StreamingStateMachine.StreamingState
+    int currentVideoStreamState() {
+        return stateMachine.getState();
+    }
+
+    // HELPER METHODS
+
+    private void createRemoteDisplay(final Display disp) {
+        try {
+            if (disp == null) {
+                return;
+            }
+
+            // Dismiss the current presentation if the display has changed.
+            if (remoteDisplay != null && remoteDisplay.getDisplay() != disp) {
+                remoteDisplay.dismissPresentation();
+            }
+
+            FutureTask<Boolean> fTask = new FutureTask<>(new SdlRemoteDisplay.Creator(context.get(), disp, remoteDisplay, remoteDisplayClass, new SdlRemoteDisplay.Callback() {
+                @Override
+                public void onCreated(final SdlRemoteDisplay remoteDisplay) {
+                    //Remote display has been created.
+                    //Now is a good time to do parsing for spatial data
+                    VideoStreamManager.this.remoteDisplay = remoteDisplay;
+                    if (hapticManager != null) {
+                        remoteDisplay.getMainView().post(new Runnable() {
+                            @Override
+                            public void run() {
+                                hapticManager.refreshHapticData(remoteDisplay.getMainView());
+                            }
+                        });
+                    }
+                    //Get touch scalars
+                    ImageResolution resolution = null;
+                    if (internalInterface.getProtocolVersion().getMajor() >= 5) { //At this point we should already have the capability
+                        VideoStreamingCapability capability = null;
+                        if (internalInterface.getSystemCapabilityManager() != null) {
+                            capability = (VideoStreamingCapability) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false);
+                        }
+                        if (capability != null) {
+                            resolution = capability.getPreferredResolution();
+                        }
+                    }
+
+                    if (resolution == null) { //Either the protocol version is too low to access video streaming caps, or they were null
+                        DisplayCapabilities dispCap = null;
+                        if (internalInterface.getSystemCapabilityManager() != null) {
+                            dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
+                        }
+                        if (dispCap != null) {
+                            resolution = (dispCap.getScreenParams().getImageResolution());
+                        }
+                    }
+
+                    if (resolution != null) {
+                        DisplayMetrics displayMetrics = new DisplayMetrics();
+                        disp.getMetrics(displayMetrics);
+                        createTouchScalar(resolution, displayMetrics);
+                    }
+
+                }
+
+                @Override
+                public void onInvalidated(final SdlRemoteDisplay remoteDisplay) {
+                    //Our view has been invalidated
+                    //A good time to refresh spatial data
+                    if (hapticManager != null) {
+                        remoteDisplay.getMainView().post(new Runnable() {
+                            @Override
+                            public void run() {
+                                hapticManager.refreshHapticData(remoteDisplay.getMainView());
+                            }
+                        });
+                    }
+                }
+            }));
+            Thread showPresentation = new Thread(fTask);
+            showPresentation.setName("RmtDispThread");
+
+            showPresentation.start();
+        } catch (Exception ex) {
+            DebugTool.logError(TAG, "Unable to create Virtual Display.");
+            if (DebugTool.isDebugEnabled()) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    protected void onTransportUpdate(List<TransportRecord> connectedTransports, boolean audioStreamTransportAvail, boolean videoStreamTransportAvail) {
+
+        isTransportAvailable = videoStreamTransportAvail;
+
+        if (internalInterface.getProtocolVersion().isNewerThan(new Version(5, 1, 0)) >= 0) {
+            if (videoStreamTransportAvail) {
+                checkState();
+            }
+        } else {
+            //The protocol version doesn't support simultaneous transports.
+            if (!videoStreamTransportAvail) {
+                //If video streaming isn't available on primary transport then it is not possible to
+                //use the video streaming manager until a complete register on a transport that
+                //supports video
+                transitionToState(ERROR);
+            }
+        }
+    }
 
     void createTouchScalar(ImageResolution resolution, DisplayMetrics displayMetrics) {
-        touchScalar[0] = ((float)displayMetrics.widthPixels) / resolution.getResolutionWidth();
-        touchScalar[1] = ((float)displayMetrics.heightPixels) / resolution.getResolutionHeight();
+        touchScalar[0] = ((float) displayMetrics.widthPixels) / resolution.getResolutionWidth();
+        touchScalar[1] = ((float) displayMetrics.heightPixels) / resolution.getResolutionHeight();
     }
 
-	List<MotionEvent> convertTouchEvent(OnTouchEvent onTouchEvent){
-		List<MotionEvent> motionEventList = new ArrayList<>();
-
-		List<TouchEvent> touchEventList = onTouchEvent.getEvent();
-		if (touchEventList == null || touchEventList.size() == 0) return null;
-
-		TouchType touchType = onTouchEvent.getType();
-		if (touchType == null) { return null; }
-
-		if(sdlMotionEvent == null) {
-			if (touchType == TouchType.BEGIN) {
-				sdlMotionEvent = new SdlMotionEvent();
-			} else{
-				return null;
-			}
-		}
-
-		SdlMotionEvent.Pointer pointer;
-		MotionEvent motionEvent;
-
-		for (TouchEvent touchEvent : touchEventList) {
-			if (touchEvent == null || touchEvent.getId() == null) {
-				continue;
-			}
-
-			List<TouchCoord> touchCoordList = touchEvent.getTouchCoordinates();
-			if (touchCoordList == null || touchCoordList.size() == 0) {
-				continue;
-			}
-
-			TouchCoord touchCoord = touchCoordList.get(touchCoordList.size() - 1);
-			if (touchCoord == null) {
-				continue;
-			}
-
-			int motionEventAction = sdlMotionEvent.getMotionEventAction(touchType, touchEvent);
-			long downTime = sdlMotionEvent.downTime;
-			long eventTime = sdlMotionEvent.eventTime;
-			pointer = sdlMotionEvent.getPointerById(touchEvent.getId());
-			if (pointer != null) {
-				pointer.setCoords(touchCoord.getX() * touchScalar[0], touchCoord.getY() * touchScalar[1]);
-			}
-
-			MotionEvent.PointerProperties[] pointerProperties = new MotionEvent.PointerProperties[sdlMotionEvent.pointers.size()];
-			MotionEvent.PointerCoords[] pointerCoords = new MotionEvent.PointerCoords[sdlMotionEvent.pointers.size()];
-
-			for (int i = 0; i < sdlMotionEvent.pointers.size(); i++) {
-				pointerProperties[i] = new MotionEvent.PointerProperties();
-				pointerProperties[i].id = sdlMotionEvent.getPointerByIndex(i).id;
-				pointerProperties[i].toolType = MotionEvent.TOOL_TYPE_FINGER;
-
-				pointerCoords[i] = new MotionEvent.PointerCoords();
-				pointerCoords[i].x = sdlMotionEvent.getPointerByIndex(i).x;
-				pointerCoords[i].y = sdlMotionEvent.getPointerByIndex(i).y;
-				pointerCoords[i].orientation = 0;
-				pointerCoords[i].pressure = 1.0f;
-				pointerCoords[i].size = 1;
-			}
-
-			motionEvent = MotionEvent.obtain(downTime, eventTime, motionEventAction,
-					sdlMotionEvent.pointers.size(), pointerProperties, pointerCoords, 0, 0, 1,
-					1, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0);
-			motionEventList.add(motionEvent);
-
-			if(motionEventAction == MotionEvent.ACTION_UP || motionEventAction == MotionEvent.ACTION_CANCEL){
-				//If the motion event should be finished we should clear our reference
-				sdlMotionEvent.pointers.clear();
-				sdlMotionEvent = null;
-				break;
-			} else if((motionEventAction & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_UP){
-				sdlMotionEvent.removePointerById(touchEvent.getId());
-			}
-		}
-
-		return motionEventList;
-	}
-
-	/**
-	 * Keeps track of the current motion event for VPM
-	 */
-	private static class SdlMotionEvent {
-		class Pointer {
-			final int id;
-			float x;
-			float y;
-			Pointer (int id) {
-				this.id = id;
-				this.x = 0.0f;
-				this.y = 0.0f;
-			}
-			void setCoords(float x, float y) {
-				this.x = x;
-				this.y = y;
-			}
-		}
-
-		private final CopyOnWriteArrayList<Pointer> pointers = new CopyOnWriteArrayList<>();
-		private long downTime;
-		private long downTimeOnHMI;
-		private long eventTime;
-
-		SdlMotionEvent(){
-			downTimeOnHMI = 0;
-		}
-
-		/**
-		 * Handles the SDL Touch Event to keep track of pointer status and returns the appropriate
-		 * Android MotionEvent according to this events status
-		 * @param touchType The SDL TouchType that was received from the module
-		 * @param touchEvent The SDL TouchEvent that was received from the module
-		 * @return the correct native Android MotionEvent action to dispatch
-		 */
-		synchronized int getMotionEventAction(TouchType touchType, TouchEvent touchEvent){
-			eventTime = 0;
-			int motionEventAction = -1;
-			switch (touchType){
-				case BEGIN:
-					if(pointers.size() == 0){
-						//The motion event has just begun
-						motionEventAction = MotionEvent.ACTION_DOWN;
-						downTime = SystemClock.uptimeMillis();
-						downTimeOnHMI = touchEvent.getTimestamps().get(touchEvent.getTimestamps().size() - 1);
-						eventTime = downTime;
-					} else{
-						motionEventAction = MotionEvent.ACTION_POINTER_DOWN | pointers.size() << MotionEvent.ACTION_POINTER_INDEX_SHIFT;
-						eventTime = downTime + touchEvent.getTimestamps().get(touchEvent.getTimestamps().size() - 1) - downTimeOnHMI;
-					}
-					pointers.add(new Pointer(touchEvent.getId()));
-					break;
-				case MOVE:
-					motionEventAction = MotionEvent.ACTION_MOVE;
-					eventTime = downTime + touchEvent.getTimestamps().get(touchEvent.getTimestamps().size() - 1) - downTimeOnHMI;
-					break;
-				case END:
-					if(pointers.size() <= 1){
-						//The motion event has just ended
-						motionEventAction = MotionEvent.ACTION_UP;
-					} else {
-						int pointerIndex = pointers.indexOf(getPointerById(touchEvent.getId()));
-						if (pointerIndex != -1) {
-							motionEventAction = MotionEvent.ACTION_POINTER_UP | pointerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT;
-						} else {
-							motionEventAction = MotionEvent.ACTION_UP;
-						}
-					}
-					eventTime = downTime + touchEvent.getTimestamps().get(touchEvent.getTimestamps().size() - 1) - downTimeOnHMI;
-					break;
-				case CANCEL:
-					//Assuming this cancels the entire event
-					motionEventAction = MotionEvent.ACTION_CANCEL;
-					eventTime = downTime + touchEvent.getTimestamps().get(touchEvent.getTimestamps().size() - 1) - downTimeOnHMI;
-					break;
-				default:
-					break;
-			}
-			return motionEventAction;
-		}
-
-		Pointer getPointerById(int id){
-			if (pointers != null && !pointers.isEmpty()){
-				for (Pointer pointer : pointers){
-					if (pointer.id == id){
-						return pointer;
-					}
-				}
-			}
-			return null;
-		}
-
-		Pointer getPointerByIndex(int index){
-			return pointers.get(index);
-		}
-
-		void removePointerById(int id){
-			pointers.remove(getPointerById(id));
-		}
-	}
-
-	private VideoStreamingProtocol getAcceptedProtocol(VideoStreamingParameters params) {
-		if (params != null) {
-			VideoStreamingFormat format = params.getFormat();
-			if (format != null && format.getProtocol() != null) {
-				return format.getProtocol();
-			}
-		}
-		//Returns default protocol if none are found
-		return new VideoStreamingParameters().getFormat().getProtocol();
-
-	}
-
-	protected IVideoStreamListener startVideoStream(VideoStreamingParameters params, final SdlSession session) {
-		VideoStreamingProtocol protocol = getAcceptedProtocol(params);
-
-		IStreamListener iStreamListener = new IStreamListener() {
-			@Override
-			public void sendStreamPacket(ProtocolMessage pm) {
-				session.sendMessage(pm);
-			}
-		};
-
-		try {
-			switch (protocol) {
-				case RAW: {
-					videoPacketizer = new StreamPacketizer(iStreamListener, null, SessionType.NAV, (byte) session.getSessionId(), session);
-					videoPacketizer.start();
-					return (IVideoStreamListener) videoPacketizer;
-				}
-				case RTP: {
-					//FIXME why is this not an extension of StreamPacketizer?
-					videoPacketizer = new RTPH264Packetizer(iStreamListener, SessionType.NAV, (byte) session.getSessionId(), session);
-					videoPacketizer.start();
-					return (IVideoStreamListener) videoPacketizer;
-				}
-				default:
-					DebugTool.logError(TAG, "Protocol " + protocol + " is not supported.");
-					return null;
-			}
-		} catch (IOException e) {
-			return null;
-		}
-
-	}
-
-	protected boolean stopVideoStream() {
-		if (videoPacketizer != null) {
-			videoPacketizer.stop();
-			return true;
-		}
-		return false;
-	}
+    List<MotionEvent> convertTouchEvent(OnTouchEvent onTouchEvent) {
+        List<MotionEvent> motionEventList = new ArrayList<>();
+
+        List<TouchEvent> touchEventList = onTouchEvent.getEvent();
+        if (touchEventList == null || touchEventList.size() == 0) return null;
+
+        TouchType touchType = onTouchEvent.getType();
+        if (touchType == null) {
+            return null;
+        }
+
+        if (sdlMotionEvent == null) {
+            if (touchType == TouchType.BEGIN) {
+                sdlMotionEvent = new SdlMotionEvent();
+            } else {
+                return null;
+            }
+        }
+
+        SdlMotionEvent.Pointer pointer;
+        MotionEvent motionEvent;
+
+        for (TouchEvent touchEvent : touchEventList) {
+            if (touchEvent == null || touchEvent.getId() == null) {
+                continue;
+            }
+
+            List<TouchCoord> touchCoordList = touchEvent.getTouchCoordinates();
+            if (touchCoordList == null || touchCoordList.size() == 0) {
+                continue;
+            }
+
+            TouchCoord touchCoord = touchCoordList.get(touchCoordList.size() - 1);
+            if (touchCoord == null) {
+                continue;
+            }
+
+            int motionEventAction = sdlMotionEvent.getMotionEventAction(touchType, touchEvent);
+            long downTime = sdlMotionEvent.downTime;
+            long eventTime = sdlMotionEvent.eventTime;
+            pointer = sdlMotionEvent.getPointerById(touchEvent.getId());
+            if (pointer != null) {
+                pointer.setCoords(touchCoord.getX() * touchScalar[0], touchCoord.getY() * touchScalar[1]);
+            }
+
+            MotionEvent.PointerProperties[] pointerProperties = new MotionEvent.PointerProperties[sdlMotionEvent.pointers.size()];
+            MotionEvent.PointerCoords[] pointerCoords = new MotionEvent.PointerCoords[sdlMotionEvent.pointers.size()];
+
+            for (int i = 0; i < sdlMotionEvent.pointers.size(); i++) {
+                pointerProperties[i] = new MotionEvent.PointerProperties();
+                pointerProperties[i].id = sdlMotionEvent.getPointerByIndex(i).id;
+                pointerProperties[i].toolType = MotionEvent.TOOL_TYPE_FINGER;
+
+                pointerCoords[i] = new MotionEvent.PointerCoords();
+                pointerCoords[i].x = sdlMotionEvent.getPointerByIndex(i).x;
+                pointerCoords[i].y = sdlMotionEvent.getPointerByIndex(i).y;
+                pointerCoords[i].orientation = 0;
+                pointerCoords[i].pressure = 1.0f;
+                pointerCoords[i].size = 1;
+            }
+
+            motionEvent = MotionEvent.obtain(downTime, eventTime, motionEventAction,
+                    sdlMotionEvent.pointers.size(), pointerProperties, pointerCoords, 0, 0, 1,
+                    1, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0);
+            motionEventList.add(motionEvent);
+
+            if (motionEventAction == MotionEvent.ACTION_UP || motionEventAction == MotionEvent.ACTION_CANCEL) {
+                //If the motion event should be finished we should clear our reference
+                sdlMotionEvent.pointers.clear();
+                sdlMotionEvent = null;
+                break;
+            } else if ((motionEventAction & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_UP) {
+                sdlMotionEvent.removePointerById(touchEvent.getId());
+            }
+        }
+
+        return motionEventList;
+    }
+
+    /**
+     * Keeps track of the current motion event for VPM
+     */
+    private static class SdlMotionEvent {
+        class Pointer {
+            final int id;
+            float x;
+            float y;
+
+            Pointer(int id) {
+                this.id = id;
+                this.x = 0.0f;
+                this.y = 0.0f;
+            }
+
+            void setCoords(float x, float y) {
+                this.x = x;
+                this.y = y;
+            }
+        }
+
+        private final CopyOnWriteArrayList<Pointer> pointers = new CopyOnWriteArrayList<>();
+        private long downTime;
+        private long downTimeOnHMI;
+        private long eventTime;
+
+        SdlMotionEvent() {
+            downTimeOnHMI = 0;
+        }
+
+        /**
+         * Handles the SDL Touch Event to keep track of pointer status and returns the appropriate
+         * Android MotionEvent according to this events status
+         *
+         * @param touchType  The SDL TouchType that was received from the module
+         * @param touchEvent The SDL TouchEvent that was received from the module
+         * @return the correct native Android MotionEvent action to dispatch
+         */
+        synchronized int getMotionEventAction(TouchType touchType, TouchEvent touchEvent) {
+            eventTime = 0;
+            int motionEventAction = -1;
+            switch (touchType) {
+                case BEGIN:
+                    if (pointers.size() == 0) {
+                        //The motion event has just begun
+                        motionEventAction = MotionEvent.ACTION_DOWN;
+                        downTime = SystemClock.uptimeMillis();
+                        downTimeOnHMI = touchEvent.getTimestamps().get(touchEvent.getTimestamps().size() - 1);
+                        eventTime = downTime;
+                    } else {
+                        motionEventAction = MotionEvent.ACTION_POINTER_DOWN | pointers.size() << MotionEvent.ACTION_POINTER_INDEX_SHIFT;
+                        eventTime = downTime + touchEvent.getTimestamps().get(touchEvent.getTimestamps().size() - 1) - downTimeOnHMI;
+                    }
+                    pointers.add(new Pointer(touchEvent.getId()));
+                    break;
+                case MOVE:
+                    motionEventAction = MotionEvent.ACTION_MOVE;
+                    eventTime = downTime + touchEvent.getTimestamps().get(touchEvent.getTimestamps().size() - 1) - downTimeOnHMI;
+                    break;
+                case END:
+                    if (pointers.size() <= 1) {
+                        //The motion event has just ended
+                        motionEventAction = MotionEvent.ACTION_UP;
+                    } else {
+                        int pointerIndex = pointers.indexOf(getPointerById(touchEvent.getId()));
+                        if (pointerIndex != -1) {
+                            motionEventAction = MotionEvent.ACTION_POINTER_UP | pointerIndex << MotionEvent.ACTION_POINTER_INDEX_SHIFT;
+                        } else {
+                            motionEventAction = MotionEvent.ACTION_UP;
+                        }
+                    }
+                    eventTime = downTime + touchEvent.getTimestamps().get(touchEvent.getTimestamps().size() - 1) - downTimeOnHMI;
+                    break;
+                case CANCEL:
+                    //Assuming this cancels the entire event
+                    motionEventAction = MotionEvent.ACTION_CANCEL;
+                    eventTime = downTime + touchEvent.getTimestamps().get(touchEvent.getTimestamps().size() - 1) - downTimeOnHMI;
+                    break;
+                default:
+                    break;
+            }
+            return motionEventAction;
+        }
+
+        Pointer getPointerById(int id) {
+            if (pointers != null && !pointers.isEmpty()) {
+                for (Pointer pointer : pointers) {
+                    if (pointer.id == id) {
+                        return pointer;
+                    }
+                }
+            }
+            return null;
+        }
+
+        Pointer getPointerByIndex(int index) {
+            return pointers.get(index);
+        }
+
+        void removePointerById(int id) {
+            pointers.remove(getPointerById(id));
+        }
+    }
+
+    private VideoStreamingProtocol getAcceptedProtocol(VideoStreamingParameters params) {
+        if (params != null) {
+            VideoStreamingFormat format = params.getFormat();
+            if (format != null && format.getProtocol() != null) {
+                return format.getProtocol();
+            }
+        }
+        //Returns default protocol if none are found
+        return new VideoStreamingParameters().getFormat().getProtocol();
+
+    }
+
+    protected IVideoStreamListener startVideoStream(VideoStreamingParameters params, final SdlSession session) {
+        VideoStreamingProtocol protocol = getAcceptedProtocol(params);
+
+        IStreamListener iStreamListener = new IStreamListener() {
+            @Override
+            public void sendStreamPacket(ProtocolMessage pm) {
+                session.sendMessage(pm);
+            }
+        };
+
+        try {
+            switch (protocol) {
+                case RAW: {
+                    videoPacketizer = new StreamPacketizer(iStreamListener, null, SessionType.NAV, (byte) session.getSessionId(), session);
+                    videoPacketizer.start();
+                    return (IVideoStreamListener) videoPacketizer;
+                }
+                case RTP: {
+                    //FIXME why is this not an extension of StreamPacketizer?
+                    videoPacketizer = new RTPH264Packetizer(iStreamListener, SessionType.NAV, (byte) session.getSessionId(), session);
+                    videoPacketizer.start();
+                    return (IVideoStreamListener) videoPacketizer;
+                }
+                default:
+                    DebugTool.logError(TAG, "Protocol " + protocol + " is not supported.");
+                    return null;
+            }
+        } catch (IOException e) {
+            return null;
+        }
+
+    }
+
+    protected boolean stopVideoStream() {
+        if (videoPacketizer != null) {
+            videoPacketizer.stop();
+            return true;
+        }
+        return false;
+    }
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
index 707f55c01..4c4633776 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java
@@ -11,21 +11,21 @@ import com.smartdevicelink.util.DebugTool;
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SdlPacket extends BaseSdlPacket implements Parcelable {
     private static final String TAG = "SdlPacket";
-    private static final int EXTRA_PARCEL_DATA_LENGTH 			= 24;
+    private static final int EXTRA_PARCEL_DATA_LENGTH = 24;
 
     public SdlPacket(int version, boolean encryption, int frameType,
-                         int serviceType, int frameInfo, int sessionId,
-                         int dataSize, int messageId, byte[] payload) {
+                     int serviceType, int frameInfo, int sessionId,
+                     int dataSize, int messageId, byte[] payload) {
         super(version, encryption, frameType, serviceType, frameInfo, sessionId, dataSize, messageId, payload);
     }
 
     public SdlPacket(int version, boolean encryption, int frameType,
-                         int serviceType, int frameInfo, int sessionId,
-                         int dataSize, int messageId, byte[] payload, int offset, int bytesToWrite) {
+                     int serviceType, int frameInfo, int sessionId,
+                     int dataSize, int messageId, byte[] payload, int offset, int bytesToWrite) {
         super(version, encryption, frameType, serviceType, frameInfo, sessionId, dataSize, messageId, payload, offset, bytesToWrite);
     }
 
-    protected  SdlPacket() {
+    protected SdlPacket() {
         super();
     }
 
@@ -38,7 +38,6 @@ public class SdlPacket extends BaseSdlPacket implements Parcelable {
      *****************************************************************************************************************************************************/
 
 
-
     //I think this is FIFO...right?
     public SdlPacket(Parcel p) {
         this.version = p.readInt();
@@ -49,14 +48,14 @@ public class SdlPacket extends BaseSdlPacket implements Parcelable {
         this.sessionId = p.readInt();
         this.dataSize = p.readInt();
         this.messageId = p.readInt();
-        if(p.readInt() == 1){ //We should have a payload attached
+        if (p.readInt() == 1) { //We should have a payload attached
             payload = new byte[dataSize];
             p.readByteArray(payload);
         }
 
         this.priorityCoefficient = p.readInt();
 
-        if(p.dataAvail() > EXTRA_PARCEL_DATA_LENGTH) {	//See note on constant for why not 0
+        if (p.dataAvail() > EXTRA_PARCEL_DATA_LENGTH) {    //See note on constant for why not 0
             try {
                 messagingVersion = p.readInt();
                 if (messagingVersion >= 2) {
@@ -64,7 +63,7 @@ public class SdlPacket extends BaseSdlPacket implements Parcelable {
                         this.transportRecord = p.readParcelable(TransportRecord.class.getClassLoader());
                     }
                 }
-            }catch (RuntimeException e){
+            } catch (RuntimeException e) {
                 DebugTool.logError(TAG, "Error creating packet from parcel", e);
             }
         }
@@ -80,26 +79,26 @@ public class SdlPacket extends BaseSdlPacket implements Parcelable {
     public void writeToParcel(Parcel dest, int flags) {
 
         dest.writeInt(version);
-        dest.writeInt(encryption? 1 : 0);
+        dest.writeInt(encryption ? 1 : 0);
         dest.writeInt(frameType);
         dest.writeInt(serviceType);
         dest.writeInt(frameInfo);
         dest.writeInt(sessionId);
         dest.writeInt(dataSize);
         dest.writeInt(messageId);
-        dest.writeInt(payload!=null? 1 : 0);
-        if(payload!=null){
+        dest.writeInt(payload != null ? 1 : 0);
+        if (payload != null) {
             dest.writeByteArray(payload);
         }
         dest.writeInt(priorityCoefficient);
 
         ///Additions after initial creation
-        if(messagingVersion > 1){
+        if (messagingVersion > 1) {
             dest.writeInt(messagingVersion);
 
-            dest.writeInt(transportRecord!=null? 1 : 0);
-            if(transportRecord != null){
-                dest.writeParcelable(transportRecord,0);
+            dest.writeInt(transportRecord != null ? 1 : 0);
+            if (transportRecord != null) {
+                dest.writeParcelable(transportRecord, 0);
             }
         }
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
index 2f5771548..b2b04b2dd 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
@@ -48,24 +48,24 @@ import java.util.Collections;
 @SuppressWarnings("WeakerAccess")
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class SdlProtocol extends SdlProtocolBase {
-    private static final String TAG ="SdlProtocol";
+    private static final String TAG = "SdlProtocol";
 
 
     public SdlProtocol(@NonNull ISdlProtocol iSdlProtocol, @NonNull MultiplexTransportConfig config) {
-        super(iSdlProtocol,config);
+        super(iSdlProtocol, config);
         this.requestedPrimaryTransports = config.getPrimaryTransports();
         this.requestedSecondaryTransports = config.getSecondaryTransports();
         this.requiresHighBandwidth = config.requiresHighBandwidth();
-        this.setTransportManager(new TransportManager(config,transportEventListener));
+        this.setTransportManager(new TransportManager(config, transportEventListener));
     }
 
 
     public SdlProtocol(@NonNull ISdlProtocol iSdlProtocol, @NonNull TCPTransportConfig config) {
-        super(iSdlProtocol,config);
+        super(iSdlProtocol, config);
         this.requestedPrimaryTransports = Collections.singletonList(TransportType.TCP);
         this.requestedSecondaryTransports = null;
-        this.requiresHighBandwidth =false;
-        this.setTransportManager(new TCPTransportManager(config,transportEventListener));
+        this.requiresHighBandwidth = false;
+        this.setTransportManager(new TCPTransportManager(config, transportEventListener));
     }
 
     /**
@@ -73,8 +73,8 @@ public class SdlProtocol extends SdlProtocolBase {
      * call the onTransportEvent method.
      */
     @Override
-    void notifyDevTransportListener (){
-        if(TransportType.MULTIPLEX.equals(transportConfig.getTransportType() )) {
+    void notifyDevTransportListener() {
+        if (TransportType.MULTIPLEX.equals(transportConfig.getTransportType())) {
             MultiplexTransportConfig transportConfig = (MultiplexTransportConfig) this.transportConfig;
             if (transportConfig.getTransportListener() != null && transportManager != null) {
                 transportConfig.getTransportListener().onTransportEvent(transportManager.getConnectedTransports(), isTransportForServiceAvailable(SessionType.PCM), isTransportForServiceAvailable(SessionType.NAV));
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
index b0fcc73f3..c60cdaadf 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/HeartbeatMonitor.java
@@ -14,7 +14,7 @@
  * distribution.

  *

  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

+ * contributors may be used to endorse or promote products derived from this

  * software without specific prior written permission.

  *

  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

@@ -40,7 +40,7 @@ import androidx.annotation.RestrictTo;
 @RestrictTo(RestrictTo.Scope.LIBRARY)

 public class HeartbeatMonitor implements IHeartbeatMonitor {

 

-	public static final int HEARTBEAT_INTERVAL = 5000;

+    public static final int HEARTBEAT_INTERVAL = 5000;

     public static final int HEARTBEAT_INTERVAL_MAX = Integer.MAX_VALUE;

 

     private final Object heartbeatThreadHandlerLock = new Object();

@@ -61,33 +61,36 @@ public class HeartbeatMonitor implements IHeartbeatMonitor {
 

     // Methods used to retrieve values for unit testing only.

     // See com/smartdevicelink/tests/protocol/heartbeat/HeartbeatMonitorTests.

-    public Runnable getHeartbeatRunnable () { return heartbeatTimeoutRunnable; }

-    public boolean isHeartbeatReceived () { return isHeartbeatReceived; }

-    

+    public Runnable getHeartbeatRunnable() {

+        return heartbeatTimeoutRunnable;

+    }

+

+    public boolean isHeartbeatReceived() {

+        return isHeartbeatReceived;

+    }

+

     private final Runnable heartbeatTimeoutRunnable = new Runnable() {

 

         @Override

-        public void run() {            

-        	try{

-	        	synchronized (listenerLock) {

-	                if (isHeartbeatReceived) {

-	                    if (mListener != null) {

-	                        mListener.sendHeartbeat(HeartbeatMonitor.this);

-	                    } else {

-	

-	                    }

-	                    isHeartbeatReceived = false;

-	                } else {

-	                    if (mListener != null) {

-	                        mListener.heartbeatTimedOut(HeartbeatMonitor.this);

-	                    }

-	                }

-	            }

-        	}

-        	catch(Exception ex) 

-        	{ 

-        		stop(); 

-        	}

+        public void run() {

+            try {

+                synchronized (listenerLock) {

+                    if (isHeartbeatReceived) {

+                        if (mListener != null) {

+                            mListener.sendHeartbeat(HeartbeatMonitor.this);

+                        } else {

+

+                        }

+                        isHeartbeatReceived = false;

+                    } else {

+                        if (mListener != null) {

+                            mListener.heartbeatTimedOut(HeartbeatMonitor.this);

+                        }

+                    }

+                }

+            } catch (Exception ex) {

+                stop();

+            }

         }

     };

 

@@ -95,30 +98,27 @@ public class HeartbeatMonitor implements IHeartbeatMonitor {
 

         @Override

         public void run() {

-        	

-        	try

-        	{

-	        	synchronized (listenerLock) {

-	                if (mIsAckReceived) {

-	                    if (mListener != null) {

-	                        mListener.sendHeartbeat(HeartbeatMonitor.this);

-	                    } else {

-	                    }

-	                    mIsAckReceived = false;

-	                } else {

-	                    if (mListener != null) {

-	                        mListener.heartbeatTimedOut(HeartbeatMonitor.this);

-	                    }

-	                    stop();

-	                }

-	            }

-        	

-        	}

-        	catch(Exception ex)	

-        	{

-        		stop();

-        	}

-        	        

+

+            try {

+                synchronized (listenerLock) {

+                    if (mIsAckReceived) {

+                        if (mListener != null) {

+                            mListener.sendHeartbeat(HeartbeatMonitor.this);

+                        } else {

+                        }

+                        mIsAckReceived = false;

+                    } else {

+                        if (mListener != null) {

+                            mListener.heartbeatTimedOut(HeartbeatMonitor.this);

+                        }

+                        stop();

+                    }

+                }

+

+            } catch (Exception ex) {

+                stop();

+            }

+

             rescheduleHeartbeat();

         }

 

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
index 68e8709f4..0c1f9d251 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitor.java
@@ -14,7 +14,7 @@
  * distribution.

  *

  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

+ * contributors may be used to endorse or promote products derived from this

  * software without specific prior written permission.

  *

  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

@@ -84,7 +84,7 @@ public interface IHeartbeatMonitor {
      * Notifies the monitor about a received heartbeat ACK message.

      */

     void heartbeatACKReceived();

-    

+

     /**

      * Notifies the monitor about a received heartbeat message.

      */

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
index e95a6a5ec..38c35e06f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/heartbeat/IHeartbeatMonitorListener.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
+ * contributors may be used to endorse or promote products derived from this
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
index 2e1ac540c..6ef9d081f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/security/SdlSecurityBase.java
@@ -14,7 +14,7 @@
  * distribution.

  *

  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

+ * contributors may be used to endorse or promote products derived from this

  * software without specific prior written permission.

  *

  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

@@ -33,9 +33,9 @@ package com.smartdevicelink.security;
 

 import android.content.Context;

 

-public abstract class SdlSecurityBase extends AbstractSdlSecurityBase{

+public abstract class SdlSecurityBase extends AbstractSdlSecurityBase {

 

-	protected static Context context;

+    protected static Context context;

 

     public static Context getContext() {

         return context;

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
index 9a53c95af..097afd089 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
@@ -14,7 +14,7 @@
  * distribution.

  *

  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

+ * contributors may be used to endorse or promote products derived from this

  * software without specific prior written permission.

  *

  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

@@ -33,10 +33,10 @@ package com.smartdevicelink.streaming;
 

 import androidx.annotation.RestrictTo;

 

-import com.smartdevicelink.session.SdlSession;

 import com.smartdevicelink.managers.CompletionListener;

 import com.smartdevicelink.protocol.ProtocolMessage;

 import com.smartdevicelink.protocol.enums.SessionType;

+import com.smartdevicelink.session.SdlSession;

 import com.smartdevicelink.streaming.audio.IAudioStreamListener;

 import com.smartdevicelink.streaming.video.IVideoStreamListener;

 import com.smartdevicelink.util.DebugTool;

@@ -48,151 +48,142 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;

 

 @RestrictTo(RestrictTo.Scope.LIBRARY)

-public class StreamPacketizer extends AbstractPacketizer implements IVideoStreamListener, IAudioStreamListener, Runnable{

+public class StreamPacketizer extends AbstractPacketizer implements IVideoStreamListener, IAudioStreamListener, Runnable {

 

-	public final static String TAG = "StreamPacketizer";

+    public final static String TAG = "StreamPacketizer";

 

-	private Thread t = null;

+    private Thread t = null;

 

 

-	private final static int TLS_MAX_RECORD_SIZE = 16384;

-	private final static int TLS_RECORD_HEADER_SIZE = 5;

-	private final static int TLS_RECORD_MES_AUTH_CDE_SIZE = 32;

-	private final static int TLS_MAX_RECORD_PADDING_SIZE = 256;

+    private final static int TLS_MAX_RECORD_SIZE = 16384;

+    private final static int TLS_RECORD_HEADER_SIZE = 5;

+    private final static int TLS_RECORD_MES_AUTH_CDE_SIZE = 32;

+    private final static int TLS_MAX_RECORD_PADDING_SIZE = 256;

 

 

-	private final static int BUFF_READ_SIZE = TLS_MAX_RECORD_SIZE - TLS_RECORD_HEADER_SIZE - TLS_RECORD_MES_AUTH_CDE_SIZE - TLS_MAX_RECORD_PADDING_SIZE;

+    private final static int BUFF_READ_SIZE = TLS_MAX_RECORD_SIZE - TLS_RECORD_HEADER_SIZE - TLS_RECORD_MES_AUTH_CDE_SIZE - TLS_MAX_RECORD_PADDING_SIZE;

 

-	// Approximate size of data that mOutputQueue can hold in bytes.

-	// By adding a buffer, we accept underlying transport being stuck for a short time. By setting

-	// a limit of the buffer size, we avoid buffer overflows when underlying transport is too slow.

-	private static final int MAX_QUEUE_SIZE = 256 * 1024;

+    // Approximate size of data that mOutputQueue can hold in bytes.

+    // By adding a buffer, we accept underlying transport being stuck for a short time. By setting

+    // a limit of the buffer size, we avoid buffer overflows when underlying transport is too slow.

+    private static final int MAX_QUEUE_SIZE = 256 * 1024;

 

     private final Object mPauseLock = new Object();

     private boolean mPaused;

     private boolean isServiceProtected = false;

     private BlockingQueue<ByteBufferWithListener> mOutputQueue;

 

-	public StreamPacketizer(IStreamListener streamListener, InputStream is, SessionType sType, byte rpcSessionID, SdlSession session) throws IOException {

-		super(streamListener, is, sType, rpcSessionID, session);

+    public StreamPacketizer(IStreamListener streamListener, InputStream is, SessionType sType, byte rpcSessionID, SdlSession session) throws IOException {

+        super(streamListener, is, sType, rpcSessionID, session);

         mPaused = false;

         isServiceProtected = _session.isServiceProtected(_serviceType);

-		if (bufferSize == 0) {

-			// fail safe

-			bufferSize = BUFF_READ_SIZE;

-			buffer = new byte[bufferSize];

-		}

-		if(isServiceProtected){ //If our service is encrypted we can only use 1024 as the max buffer size. 

-			bufferSize = BUFF_READ_SIZE;

-			buffer = new byte[bufferSize];

-		}

-		mOutputQueue = new LinkedBlockingQueue<>(MAX_QUEUE_SIZE / bufferSize);

-	}

-

-	public void start() throws IOException {

-		if (t == null) {

-			t = new Thread(this);

-			t.start();

-		}

-	}

-

-	public void stop() {

-

-		if (t != null)

-		{

-			t.interrupt();

-			t = null;

-		}

-

-		mOutputQueue.clear();

-

-	}

-

-	public void run() {

-		int length;

-		try 

-		{

-			while (t != null && !t.isInterrupted()) 

-			{

-				synchronized(mPauseLock)

-				{

-					while (mPaused)

-                    {

-						try

-                        {

-							mPauseLock.wait();

+        if (bufferSize == 0) {

+            // fail safe

+            bufferSize = BUFF_READ_SIZE;

+            buffer = new byte[bufferSize];

+        }

+        if (isServiceProtected) { //If our service is encrypted we can only use 1024 as the max buffer size.

+            bufferSize = BUFF_READ_SIZE;

+            buffer = new byte[bufferSize];

+        }

+        mOutputQueue = new LinkedBlockingQueue<>(MAX_QUEUE_SIZE / bufferSize);

+    }

+

+    public void start() throws IOException {

+        if (t == null) {

+            t = new Thread(this);

+            t.start();

+        }

+    }

+

+    public void stop() {

+

+        if (t != null) {

+            t.interrupt();

+            t = null;

+        }

+

+        mOutputQueue.clear();

+

+    }

+

+    public void run() {

+        int length;

+        try {

+            while (t != null && !t.isInterrupted()) {

+                synchronized (mPauseLock) {

+                    while (mPaused) {

+                        try {

+                            mPauseLock.wait();

+                        } catch (InterruptedException e) {

                         }

-                        catch (InterruptedException e) {}

                     }

                 }

 

-				if (is != null) { // using InputStream interface

-					length = is.read(buffer, 0, bufferSize);

-

-					if (length >= 0) {

-						ProtocolMessage pm = new ProtocolMessage();

-						pm.setSessionID(_rpcSessionID);

-						pm.setSessionType(_serviceType);

-						pm.setFunctionID(0);

-						pm.setCorrID(0);

-						pm.setData(buffer, length);

-						pm.setPayloadProtected(isServiceProtected);

-

-						if (t != null && !t.isInterrupted()) {

-							_streamListener.sendStreamPacket(pm);

-						}

-					}

-				} else { // using sendFrame interface

-					ByteBufferWithListener byteBufferWithListener;

-					ByteBuffer frame;

-					CompletionListener completionListener;

-					try {

-						byteBufferWithListener = mOutputQueue.take();

-						frame = byteBufferWithListener.byteBuffer;

-						completionListener = byteBufferWithListener.completionListener;

-					} catch (InterruptedException e) {

-						if(DebugTool.isDebugEnabled()){

-							e.printStackTrace();

-						}

-						Thread.currentThread().interrupt();

-						break;

-					}

-

-					while (frame.hasRemaining()) {

-						int len = Math.min(frame.remaining(), bufferSize);

-

-						ProtocolMessage pm = new ProtocolMessage();

-						pm.setSessionID(_rpcSessionID);

-						pm.setSessionType(_serviceType);

-						pm.setFunctionID(0);

-						pm.setCorrID(0);

-						pm.setData(frame.array(), frame.arrayOffset() + frame.position(), len);

-						pm.setPayloadProtected(isServiceProtected);

-

-						if (t != null && !t.isInterrupted()) {

-							_streamListener.sendStreamPacket(pm);

-						}

-

-						frame.position(frame.position() + len);

-					}

-

-					if (completionListener != null){

-						completionListener.onComplete(true);

-					}

-				}

-			}

-		} catch (IOException e) 

-		{

-			e.printStackTrace();

-		}

-		finally

-		{

-			_session.endService(_serviceType);

-		}

-	}

+                if (is != null) { // using InputStream interface

+                    length = is.read(buffer, 0, bufferSize);

+

+                    if (length >= 0) {

+                        ProtocolMessage pm = new ProtocolMessage();

+                        pm.setSessionID(_rpcSessionID);

+                        pm.setSessionType(_serviceType);

+                        pm.setFunctionID(0);

+                        pm.setCorrID(0);

+                        pm.setData(buffer, length);

+                        pm.setPayloadProtected(isServiceProtected);

+

+                        if (t != null && !t.isInterrupted()) {

+                            _streamListener.sendStreamPacket(pm);

+                        }

+                    }

+                } else { // using sendFrame interface

+                    ByteBufferWithListener byteBufferWithListener;

+                    ByteBuffer frame;

+                    CompletionListener completionListener;

+                    try {

+                        byteBufferWithListener = mOutputQueue.take();

+                        frame = byteBufferWithListener.byteBuffer;

+                        completionListener = byteBufferWithListener.completionListener;

+                    } catch (InterruptedException e) {

+                        if (DebugTool.isDebugEnabled()) {

+                            e.printStackTrace();

+                        }

+                        Thread.currentThread().interrupt();

+                        break;

+                    }

+

+                    while (frame.hasRemaining()) {

+                        int len = Math.min(frame.remaining(), bufferSize);

+

+                        ProtocolMessage pm = new ProtocolMessage();

+                        pm.setSessionID(_rpcSessionID);

+                        pm.setSessionType(_serviceType);

+                        pm.setFunctionID(0);

+                        pm.setCorrID(0);

+                        pm.setData(frame.array(), frame.arrayOffset() + frame.position(), len);

+                        pm.setPayloadProtected(isServiceProtected);

+

+                        if (t != null && !t.isInterrupted()) {

+                            _streamListener.sendStreamPacket(pm);

+                        }

+

+                        frame.position(frame.position() + len);

+                    }

+

+                    if (completionListener != null) {

+                        completionListener.onComplete(true);

+                    }

+                }

+            }

+        } catch (IOException e) {

+            e.printStackTrace();

+        } finally {

+            _session.endService(_serviceType);

+        }

+    }

 

     @Override

-	public void pause() {

+    public void pause() {

         synchronized (mPauseLock) {

             mPaused = true;

         }

@@ -206,94 +197,95 @@ public class StreamPacketizer extends AbstractPacketizer implements IVideoStream
         }

     }

 

-	/**

-	 * Called by the app.

-	 *

-	 * @see IVideoStreamListener#sendFrame(byte[], int, int, long)

-	 */

-	@Override

-	public void sendFrame(byte[] data, int offset, int length, long presentationTimeUs)

-			throws ArrayIndexOutOfBoundsException {

-		sendArrayData(data, offset, length);

-	}

-

-	/**

-	 * Called by the app.

-	 *

-	 * @see IVideoStreamListener#sendFrame(ByteBuffer, long)

-	 */

-	@Override

-	public void sendFrame(ByteBuffer data, long presentationTimeUs) {

-		sendByteBufferData(data, null);

-	}

-

-	/**

-	 * Called by the app.

-	 *

-	 * @see IAudioStreamListener#sendAudio(byte[], int, int, long)

-	 */

-	@Override

-	public void sendAudio(byte[] data, int offset, int length, long presentationTimeUs)

-			throws ArrayIndexOutOfBoundsException {

-		sendArrayData(data, offset, length);

-	}

-

-	/**

-	 * Called by the app.

-	 *

-	 * @see IAudioStreamListener#sendAudio(ByteBuffer, long, CompletionListener)

-	 */

-	@Override

-	public void sendAudio(ByteBuffer data, long presentationTimeUs, CompletionListener completionListener) {

-		sendByteBufferData(data, completionListener);

-	}

-

-	private void sendArrayData(byte[] data, int offset, int length)

-			throws ArrayIndexOutOfBoundsException {

-		if (offset < 0 || offset > data.length || length <= 0 || offset + length > data.length) {

-			throw new ArrayIndexOutOfBoundsException();

-		}

-

-		if (data == null || t == null || t.isInterrupted()) {

-			return;

-		}

-

-		// StreamPacketizer does not need to split a video frame into NAL units

-		ByteBuffer buffer = ByteBuffer.allocate(length);

-		buffer.put(data, offset, length);

-		buffer.flip();

-

-		try {

-			mOutputQueue.put(new ByteBufferWithListener(buffer, null));

-		} catch (InterruptedException e) {

-			Thread.currentThread().interrupt();

-		}

-	}

-

-	private void sendByteBufferData(ByteBuffer data, CompletionListener completionListener) {

-		if (data == null || data.remaining() == 0 || t == null || t.isInterrupted()) {

-			return;

-		}

-

-		// copy the whole buffer, so that even if the app modifies original ByteBuffer after

-		// sendFrame() or sendAudio() call, our buffer will stay intact

-		ByteBuffer buffer = ByteBuffer.allocate(data.remaining());

-		buffer.put(data);

-		buffer.flip();

-

-		try {

-			mOutputQueue.put(new ByteBufferWithListener(buffer, completionListener));

-		} catch (InterruptedException e) {

-			Thread.currentThread().interrupt();

-		}

-	}

-

-	private class ByteBufferWithListener{

-		final ByteBuffer byteBuffer;

-		final CompletionListener completionListener;

-		ByteBufferWithListener (ByteBuffer byteBuffer, CompletionListener completionListener){

-			this.byteBuffer = byteBuffer;

-			this.completionListener = completionListener;

-		}

-	}

+    /**

+     * Called by the app.

+     *

+     * @see IVideoStreamListener#sendFrame(byte[], int, int, long)

+     */

+    @Override

+    public void sendFrame(byte[] data, int offset, int length, long presentationTimeUs)

+            throws ArrayIndexOutOfBoundsException {

+        sendArrayData(data, offset, length);

+    }

+

+    /**

+     * Called by the app.

+     *

+     * @see IVideoStreamListener#sendFrame(ByteBuffer, long)

+     */

+    @Override

+    public void sendFrame(ByteBuffer data, long presentationTimeUs) {

+        sendByteBufferData(data, null);

+    }

+

+    /**

+     * Called by the app.

+     *

+     * @see IAudioStreamListener#sendAudio(byte[], int, int, long)

+     */

+    @Override

+    public void sendAudio(byte[] data, int offset, int length, long presentationTimeUs)

+            throws ArrayIndexOutOfBoundsException {

+        sendArrayData(data, offset, length);

+    }

+

+    /**

+     * Called by the app.

+     *

+     * @see IAudioStreamListener#sendAudio(ByteBuffer, long, CompletionListener)

+     */

+    @Override

+    public void sendAudio(ByteBuffer data, long presentationTimeUs, CompletionListener completionListener) {

+        sendByteBufferData(data, completionListener);

+    }

+

+    private void sendArrayData(byte[] data, int offset, int length)

+            throws ArrayIndexOutOfBoundsException {

+        if (offset < 0 || offset > data.length || length <= 0 || offset + length > data.length) {

+            throw new ArrayIndexOutOfBoundsException();

+        }

+

+        if (data == null || t == null || t.isInterrupted()) {

+            return;

+        }

+

+        // StreamPacketizer does not need to split a video frame into NAL units

+        ByteBuffer buffer = ByteBuffer.allocate(length);

+        buffer.put(data, offset, length);

+        buffer.flip();

+

+        try {

+            mOutputQueue.put(new ByteBufferWithListener(buffer, null));

+        } catch (InterruptedException e) {

+            Thread.currentThread().interrupt();

+        }

+    }

+

+    private void sendByteBufferData(ByteBuffer data, CompletionListener completionListener) {

+        if (data == null || data.remaining() == 0 || t == null || t.isInterrupted()) {

+            return;

+        }

+

+        // copy the whole buffer, so that even if the app modifies original ByteBuffer after

+        // sendFrame() or sendAudio() call, our buffer will stay intact

+        ByteBuffer buffer = ByteBuffer.allocate(data.remaining());

+        buffer.put(data);

+        buffer.flip();

+

+        try {

+            mOutputQueue.put(new ByteBufferWithListener(buffer, completionListener));

+        } catch (InterruptedException e) {

+            Thread.currentThread().interrupt();

+        }

+    }

+

+    private class ByteBufferWithListener {

+        final ByteBuffer byteBuffer;

+        final CompletionListener completionListener;

+

+        ByteBufferWithListener(ByteBuffer byteBuffer, CompletionListener completionListener) {

+            this.byteBuffer = byteBuffer;

+            this.completionListener = completionListener;

+        }

+    }

 }

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java
index e22fbb9c6..f704bf769 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java
@@ -78,7 +78,7 @@ public abstract class SdlRemoteDisplay extends Presentation {
         super.onCreate(savedInstanceState);
         setTitle(TAG);
 
-        w  = getWindow();
+        w = getWindow();
 
         startRefreshTask();
 
@@ -97,7 +97,7 @@ public abstract class SdlRemoteDisplay extends Presentation {
 
     protected final Runnable mStartRefreshTaskCallback = new Runnable() {
         public void run() {
-            if(mainView == null){
+            if (mainView == null) {
                 mainView = w.getDecorView().findViewById(android.R.id.content);
             }
             if (mainView != null) {
@@ -108,21 +108,21 @@ public abstract class SdlRemoteDisplay extends Presentation {
         }
     };
 
-    public View getMainView(){
-        if(mainView == null){
+    public View getMainView() {
+        if (mainView == null) {
             mainView = w.getDecorView().findViewById(android.R.id.content);
         }
         return this.mainView;
     }
 
-    public void invalidate(){
+    public void invalidate() {
         // let listeners know the view has been invalidated
-        if(callback != null){
+        if (callback != null) {
             callback.onInvalidated(this);
         }
     }
 
-    public void handleMotionEvent(final MotionEvent motionEvent){
+    public void handleMotionEvent(final MotionEvent motionEvent) {
         uiHandler.post(new Runnable() {
             @Override
             public void run() {
@@ -131,7 +131,7 @@ public abstract class SdlRemoteDisplay extends Presentation {
         });
     }
 
-    public void stop(){
+    public void stop() {
         stopRefreshTask();
         dismissPresentation();
     }
@@ -144,8 +144,10 @@ public abstract class SdlRemoteDisplay extends Presentation {
             }
         });
     }
-    public interface Callback{
+
+    public interface Callback {
         void onCreated(SdlRemoteDisplay remoteDisplay);
+
         void onInvalidated(SdlRemoteDisplay remoteDisplay);
     }
 
@@ -159,7 +161,7 @@ public abstract class SdlRemoteDisplay extends Presentation {
         private final Callback callback;
 
 
-        public Creator(Context context, Display display, SdlRemoteDisplay remoteDisplay, Class<? extends SdlRemoteDisplay> remoteDisplayClass, Callback callback){
+        public Creator(Context context, Display display, SdlRemoteDisplay remoteDisplay, Class<? extends SdlRemoteDisplay> remoteDisplayClass, Callback callback) {
             this.context = context;
             this.mDisplay = display;
             this.remoteDisplay = remoteDisplay;
@@ -175,8 +177,7 @@ public abstract class SdlRemoteDisplay extends Presentation {
                 public void run() {
                     // Want to create presentation on UI thread so it finds the right Looper
                     // when setting up the Dialog.
-                    if((mDisplay!=null) && (remoteDisplay == null || remoteDisplay.getDisplay() != mDisplay))
-                    {
+                    if ((mDisplay != null) && (remoteDisplay == null || remoteDisplay.getDisplay() != mDisplay)) {
                         try {
                             Constructor constructor = remoteDisplayClass.getConstructor(Context.class, Display.class);
                             remoteDisplay = (SdlRemoteDisplay) constructor.newInstance(context, mDisplay);
@@ -190,7 +191,7 @@ public abstract class SdlRemoteDisplay extends Presentation {
                         try {
                             remoteDisplay.show();
                             remoteDisplay.callback = callback;
-                            if(callback!=null){
+                            if (callback != null) {
                                 callback.onCreated(remoteDisplay);
                             }
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
index 956985128..d8c50f2cd 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
@@ -14,7 +14,7 @@
  * distribution.

  *

  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

+ * contributors may be used to endorse or promote products derived from this

  * software without specific prior written permission.

  *

  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

@@ -48,59 +48,59 @@ import java.sql.Timestamp;
 

 @SuppressLint("DefaultLocale")

 public class SdlTrace extends SdlTraceBase {

-	private static String getPid(){

-		return String.valueOf(android.os.Process.myPid());

-	}

+    private static String getPid() {

+        return String.valueOf(android.os.Process.myPid());

+    }

 

-	@SuppressLint("MissingPermission")

-	public static String getBTDeviceInfo(BluetoothDevice btDevice) {

-		StringBuilder sb = new StringBuilder();

-		sb.append("<btp>");

-		String btdn = btDevice.getName();

-		sb.append("<btn>");

-		sb.append(SdlTrace.B64EncodeForXML(btdn));

-		sb.append("</btn>");

-		sb.append("<bta>").append(btDevice.getAddress()).append("</bta>");

-		sb.append("<bts>").append(btDevice.getBondState()).append("</bts>");

-		sb.append("</btp>");

-		return sb.toString();

-	} // end-method

+    @SuppressLint("MissingPermission")

+    public static String getBTDeviceInfo(BluetoothDevice btDevice) {

+        StringBuilder sb = new StringBuilder();

+        sb.append("<btp>");

+        String btdn = btDevice.getName();

+        sb.append("<btn>");

+        sb.append(SdlTrace.B64EncodeForXML(btdn));

+        sb.append("</btn>");

+        sb.append("<bta>").append(btDevice.getAddress()).append("</bta>");

+        sb.append("<bts>").append(btDevice.getBondState()).append("</bts>");

+        sb.append("</btp>");

+        return sb.toString();

+    } // end-method

 

-	// Package-scoped

-	@SuppressWarnings("deprecation")

-	public static String getLogHeader(String dumpReason, int seqNo) {

-		final String Sep = "-";

-		StringBuilder write = new StringBuilder("<?xml version=\"1.0\"?>" + "<logs>");

-		write.append("<info>");

-		StringBuilder infoBlock = new StringBuilder();

-		String hostInfo = Build.BRAND + Sep + Build.MANUFACTURER + Sep + Build.MODEL + "(" + Build.HOST + ")";

-		infoBlock.append("<host>").append(SdlTrace.B64EncodeForXML(hostInfo)).append("</host>");

-		String osv = Build.VERSION.RELEASE + " (" + Build.VERSION.CODENAME + ")";

-		infoBlock.append("<osv>").append(SdlTrace.B64EncodeForXML(osv)).append("</osv>");

-		infoBlock.append(TraceDeviceInfo.getTelephonyHeader());

+    // Package-scoped

+    @SuppressWarnings("deprecation")

+    public static String getLogHeader(String dumpReason, int seqNo) {

+        final String Sep = "-";

+        StringBuilder write = new StringBuilder("<?xml version=\"1.0\"?>" + "<logs>");

+        write.append("<info>");

+        StringBuilder infoBlock = new StringBuilder();

+        String hostInfo = Build.BRAND + Sep + Build.MANUFACTURER + Sep + Build.MODEL + "(" + Build.HOST + ")";

+        infoBlock.append("<host>").append(SdlTrace.B64EncodeForXML(hostInfo)).append("</host>");

+        String osv = Build.VERSION.RELEASE + " (" + Build.VERSION.CODENAME + ")";

+        infoBlock.append("<osv>").append(SdlTrace.B64EncodeForXML(osv)).append("</osv>");

+        infoBlock.append(TraceDeviceInfo.getTelephonyHeader());

 

-		long heapSize = Debug.getNativeHeapFreeSize() / 1024;

-		long heapAllocated = Debug.getNativeHeapAllocatedSize() / 1024;

-		infoBlock.append("<mem><hf>").append(heapSize).append("KB</hf><ha>").append(heapAllocated).append("KB</ha></mem>");

-		infoBlock.append("<np>").append(Runtime.getRuntime().availableProcessors()).append("</np>");

-		infoBlock.append("<pid>").append(getPid()).append("</pid>");

-		infoBlock.append("<tid>").append(Thread.currentThread().getId()).append("</tid>");

+        long heapSize = Debug.getNativeHeapFreeSize() / 1024;

+        long heapAllocated = Debug.getNativeHeapAllocatedSize() / 1024;

+        infoBlock.append("<mem><hf>").append(heapSize).append("KB</hf><ha>").append(heapAllocated).append("KB</ha></mem>");

+        infoBlock.append("<np>").append(Runtime.getRuntime().availableProcessors()).append("</np>");

+        infoBlock.append("<pid>").append(getPid()).append("</pid>");

+        infoBlock.append("<tid>").append(Thread.currentThread().getId()).append("</tid>");

 

-		// String dateStamp = (String)

-		// DateFormat.format("yy-MM-dd hh:mm:ss SSS", new Timestamp(baseTics));

-		Timestamp stamp = new Timestamp(SdlTrace.getBaseTics());

-		String GMTtime = stamp.toGMTString().substring(0, 19);

-		long fracSec = stamp.getNanos() / 1000000; // divide by a million

-		String fracSecStr = String.format("%03d", fracSec);

-		infoBlock.append("<utc>").append(GMTtime).append(".").append(fracSecStr).append("</utc>");

+        // String dateStamp = (String)

+        // DateFormat.format("yy-MM-dd hh:mm:ss SSS", new Timestamp(baseTics));

+        Timestamp stamp = new Timestamp(SdlTrace.getBaseTics());

+        String GMTtime = stamp.toGMTString().substring(0, 19);

+        long fracSec = stamp.getNanos() / 1000000; // divide by a million

+        String fracSecStr = String.format("%03d", fracSec);

+        infoBlock.append("<utc>").append(GMTtime).append(".").append(fracSecStr).append("</utc>");

 

-		infoBlock.append(TraceDeviceInfo.getLogHeaderBluetoothPairs());

-		infoBlock.append(getSmartDeviceLinkTraceRoot(dumpReason, seqNo));

+        infoBlock.append(TraceDeviceInfo.getLogHeaderBluetoothPairs());

+        infoBlock.append(getSmartDeviceLinkTraceRoot(dumpReason, seqNo));

 

-		write.append(infoBlock);

+        write.append(infoBlock);

 

-		write.append("</info>" + "<msgs>");

-		return write.toString();

-	} // end-method

+        write.append("</info>" + "<msgs>");

+        return write.toString();

+    } // end-method

 

 } // end-class
\ No newline at end of file
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
index 5f2452125..50f27d1ae 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
@@ -14,7 +14,7 @@
  * distribution.

  *

  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

+ * contributors may be used to endorse or promote products derived from this

  * software without specific prior written permission.

  *

  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

@@ -37,116 +37,114 @@ import android.telephony.TelephonyManager;
 

 import com.smartdevicelink.util.DebugTool;

 

-import java.util.Iterator;

 import java.util.Set;

 

 /**

  * @author vvolkman

- * 

  */

 public class TraceDeviceInfo {

-	// http://developer.android.com/guide/topics/data/data-storage.html

-

-	private static final String TAG = "TraceDeviceInfo";

-	private static TelephonyManager m_telephonyManager;

-	

-	// Constructor

-	public TraceDeviceInfo(TelephonyManager telephonyManager) {

-		m_telephonyManager = telephonyManager;

-	}

-

-	public static void setTelephonyManager(TelephonyManager telephonyManager) {

-		m_telephonyManager = telephonyManager;

-	}

-

-	public static TelephonyManager getTelephonyManager() {

-		return m_telephonyManager;

-	}

-

-	// package scoped

-	static String getTelephonyHeader() {

-		// Telephony manager can tell us a few things...

-		String info = "";

-

-		if (m_telephonyManager != null) {

-			try { // getDeviceId() requires android.permission.READ_PHONE_STATE

-				info = "<deviceid>" + m_telephonyManager.getDeviceId() + "</deviceid>";

-			} catch (Exception e1) {

-				DebugTool.logError(TAG, "Failure getting telephony device ID: " + e1.toString(), e1);

-			}

-	

-			info = "<pt>";

-			switch (m_telephonyManager.getPhoneType()) {

-				case TelephonyManager.PHONE_TYPE_NONE:

-					info += "NONE";

-					break;

-				case TelephonyManager.PHONE_TYPE_GSM:

-					info += "GSM";

-					break;

-				case TelephonyManager.PHONE_TYPE_CDMA:

-					info += "CDMA";

-					break;

-				default:

-					info += "UNKNOWN";

-			} // end-switch

-	

-			info += "</pt>" + "<nt>";

-	

-			switch (m_telephonyManager.getNetworkType()) {

-				case TelephonyManager.NETWORK_TYPE_UNKNOWN:

-					info += "UKNOWN";

-					break;

-				case TelephonyManager.NETWORK_TYPE_GPRS:

-					info += "GPRS";

-					break;

-				case TelephonyManager.NETWORK_TYPE_EDGE:

-					info += "EDGE";

-					break;

-				case TelephonyManager.NETWORK_TYPE_UMTS:

-					info += "UMTS";

-					break;

-				case TelephonyManager.NETWORK_TYPE_HSDPA:

-					info += "HSDPA";

-					break;

-				case TelephonyManager.NETWORK_TYPE_HSUPA:

-					info += "HSUPA";

-					break;

-				case TelephonyManager.NETWORK_TYPE_HSPA:

-					info += "HSPA";

-					break;

-				case TelephonyManager.NETWORK_TYPE_CDMA:

-					info += "CDMA";

-					break;

-				case TelephonyManager.NETWORK_TYPE_EVDO_0:

-					info += "EVDO_O";

-					break;

-				case TelephonyManager.NETWORK_TYPE_EVDO_A:

-					info += "EVDO_A";

-					break;

-				case TelephonyManager.NETWORK_TYPE_1xRTT:

-					info += "1xRTT";

-					break;

-				default:

-					info += "UNKNOWN";

-					break;

-			} // end-switch

-	

-			info += "</nt>";

-		} // end-if

-		return info;

-	} // end-method

-

-	// Package scoped

-	static String getLogHeaderBluetoothPairs() {

-		Set<BluetoothDevice> btDevices = BluetoothAdapter.getDefaultAdapter()

-				.getBondedDevices();

-

-		StringBuilder write = new StringBuilder("<btpairs>");

-		for (BluetoothDevice btDevice : btDevices) {

-			write.append(SdlTrace.getBTDeviceInfo(btDevice));

-		}

-		write.append("</btpairs>");

-

-		return write.toString();

-	} // end-method

+    // http://developer.android.com/guide/topics/data/data-storage.html

+

+    private static final String TAG = "TraceDeviceInfo";

+    private static TelephonyManager m_telephonyManager;

+

+    // Constructor

+    public TraceDeviceInfo(TelephonyManager telephonyManager) {

+        m_telephonyManager = telephonyManager;

+    }

+

+    public static void setTelephonyManager(TelephonyManager telephonyManager) {

+        m_telephonyManager = telephonyManager;

+    }

+

+    public static TelephonyManager getTelephonyManager() {

+        return m_telephonyManager;

+    }

+

+    // package scoped

+    static String getTelephonyHeader() {

+        // Telephony manager can tell us a few things...

+        String info = "";

+

+        if (m_telephonyManager != null) {

+            try { // getDeviceId() requires android.permission.READ_PHONE_STATE

+                info = "<deviceid>" + m_telephonyManager.getDeviceId() + "</deviceid>";

+            } catch (Exception e1) {

+                DebugTool.logError(TAG, "Failure getting telephony device ID: " + e1.toString(), e1);

+            }

+

+            info = "<pt>";

+            switch (m_telephonyManager.getPhoneType()) {

+                case TelephonyManager.PHONE_TYPE_NONE:

+                    info += "NONE";

+                    break;

+                case TelephonyManager.PHONE_TYPE_GSM:

+                    info += "GSM";

+                    break;

+                case TelephonyManager.PHONE_TYPE_CDMA:

+                    info += "CDMA";

+                    break;

+                default:

+                    info += "UNKNOWN";

+            } // end-switch

+

+            info += "</pt>" + "<nt>";

+

+            switch (m_telephonyManager.getNetworkType()) {

+                case TelephonyManager.NETWORK_TYPE_UNKNOWN:

+                    info += "UKNOWN";

+                    break;

+                case TelephonyManager.NETWORK_TYPE_GPRS:

+                    info += "GPRS";

+                    break;

+                case TelephonyManager.NETWORK_TYPE_EDGE:

+                    info += "EDGE";

+                    break;

+                case TelephonyManager.NETWORK_TYPE_UMTS:

+                    info += "UMTS";

+                    break;

+                case TelephonyManager.NETWORK_TYPE_HSDPA:

+                    info += "HSDPA";

+                    break;

+                case TelephonyManager.NETWORK_TYPE_HSUPA:

+                    info += "HSUPA";

+                    break;

+                case TelephonyManager.NETWORK_TYPE_HSPA:

+                    info += "HSPA";

+                    break;

+                case TelephonyManager.NETWORK_TYPE_CDMA:

+                    info += "CDMA";

+                    break;

+                case TelephonyManager.NETWORK_TYPE_EVDO_0:

+                    info += "EVDO_O";

+                    break;

+                case TelephonyManager.NETWORK_TYPE_EVDO_A:

+                    info += "EVDO_A";

+                    break;

+                case TelephonyManager.NETWORK_TYPE_1xRTT:

+                    info += "1xRTT";

+                    break;

+                default:

+                    info += "UNKNOWN";

+                    break;

+            } // end-switch

+

+            info += "</nt>";

+        } // end-if

+        return info;

+    } // end-method

+

+    // Package scoped

+    static String getLogHeaderBluetoothPairs() {

+        Set<BluetoothDevice> btDevices = BluetoothAdapter.getDefaultAdapter()

+                .getBondedDevices();

+

+        StringBuilder write = new StringBuilder("<btpairs>");

+        for (BluetoothDevice btDevice : btDevices) {

+            write.append(SdlTrace.getBTDeviceInfo(btDevice));

+        }

+        write.append("</btpairs>");

+

+        return write.toString();

+    } // end-method

 } // end-class
\ No newline at end of file
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java
index a8eecd484..6ae1258b1 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java
@@ -42,15 +42,15 @@ import com.smartdevicelink.transport.utl.TransportRecord;
 public abstract class MultiplexBaseTransport {
 
     // Constants that indicate the current connection state
-    public static final int STATE_NONE 			= 0;    // we're doing nothing
-    public static final int STATE_LISTEN 		= 1;    // now listening for incoming connections
-    public static final int STATE_CONNECTING	= 2; 	// now initiating an outgoing connection
-    public static final int STATE_CONNECTED 	= 3;  	// now connected to a remote device
-    public static final int STATE_ERROR 		= 4;  	// Something bad happened, we wil not try to restart the thread
+    public static final int STATE_NONE = 0;    // we're doing nothing
+    public static final int STATE_LISTEN = 1;    // now listening for incoming connections
+    public static final int STATE_CONNECTING = 2;    // now initiating an outgoing connection
+    public static final int STATE_CONNECTED = 3;    // now connected to a remote device
+    public static final int STATE_ERROR = 4;    // Something bad happened, we wil not try to restart the thread
 
     public static final String ERROR_REASON_KEY = "ERROR_REASON";
-    public static final byte REASON_SPP_ERROR   = 0x01;    // REASON = SPP error, which is sent through bundle.
-    public static final byte REASON_NONE        = 0x0;
+    public static final byte REASON_SPP_ERROR = 0x01;    // REASON = SPP error, which is sent through bundle.
+    public static final byte REASON_NONE = 0x0;
 
     public static final String LOG = "log";
     public static final String DEVICE_NAME = "device_name";
@@ -65,7 +65,7 @@ public abstract class MultiplexBaseTransport {
     public String connectedDeviceAddress = null;
 
 
-    protected MultiplexBaseTransport(Handler handler, TransportType transportType){
+    protected MultiplexBaseTransport(Handler handler, TransportType transportType) {
         this.handler = handler;
         this.transportType = transportType;
     }
@@ -75,7 +75,7 @@ public abstract class MultiplexBaseTransport {
     }
 
     protected synchronized void setState(int state, Bundle bundle) {
-        if(state == mState){
+        if (state == mState) {
             return; //State hasn't changed. Will not updated listeners.
         }
         //Log.d(TAG, "Setting state from: " +mState + " to: " +state);
@@ -89,33 +89,34 @@ public abstract class MultiplexBaseTransport {
         msg.sendToTarget();
     }
 
-    public String getAddress(){
+    public String getAddress() {
         return connectedDeviceAddress;
     }
 
-    public String getDeviceName(){
+    public String getDeviceName() {
         return connectedDeviceName;
     }
 
     /**
      * Should only be called after a connection has been established
+     *
      * @return
      */
     public TransportRecord getTransportRecord() {
-        if(transportRecord == null){
-            transportRecord = new TransportRecord(transportType,connectedDeviceAddress);
+        if (transportRecord == null) {
+            transportRecord = new TransportRecord(transportType, connectedDeviceAddress);
         }
         return transportRecord;
     }
 
     /**
-     * Return the current connection state. */
+     * Return the current connection state.
+     */
     public synchronized int getState() {
         return mState;
     }
 
-    public boolean isConnected()
-    {
+    public boolean isConnected() {
         return (mState == STATE_CONNECTED);
     }
 
@@ -124,8 +125,10 @@ public abstract class MultiplexBaseTransport {
     }
 
     protected abstract void stop(int state);
-    protected void stop(int state, byte error) {}
 
-    public abstract void write(byte[] out,  int offset, int count);
+    protected void stop(int state, byte error) {
+    }
+
+    public abstract void write(byte[] out, int offset, int count);
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
index 7995b7bde..6f02088cc 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
@@ -51,20 +51,19 @@ import java.util.UUID;
  * connections with other devices. It has a thread that listens for
  * incoming connections, a thread for connecting with a device, and a
  * thread for performing data transmissions when connected.
- * 
+ *
  * @author Joey Grover
- * 
  */
-public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
+public class MultiplexBluetoothTransport extends MultiplexBaseTransport {
     //finals
-	private static final String TAG = "Bluetooth Transport";
-    private static final UUID SERVER_UUID= new UUID(0x936DA01F9ABD4D9DL, 0x80C702AF85C822A8L);
+    private static final String TAG = "Bluetooth Transport";
+    private static final UUID SERVER_UUID = new UUID(0x936DA01F9ABD4D9DL, 0x80C702AF85C822A8L);
     // Name for the SDP record when creating server socket
-    private static final String NAME_SECURE =" SdlRouterService";
+    private static final String NAME_SECURE = " SdlRouterService";
     // Key names received from the BluetoothSerialServer Handler
     private static final long MS_TILL_TIMEOUT = 2500;
     private static final int READ_BUFFER_SIZE = 4096;
-    private final Object THREAD_LOCK =  new Object();
+    private final Object THREAD_LOCK = new Object();
 
     protected static final String SHARED_PREFS = "sdl.bluetoothprefs";
 
@@ -81,115 +80,139 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
 
     /**
      * Constructor. Prepares a new BluetoothChat session.
-     * @param handler  A Handler to send messages back to the UI Activity
+     *
+     * @param handler A Handler to send messages back to the UI Activity
      */
     public MultiplexBluetoothTransport(Handler handler) {
         super(handler, TransportType.BLUETOOTH);
     }
 
     //These methods are used so we can have a semi-static reference to the Accept Thread (Static reference inherited by housing class)
-    private synchronized AcceptThread getAcceptThread(){
-    	return mSecureAcceptThread;
+    private synchronized AcceptThread getAcceptThread() {
+        return mSecureAcceptThread;
     }
-    private synchronized void setAcceptThread(AcceptThread aThread){
-    	mSecureAcceptThread = aThread;
+
+    private synchronized void setAcceptThread(AcceptThread aThread) {
+        mSecureAcceptThread = aThread;
     }
-    protected synchronized void setStateManually(int state){
+
+    protected synchronized void setStateManually(int state) {
         //Log.d(TAG, "Setting state from: " +mState + " to: " +state);
         mState = state;
     }
 
     /**
-     * Return the current connection state. */
+     * Return the current connection state.
+     */
     public synchronized int getState() {
         return mState;
     }
 
-    public void setKeepSocketAlive(boolean keepSocketAlive){
-    	this.keepSocketAlive = keepSocketAlive;
+    public void setKeepSocketAlive(boolean keepSocketAlive) {
+        this.keepSocketAlive = keepSocketAlive;
     }
-    
+
     /**
      * Start the chat service. Specifically start AcceptThread to begin a
-     * session in listening (server) mode. Called by the Activity onResume() */
+     * session in listening (server) mode. Called by the Activity onResume()
+     */
     @SuppressLint("MissingPermission")
     @RequiresPermission(Manifest.permission.BLUETOOTH)
     public synchronized void start() {
-    	//Log.d(TAG, "Starting up Bluetooth Server to Listen");
+        //Log.d(TAG, "Starting up Bluetooth Server to Listen");
         // Cancel any thread attempting to make a connection
-        if (mConnectThread != null) {mConnectThread.cancel(); mConnectThread = null;}
+        if (mConnectThread != null) {
+            mConnectThread.cancel();
+            mConnectThread = null;
+        }
 
         // Cancel any thread currently running a connection
-        if (mConnectedThread != null) {mConnectedThread.cancel(); mConnectedThread = null;}
-        if (mConnectedWriteThread != null) {mConnectedWriteThread.cancel(); mConnectedWriteThread = null;}
+        if (mConnectedThread != null) {
+            mConnectedThread.cancel();
+            mConnectedThread = null;
+        }
+        if (mConnectedWriteThread != null) {
+            mConnectedWriteThread.cancel();
+            mConnectedWriteThread = null;
+        }
 
-       
 
         // Start the thread to listen on a BluetoothServerSocket
         if (getAcceptThread() == null
-        		&& mAdapter != null
-        		&&  mAdapter.isEnabled()) {
-        	//Log.d(TAG, "Secure thread was null, attempting to create new");
-        	setAcceptThread(new AcceptThread(true));
-            if(getAcceptThread()!=null){
-            	setState(STATE_LISTEN);
-            	 getAcceptThread().start();
+                && mAdapter != null
+                && mAdapter.isEnabled()) {
+            //Log.d(TAG, "Secure thread was null, attempting to create new");
+            setAcceptThread(new AcceptThread(true));
+            if (getAcceptThread() != null) {
+                setState(STATE_LISTEN);
+                getAcceptThread().start();
             }
         }
     }
 
     /**
      * Start the ConnectThread to initiate a connection to a remote device.
-     * @param device  The BluetoothDevice to connect
+     *
+     * @param device The BluetoothDevice to connect
      */
     public synchronized void connect(BluetoothDevice device) {
         // Cancel any thread attempting to make a connection
         if (mState == STATE_CONNECTING) {
-            if (mConnectThread != null) {mConnectThread.cancel(); mConnectThread = null;}
+            if (mConnectThread != null) {
+                mConnectThread.cancel();
+                mConnectThread = null;
+            }
         }
 
         // Cancel any thread currently running a connection
-        if (mConnectedThread != null) {mConnectedThread.cancel(); mConnectedThread = null;}
-        if (mConnectedWriteThread != null) {mConnectedWriteThread.cancel(); mConnectedWriteThread = null;}
+        if (mConnectedThread != null) {
+            mConnectedThread.cancel();
+            mConnectedThread = null;
+        }
+        if (mConnectedWriteThread != null) {
+            mConnectedWriteThread.cancel();
+            mConnectedWriteThread = null;
+        }
+
 
-        
         // Cancel the accept thread because we only want to connect to one device
-       if (mSecureAcceptThread != null) {
+        if (mSecureAcceptThread != null) {
             mSecureAcceptThread.cancel();
             mSecureAcceptThread = null;
         }
-        
+
         // Start the thread to connect with the given device
-       mConnectThread = new ConnectThread(device);
-       mConnectThread.start();
-       setState(STATE_CONNECTING);
+        mConnectThread = new ConnectThread(device);
+        mConnectThread.start();
+        setState(STATE_CONNECTING);
     }
 
     /**
      * Start the ConnectedThread to begin managing a Bluetooth connection
-     * @param socket  The BluetoothSocket on which the connection was made
-     * @param device  The BluetoothDevice that has been connected
+     *
+     * @param socket The BluetoothSocket on which the connection was made
+     * @param device The BluetoothDevice that has been connected
      */
     @RequiresPermission(Manifest.permission.BLUETOOTH)
     public synchronized void connected(BluetoothSocket socket, BluetoothDevice device) {
         // Cancel the thread that completed the connection
         if (mConnectThread != null) {
-        	mConnectThread.cancel();
-        	mConnectThread = null;
+            mConnectThread.cancel();
+            mConnectThread = null;
         }
-        
+
         // Cancel any thread currently running a connection
         if (mConnectedThread != null) {
-        	mConnectedThread.cancel(); 
-        	mConnectedThread = null;
+            mConnectedThread.cancel();
+            mConnectedThread = null;
         }
         if (mConnectedWriteThread != null) {
-        	mConnectedWriteThread.cancel(); 
-        	mConnectedWriteThread = null;
+            mConnectedWriteThread.cancel();
+            mConnectedWriteThread = null;
         }
         // Cancel the accept thread because we only want to connect to one device
         if (!keepSocketAlive && mSecureAcceptThread != null) {
-        	mSecureAcceptThread.cancel();
+            mSecureAcceptThread.cancel();
             mSecureAcceptThread = null;
         }
 
@@ -201,19 +224,19 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
         mConnectedWriteThread.start();
 
         //Store a static name of the device that is connected.
-        if(device != null){
-        	connectedDeviceName = device.getName();
+        if (device != null) {
+            connectedDeviceName = device.getName();
             connectedDeviceAddress = device.getAddress();
-            if(connectedDeviceAddress!=null){
+            if (connectedDeviceAddress != null) {
                 //Update the transport record with the address
                 transportRecord = new TransportRecord(transportType, connectedDeviceAddress);
             }
         }
-        
+
         // Send the name of the connected device back to the UI Activity
         Message msg = handler.obtainMessage(SdlRouterService.MESSAGE_DEVICE_NAME);
         Bundle bundle = new Bundle();
-        if(connectedDeviceName != null) {
+        if (connectedDeviceName != null) {
             bundle.putString(DEVICE_NAME, connectedDeviceName);
             bundle.putString(DEVICE_ADDRESS, connectedDeviceAddress);
         }
@@ -226,48 +249,53 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
      * Stop all threads
      */
     public synchronized void stop() {
-	    stop(STATE_NONE, REASON_NONE);
+        stop(STATE_NONE, REASON_NONE);
     }
 
-	protected synchronized void stop(int stateToTransitionTo) {
-		this.stop(stateToTransitionTo, REASON_NONE);
-	}
-	@Override
-	protected synchronized void stop(int stateToTransitionTo, byte error) {
-		super.stop(stateToTransitionTo, error);
+    protected synchronized void stop(int stateToTransitionTo) {
+        this.stop(stateToTransitionTo, REASON_NONE);
+    }
+
+    @Override
+    protected synchronized void stop(int stateToTransitionTo, byte error) {
+        super.stop(stateToTransitionTo, error);
         DebugTool.logInfo(TAG, "Attempting to close the bluetooth serial server");
-		if (mConnectThread != null) {
-			mConnectThread.cancel();
-			mConnectThread = null;
-		}
-
-		if (mConnectedThread != null) {
-			mConnectedThread.cancel();
-			mConnectedThread = null;
-		}
-		if (mConnectedWriteThread != null) {mConnectedWriteThread.cancel(); mConnectedWriteThread = null;}
-
-		if (mSecureAcceptThread != null) {
-			mSecureAcceptThread.cancel();
-			mSecureAcceptThread = null;
-		}
-
-		if (stateToTransitionTo == MultiplexBaseTransport.STATE_ERROR) {
-			Bundle bundle = new Bundle();
-			bundle.putByte(ERROR_REASON_KEY, error);
-			setState(stateToTransitionTo, bundle);
-		} else {
-			setState(stateToTransitionTo, null);
-		}
-	}
+        if (mConnectThread != null) {
+            mConnectThread.cancel();
+            mConnectThread = null;
+        }
+
+        if (mConnectedThread != null) {
+            mConnectedThread.cancel();
+            mConnectedThread = null;
+        }
+        if (mConnectedWriteThread != null) {
+            mConnectedWriteThread.cancel();
+            mConnectedWriteThread = null;
+        }
+
+        if (mSecureAcceptThread != null) {
+            mSecureAcceptThread.cancel();
+            mSecureAcceptThread = null;
+        }
+
+        if (stateToTransitionTo == MultiplexBaseTransport.STATE_ERROR) {
+            Bundle bundle = new Bundle();
+            bundle.putByte(ERROR_REASON_KEY, error);
+            setState(stateToTransitionTo, bundle);
+        } else {
+            setState(stateToTransitionTo, null);
+        }
+    }
 
 
     /**
      * Write to the ConnectedThread in an unsynchronized manner
+     *
      * @param out The bytes to write
-     * @see ConnectedWriteThread#write(byte[],int,int)
+     * @see ConnectedWriteThread#write(byte[], int, int)
      */
-    public void write(byte[] out,  int offset, int count) {
+    public void write(byte[] out, int offset, int count) {
         // Create temporary object
         ConnectedWriteThread r;
         // Synchronize a copy of the ConnectedThread
@@ -277,14 +305,14 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
             //r.write(out,offset,count);
         }
         // Perform the write unsynchronized
-        r.write(out,offset,count);
+        r.write(out, offset, count);
     }
-    
+
     /**
      * Indicate that the connection attempt failed and notify the UI Activity.
      */
     private void connectionFailed() {
-    	// Send a failure message back to the Activity
+        // Send a failure message back to the Activity
         Message msg = handler.obtainMessage(SdlRouterService.MESSAGE_LOG);
         Bundle bundle = new Bundle();
         bundle.putString(LOG, "Unable to connect device");
@@ -292,7 +320,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
         handler.sendMessage(msg);
 
         // Start the service over to restart listening mode
-       // BluetoothSerialServer.this.start();
+        // BluetoothSerialServer.this.start();
     }
 
     /**
@@ -308,23 +336,22 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
         stop();
 
     }
-    
-    private void timerDelayRemoveDialog(final BluetoothSocket sock){
-    	timeOutHandler = new Handler();
-    	socketRunnable = new Runnable() {
+
+    private void timerDelayRemoveDialog(final BluetoothSocket sock) {
+        timeOutHandler = new Handler();
+        socketRunnable = new Runnable() {
             public void run() {
-            	//Log.e(TAG, "BLUETOOTH SOCKET CONNECT TIMEOUT - ATTEMPT TO CLOSE SOCKET");
-            	try {
-					sock.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}         
+                //Log.e(TAG, "BLUETOOTH SOCKET CONNECT TIMEOUT - ATTEMPT TO CLOSE SOCKET");
+                try {
+                    sock.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
         };
         timeOutHandler.postDelayed(socketRunnable, MS_TILL_TIMEOUT);
     }
-    
-    
+
 
     /**
      * This thread runs while listening for incoming connections. It behaves
@@ -334,116 +361,115 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
     private class AcceptThread extends Thread {
         // The local server socket
         private final String mSocketType;
-       final BluetoothServerSocket mmServerSocket;
-        
+        final BluetoothServerSocket mmServerSocket;
+
         @SuppressLint("NewApi")
         @RequiresPermission(Manifest.permission.BLUETOOTH)
         public AcceptThread(boolean secure) {
-        	synchronized(THREAD_LOCK){
-            	//Log.d(TAG, "Creating an Accept Thread");
-            	BluetoothServerSocket tmp = null;
-            	mSocketType = secure ? "Secure":"Insecure";
-            	// Create a new listening server socket
-            	try {
-                	if (secure) {
-                		tmp = mAdapter.listenUsingRfcommWithServiceRecord(NAME_SECURE, SERVER_UUID);
-                	}
-            	} catch (IOException e) {
-                	//Log.e(TAG, "Socket Type: " + mSocketType + "listen() failed", e);
-		            MultiplexBluetoothTransport.this.stop(STATE_ERROR, REASON_SPP_ERROR);
-                	 //Let's try to shut down this thread
-            	}catch(SecurityException e2){
-            		//Log.e(TAG, "<LIVIO> Security Exception in Accept Thread - "+e2.toString());
-            		interrupt();
-            	}
-            	mmServerSocket = tmp;
-    			//Should only log on debug
-            	//BluetoothSocket mySock = getBTSocket(mmServerSocket);
-            	//Log.d(TAG, "Accepting Connections on SDP Server Port Number: " + getChannel(mySock) + "\r\n");
+            synchronized (THREAD_LOCK) {
+                //Log.d(TAG, "Creating an Accept Thread");
+                BluetoothServerSocket tmp = null;
+                mSocketType = secure ? "Secure" : "Insecure";
+                // Create a new listening server socket
+                try {
+                    if (secure) {
+                        tmp = mAdapter.listenUsingRfcommWithServiceRecord(NAME_SECURE, SERVER_UUID);
+                    }
+                } catch (IOException e) {
+                    //Log.e(TAG, "Socket Type: " + mSocketType + "listen() failed", e);
+                    MultiplexBluetoothTransport.this.stop(STATE_ERROR, REASON_SPP_ERROR);
+                    //Let's try to shut down this thread
+                } catch (SecurityException e2) {
+                    //Log.e(TAG, "<LIVIO> Security Exception in Accept Thread - "+e2.toString());
+                    interrupt();
+                }
+                mmServerSocket = tmp;
+                //Should only log on debug
+                //BluetoothSocket mySock = getBTSocket(mmServerSocket);
+                //Log.d(TAG, "Accepting Connections on SDP Server Port Number: " + getChannel(mySock) + "\r\n");
             }
         }
 
         @RequiresPermission(Manifest.permission.BLUETOOTH)
         public void run() {
-            synchronized(THREAD_LOCK){
+            synchronized (THREAD_LOCK) {
                 DebugTool.logInfo(TAG, "Socket Type: " + mSocketType +
-                    " BEGIN mAcceptThread" + this);
-            setName("AcceptThread" + mSocketType);
-
-            BluetoothSocket socket;
-            int listenAttempts = 0; 
-            
-            // Listen to the server socket if we're not connected
-            while (mState != STATE_CONNECTED) {
-                try {
-                	if(listenAttempts>=5){
-                        DebugTool.logError(TAG, "Complete failure in attempting to listen for Bluetooth connection, erroring out.");
-		                MultiplexBluetoothTransport.this.stop(STATE_ERROR, REASON_NONE);
-                		return;
-                	}
-                	listenAttempts++;
-                    DebugTool.logInfo(TAG, "SDL Bluetooth Accept thread is running.");
+                        " BEGIN mAcceptThread" + this);
+                setName("AcceptThread" + mSocketType);
 
-                    // This is a blocking call and will only return on a
-                    // successful connection or an exception
-                	if(mmServerSocket!=null){
-                	
-                    socket = mmServerSocket.accept();
-                    
-                	}
-                	else{
-                        DebugTool.logError(TAG, "Listening Socket was null, stopping the bluetooth serial server.");
-		                MultiplexBluetoothTransport.this.stop(STATE_ERROR, REASON_NONE);
-                		return;
-                	}
-                } catch (IOException e) {
-                    DebugTool.logError(TAG, "Socket Type: " + mSocketType + "accept() failed");
-	                MultiplexBluetoothTransport.this.stop(STATE_ERROR, REASON_SPP_ERROR);
-                    return;
-                }
+                BluetoothSocket socket;
+                int listenAttempts = 0;
 
-                // If a connection was accepted
-                if (socket != null) {
-                    synchronized (MultiplexBluetoothTransport.this) {
-                        switch (mState) {
-                        case STATE_LISTEN:
-                        case STATE_CONNECTING:
-                            // Situation normal. Start the connected thread.
-                        	connected(socket, socket.getRemoteDevice());
-                            
-                            break;
-                        case STATE_NONE:
-                        case STATE_CONNECTED:
-                            // Either not ready or already connected. Terminate new socket.
-                            try {
-                                DebugTool.logInfo(TAG, "Close unwanted socket");
-                               	socket.close();
-                            } catch (IOException e) {
-                                DebugTool.logError(TAG, "Could not close unwanted socket", e);
+                // Listen to the server socket if we're not connected
+                while (mState != STATE_CONNECTED) {
+                    try {
+                        if (listenAttempts >= 5) {
+                            DebugTool.logError(TAG, "Complete failure in attempting to listen for Bluetooth connection, erroring out.");
+                            MultiplexBluetoothTransport.this.stop(STATE_ERROR, REASON_NONE);
+                            return;
+                        }
+                        listenAttempts++;
+                        DebugTool.logInfo(TAG, "SDL Bluetooth Accept thread is running.");
+
+                        // This is a blocking call and will only return on a
+                        // successful connection or an exception
+                        if (mmServerSocket != null) {
+
+                            socket = mmServerSocket.accept();
+
+                        } else {
+                            DebugTool.logError(TAG, "Listening Socket was null, stopping the bluetooth serial server.");
+                            MultiplexBluetoothTransport.this.stop(STATE_ERROR, REASON_NONE);
+                            return;
+                        }
+                    } catch (IOException e) {
+                        DebugTool.logError(TAG, "Socket Type: " + mSocketType + "accept() failed");
+                        MultiplexBluetoothTransport.this.stop(STATE_ERROR, REASON_SPP_ERROR);
+                        return;
+                    }
+
+                    // If a connection was accepted
+                    if (socket != null) {
+                        synchronized (MultiplexBluetoothTransport.this) {
+                            switch (mState) {
+                                case STATE_LISTEN:
+                                case STATE_CONNECTING:
+                                    // Situation normal. Start the connected thread.
+                                    connected(socket, socket.getRemoteDevice());
+
+                                    break;
+                                case STATE_NONE:
+                                case STATE_CONNECTED:
+                                    // Either not ready or already connected. Terminate new socket.
+                                    try {
+                                        DebugTool.logInfo(TAG, "Close unwanted socket");
+                                        socket.close();
+                                    } catch (IOException e) {
+                                        DebugTool.logError(TAG, "Could not close unwanted socket", e);
+                                    }
+                                    break;
                             }
-                            break;
                         }
                     }
                 }
-            }
                 DebugTool.logInfo(TAG, mState + " END mAcceptThread, socket Type: " + mSocketType);
-        }
+            }
         }
 
         public synchronized void cancel() {
             DebugTool.logInfo(TAG, mState + " Socket Type " + mSocketType + " cancel ");
             try {
-            	if(mmServerSocket != null){
-            		mmServerSocket.close();
-            	}
-            	
+                if (mmServerSocket != null) {
+                    mmServerSocket.close();
+                }
+
             } catch (IOException e) {
-                DebugTool.logError(TAG, mState + " Socket Type " + mSocketType + " close() of server failed "+ Arrays.toString(e.getStackTrace()));
+                DebugTool.logError(TAG, mState + " Socket Type " + mSocketType + " close() of server failed " + Arrays.toString(e.getStackTrace()));
             }
         }
     }
 
-    
+
     /**
      * This thread runs while attempting to make an outgoing connection
      * with a device. It runs straight through; the connection either
@@ -452,6 +478,7 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
     private class ConnectThread extends Thread {
         private BluetoothSocket mmSocket;
         private final BluetoothDevice mmDevice;
+
         public ConnectThread(BluetoothDevice device) {
             mmDevice = device;
             //Log.d(TAG, "Attempting to connect to " + device.getName());
@@ -460,12 +487,12 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
         }
 
         @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
-        public void attemptCancelDiscovery(){
-        	try{
-        		mAdapter.cancelDiscovery();
-        	}catch(SecurityException e2){
+        public void attemptCancelDiscovery() {
+            try {
+                mAdapter.cancelDiscovery();
+            } catch (SecurityException e2) {
                 DebugTool.logError(TAG, "Don't have required permission to cancel discovery. Moving on");
-        	}
+            }
         }
 
         @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
@@ -643,10 +670,10 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
     private class ConnectedWriteThread extends Thread {
         private final BluetoothSocket mmSocket;
         private final OutputStream mmOutStream;
-        
+
 
         public ConnectedWriteThread(BluetoothSocket socket) {
-        	//Log.d(TAG, "Creating a Connected - Write Thread");
+            //Log.d(TAG, "Creating a Connected - Write Thread");
             mmSocket = socket;
             OutputStream tmpOut = null;
             setName("SDL Router BT Write Thread");
@@ -659,53 +686,56 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
             }
             mmOutStream = tmpOut;
 
-            
+
         }
+
         /**
          * Write to the connected OutStream.
-         * @param buffer  The bytes to write
+         *
+         * @param buffer The bytes to write
          */
         public void write(byte[] buffer, int offset, int count) {
             try {
-            	if(buffer==null){
+                if (buffer == null) {
                     DebugTool.logWarning(TAG, "Can't write to device, nothing to send");
-            		return;
-            	}
-            	//This would be a good spot to log out all bytes received
-            	mmOutStream.write(buffer, offset, count);
-            	//Log.w(TAG, "Wrote out to device: bytes = "+ count);
-            } catch (IOException|NullPointerException e) { // STRICTLY to catch mmOutStream NPE
+                    return;
+                }
+                //This would be a good spot to log out all bytes received
+                mmOutStream.write(buffer, offset, count);
+                //Log.w(TAG, "Wrote out to device: bytes = "+ count);
+            } catch (IOException | NullPointerException e) { // STRICTLY to catch mmOutStream NPE
                 // Exception during write
-            	//OMG! WE MUST NOT BE CONNECTED ANYMORE! LET THE USER KNOW
+                //OMG! WE MUST NOT BE CONNECTED ANYMORE! LET THE USER KNOW
                 DebugTool.logError(TAG, "Error sending bytes to connected device!");
-            	connectionLost();
+                connectionLost();
             }
         }
 
         public synchronized void cancel() {
             try {
-            	if(mmOutStream!=null){
-            		mmOutStream.flush();
-            		mmOutStream.close();
-                	
-            	}
-            	if(mmSocket!=null){
-            		mmSocket.close();
-            	}
+                if (mmOutStream != null) {
+                    mmOutStream.flush();
+                    mmOutStream.close();
+
+                }
+                if (mmSocket != null) {
+                    mmSocket.close();
+                }
             } catch (IOException e) {
                 // close() of connect socket failed
                 DebugTool.logInfo(TAG, "Write Thread: " + e.getMessage());
             }
         }
     }
-    
+
     private class ConnectedThread extends Thread {
         private final BluetoothSocket mmSocket;
         private final InputStream mmInStream;
-    	final SdlPsm psm;
+        final SdlPsm psm;
+
         public ConnectedThread(BluetoothSocket socket) {
-        	this.psm = new SdlPsm();
-        	//Log.d(TAG, "Creating a Connected - Read Thread");
+            this.psm = new SdlPsm();
+            //Log.d(TAG, "Creating a Connected - Read Thread");
             mmSocket = socket;
             InputStream tmpIn = null;
             setName("SDL Router BT Read Thread");
@@ -714,27 +744,27 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
                 tmpIn = socket.getInputStream();
             } catch (IOException e) {
                 // temp sockets not created
-                DebugTool.logError(TAG, "Connected Read Thread: "+e.getMessage());
+                DebugTool.logError(TAG, "Connected Read Thread: " + e.getMessage());
             }
             mmInStream = tmpIn;
-            
+
         }
-        
-		@SuppressLint("NewApi")
-		public void run() {
+
+        @SuppressLint("NewApi")
+        public void run() {
             DebugTool.logInfo(TAG, "Running the Connected Thread");
             byte input = 0;
             int bytesRead = 0;
             byte[] buffer = new byte[READ_BUFFER_SIZE];
             // Keep listening to the InputStream while connected
             boolean stateProgress;
-            
+
             psm.reset();
-           
+
             while (true) {
                 try {
                     bytesRead = mmInStream.read(buffer);
-                   // Log.i(getClass().getName(), "Received " + bytesRead + " bytes from Bluetooth");
+                    // Log.i(getClass().getName(), "Received " + bytesRead + " bytes from Bluetooth");
                     for (int i = 0; i < bytesRead; i++) {
                         input = buffer[i];
 
@@ -754,12 +784,12 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
                             psm.reset();
                         }
                     }
-                } catch (IOException|NullPointerException e) { // NPE is ONLY to catch error on mmInStream
+                } catch (IOException | NullPointerException e) { // NPE is ONLY to catch error on mmInStream
                     DebugTool.logError(TAG, "Lost connection in the Connected Thread");
-                	if(DebugTool.isDebugEnabled()){
-                	    e.printStackTrace();
+                    if (DebugTool.isDebugEnabled()) {
+                        e.printStackTrace();
                     }
-                	connectionLost();
+                    connectionLost();
                     break;
                 }
             }
@@ -768,77 +798,76 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
 
         public synchronized void cancel() {
             try {
-            	//Log.d(TAG, "Calling Cancel in the Read thread");
-            	if(mmInStream!=null){
-            		mmInStream.close();
-            	}
-                if(mmSocket!=null){
-                	mmSocket.close();
+                //Log.d(TAG, "Calling Cancel in the Read thread");
+                if (mmInStream != null) {
+                    mmInStream.close();
+                }
+                if (mmSocket != null) {
+                    mmSocket.close();
                 }
-                
-            } catch (IOException|NullPointerException e) { // NPE is ONLY to catch error on mmInStream
-            	// Log.trace(TAG, "Read Thread: " + e.getMessage());
+
+            } catch (IOException | NullPointerException e) { // NPE is ONLY to catch error on mmInStream
+                // Log.trace(TAG, "Read Thread: " + e.getMessage());
                 // Socket or stream is already closed
             }
         }
     }
-    
-
-	
-	public BluetoothSocket getBTSocket(BluetoothServerSocket bsSocket){
-	    if(bsSocket == null){
-	    	return null;
-	    }
-		Field[] f = bsSocket.getClass().getDeclaredFields();
-
-	    //int channel = -1;
-	    BluetoothSocket mySocket;
-	    for (Field field : f) {
-	        if(field.getName().equals("mSocket")){
-	            field.setAccessible(true);
-	            try {
-	                
-	            	mySocket = (BluetoothSocket) field.get(bsSocket);
-	            	return mySocket;
-	            	//channel = field.getInt(bsSocket);
-	            } catch (IllegalArgumentException e) {
-	                e.printStackTrace();
-	            } catch (IllegalAccessException e) {
-	                e.printStackTrace();
-	            }
-	            field.setAccessible(false);
-	        }
-	    }
-
-	    return null;
-	}
-	
-	public int getChannel(BluetoothSocket bsSocket){
-
-		int channel = -1;
-		if (bsSocket == null){
-			return channel;
-		}
-	    
-		Field[] f = bsSocket.getClass().getDeclaredFields();
-	    
-	    for (Field field : f) {
-	        if(field.getName().equals("mPort")){
-	            field.setAccessible(true);
-	            try {
-	                
-	            	
-	            	channel = field.getInt(bsSocket);
-	            } catch (IllegalArgumentException e) {
-	                e.printStackTrace();
-	            } catch (IllegalAccessException e) {
-	                e.printStackTrace();
-	            }
-	            field.setAccessible(false);
-	        }
-	    }
-
-	    return channel;
-	}
-	
+
+
+    public BluetoothSocket getBTSocket(BluetoothServerSocket bsSocket) {
+        if (bsSocket == null) {
+            return null;
+        }
+        Field[] f = bsSocket.getClass().getDeclaredFields();
+
+        //int channel = -1;
+        BluetoothSocket mySocket;
+        for (Field field : f) {
+            if (field.getName().equals("mSocket")) {
+                field.setAccessible(true);
+                try {
+
+                    mySocket = (BluetoothSocket) field.get(bsSocket);
+                    return mySocket;
+                    //channel = field.getInt(bsSocket);
+                } catch (IllegalArgumentException e) {
+                    e.printStackTrace();
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                field.setAccessible(false);
+            }
+        }
+
+        return null;
+    }
+
+    public int getChannel(BluetoothSocket bsSocket) {
+
+        int channel = -1;
+        if (bsSocket == null) {
+            return channel;
+        }
+
+        Field[] f = bsSocket.getClass().getDeclaredFields();
+
+        for (Field field : f) {
+            if (field.getName().equals("mPort")) {
+                field.setAccessible(true);
+                try {
+
+
+                    channel = field.getInt(bsSocket);
+                } catch (IllegalArgumentException e) {
+                    e.printStackTrace();
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                field.setAccessible(false);
+            }
+        }
+
+        return channel;
+    }
+
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java
index c640f67ba..7c39ce638 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTcpTransport.java
@@ -56,393 +56,395 @@ import static com.smartdevicelink.util.NativeLogTool.logInfo;
 
 public class MultiplexTcpTransport extends MultiplexBaseTransport {
 
-	private static final String TAG = "MultiplexTcpTransport";
+    private static final String TAG = "MultiplexTcpTransport";
 
-	private static final int READ_BUFFER_SIZE = 4096;
-	private static final int RECONNECT_DELAY = 5000;
-	private static final int RECONNECT_RETRY_COUNT = 30;
+    private static final int READ_BUFFER_SIZE = 4096;
+    private static final int RECONNECT_DELAY = 5000;
+    private static final int RECONNECT_RETRY_COUNT = 30;
 
     private final String ipAddress;
-	private final int port;
-	private final boolean autoReconnect;
-	private Socket mSocket = null;
-	private InputStream mInputStream = null;
-	private OutputStream mOutputStream = null;
-	private MultiplexTcpTransport.TcpTransportThread mThread = null;
-	private WriterThread writerThread;
-	private final Context mContext;
-
-
-	public MultiplexTcpTransport(int port, String ipAddress, boolean autoReconnect, Handler handler, Context context) {
-		super(handler, TransportType.TCP);
-		this.ipAddress = ipAddress;
-		this.port = port;
+    private final int port;
+    private final boolean autoReconnect;
+    private Socket mSocket = null;
+    private InputStream mInputStream = null;
+    private OutputStream mOutputStream = null;
+    private MultiplexTcpTransport.TcpTransportThread mThread = null;
+    private WriterThread writerThread;
+    private final Context mContext;
+
+
+    public MultiplexTcpTransport(int port, String ipAddress, boolean autoReconnect, Handler handler, Context context) {
+        super(handler, TransportType.TCP);
+        this.ipAddress = ipAddress;
+        this.port = port;
         connectedDeviceAddress = ipAddress + ":" + port;
-		this.autoReconnect = autoReconnect;
-		mContext = context;
-		setState(STATE_NONE);
-	}
-
-	public synchronized void start(){
-		if(getState() == STATE_NONE) {
-			synchronized (this) {
-				setState(STATE_CONNECTING);
-				logInfo("TCPTransport: openConnection request accepted. Starting transport thread");
-				try {
-					mThread = new MultiplexTcpTransport.TcpTransportThread();
-					mThread.setDaemon(true);
-					mThread.start();
-
-					// Initialize the SiphonServer
-					if (SiphonServer.getSiphonEnabledStatus()) {
-						SiphonServer.init();
-					}
-
-				} catch (Exception e) {
-					logError(TAG, "TCPTransport: Exception during transport thread starting", e);
-				}
-			}
-		} else {
-			logInfo("TCPTransport: openConnection request rejected. Another connection is not finished");
-		}
-
-		// Send the name of the connected device back to the UI Activity
-		Message msg = handler.obtainMessage(SdlRouterService.MESSAGE_DEVICE_NAME);
-		Bundle bundle = new Bundle();
-		bundle.putString(DEVICE_NAME, connectedDeviceName);
-		bundle.putString(DEVICE_ADDRESS, connectedDeviceAddress);
-		msg.setData(bundle);
-		handler.sendMessage(msg);
-	}
-
-
-	@Override
-	protected void stop(int state) {
-		try {
-			if(mThread != null) {
-				mThread.halt();
-				mThread.interrupt();
-			}
-
-			if (writerThread != null) {
-				writerThread.cancel();
-				writerThread = null;
-			}
-
-			if(mSocket != null){
-				mSocket.close();
-			}
-			mSocket = null;
-		} catch (IOException e) {
-			logError(TAG,"TCPTransport.disconnect: Exception during disconnect: " + e.getMessage());
-		}
-
-		setState(state);
-	}
-
-	@Override
-	public void write(byte[] out, int offset, int count) {
-		// Create temporary object
-		MultiplexTcpTransport.WriterThread r;
-		// Synchronize a copy of the ConnectedThread
-		synchronized (this) {
-			if (mState != STATE_CONNECTED) return;
-			r = writerThread;
-			//r.write(out,offset,count);
-		}
-		// Perform the write unsynchronized
-		r.write(out,offset,count);
-	}
-
-	/**
-	 * Implementation of waiting required delay that cannot be interrupted
-	 * @param timeMs Time in milliseconds of required delay
-	 */
-	private void waitFor(long timeMs) {
-		long endTime = System.currentTimeMillis() +timeMs;
-		while (System.currentTimeMillis() < endTime) {
-			synchronized (this) {
-				try {
-					wait(endTime - System.currentTimeMillis());
-				} catch (Exception e) {
-					// Nothing To Do, simple wait
-				}
-			}
-		}
-	}
-
-	private void startWriteThread() {
-		if (writerThread == null) {
-			writerThread =  new MultiplexTcpTransport.WriterThread();
-			writerThread.start();
-		}
-	}
-
-	/**
-	 * Internal class that represents separate thread, that does actual work, related to connecting/reading/writing data
-	 */
-	private class TcpTransportThread extends Thread {
-		final SdlPsm psm;
-		public TcpTransportThread(){
-			psm = new SdlPsm();
-		}
-		/**
-		 * Represents current thread state - halted or not. This flag is used to change internal behavior depending
-		 * on current state.
-		 */
-		private Boolean isHalted = false;
-
-		/**
-		 * Method that marks thread as halted.
-		 */
-		public void halt() {
-			isHalted = true;
-		}
-
-		/**
-		 * Tries to connect to the SmartDeviceLink core. Behavior depends autoReconnect configuration param:
-		 *      a) If autoReconnect is false, then only one connect try will be performed.
-		 *      b) If autoReconnect is true, then in case of connection error continuous reconnect will be performed
-		 *          after short delay until connection will be established or retry count will be reached
-		 *
-		 * @return true if connection established and false otherwise
-		 */
-		private boolean connect() {
-			boolean bConnected;
-			int remainingRetry = RECONNECT_RETRY_COUNT;
-
-			synchronized (MultiplexTcpTransport.this) {
-				do {
-					try {
-
-						if ((null != mSocket) && (!mSocket.isClosed())) {
-							logInfo("TCPTransport.connect: Socket is not closed. Trying to close it");
-							mSocket.close();
-						}
-
-						logInfo(String.format("TCPTransport.connect: Socket is closed. Trying to connect to %s", getAddress()));
-						mSocket = WiFiSocketFactory.createSocket(mContext);
-						mSocket.connect(new InetSocketAddress(ipAddress, port));
-						mOutputStream = mSocket.getOutputStream();
-						mInputStream = mSocket.getInputStream();
-						startWriteThread();
-					} catch (IOException e) {
-						logError(TAG, "TCPTransport.connect: Exception during connect stage: " + e.getMessage());
-					}
-
-					bConnected = (null != mSocket) && mSocket.isConnected();
-
-					if(bConnected){
-						logInfo("TCPTransport.connect: Socket connected");
-						setState(STATE_CONNECTED);
-					}else{
-						if(autoReconnect){
-							remainingRetry--;
-							logInfo(String.format(Locale.US,"TCPTransport.connect: Socket not connected. AutoReconnect is ON. retryCount is: %d. Waiting for reconnect delay: %d"
-									, remainingRetry, RECONNECT_DELAY));
-							waitFor(RECONNECT_DELAY);
-						} else {
-							logInfo("TCPTransport.connect: Socket not connected. AutoReconnect is OFF");
-						}
-					}
-				} while ((!bConnected) && (autoReconnect) && (remainingRetry > 0) && (!isHalted));
-
-				return bConnected;
-			}
-		}
-
-		/**
-		 * Performs actual thread work
-		 */
-		@Override
-		public void run() {
-			logInfo("TCPTransport.run: transport thread created. Starting connect stage");
-			psm.reset();
-			while(!isHalted) {
-				setState(STATE_CONNECTING);
-				if(!connect()){
-					if (isHalted) {
-						logInfo("TCPTransport.run: Connection failed, but thread already halted");
-					} else {
-						MultiplexTcpTransport.this.stop(STATE_NONE);
-					}
-					break;
-				}
-
-				synchronized (MultiplexTcpTransport.this) {
-					setState(STATE_CONNECTED);
-				}
-
-				byte input;
-				byte[] buffer = new byte[READ_BUFFER_SIZE];
-				int bytesRead;
-				boolean stateProgress = false;
-				while (!isHalted) {
-					//logInfo("TCPTransport.run: Waiting for data...");
-					try {
-						//input = (byte) mInputStream.read();
-						bytesRead = mInputStream.read(buffer);
-					} catch (IOException e) {
-						internalHandleStreamReadError();
-						break;
-					}
-
-					if (bytesRead == -1) {
-						// Javadoc says -1 indicates end of input stream.  In TCP case this means loss
-						// of connection from HU (no exception is thrown when HU connection is lost).
-						internalHandleStreamReadError();
-						break;
-					}
-
-					synchronized (MultiplexTcpTransport.this) {
-						if (mThread.isInterrupted()) {
-							logInfo("TCPTransport.run: Got new data but thread is interrupted");
-							break;
-						}
-					}
-					for (int i = 0; i < bytesRead; i++) {
-						//logInfo("TCPTransport.run: Got new data");
-						// Send the response of what we received
-						input = buffer[i];
-						stateProgress = psm.handleByte(input);
-						if (!stateProgress) {//We are trying to weed through the bad packet info until we get something
-
-							//Log.w(TAG, "Packet State Machine did not move forward from state - "+ psm.getState()+". PSM being Reset.");
-							psm.reset();
-						}
-
-						if (psm.getState() == SdlPsm.FINISHED_STATE)
-						{
-							synchronized (MultiplexTcpTransport.this) {
-								DebugTool.logInfo(TAG, "Packet formed, sending off");
-								SdlPacket packet = psm.getFormedPacket();
-								packet.setTransportRecord(getTransportRecord());
-								handler.obtainMessage(SdlRouterService.MESSAGE_READ, packet).sendToTarget();
-							}
-							//We put a trace statement in the message read so we can avoid all the extra bytes
-							psm.reset();
-						}
-						//FIXME logInfo(String.format("TCPTransport.run: Received %d bytes", bytesRead));
-					}
-				}
-			}
-
-			logInfo("TCPTransport.run: Thread terminated");
-			setState(STATE_NONE);
-		}
-
-		/**
-		 * Internal handling of Tcp disconnection
-		 */
-		private void internalHandleTCPDisconnect() {
-			if(isHalted){
-				logInfo("TCPTransport.run: TCP disconnect received, but thread already halted");
-			} else {
-				logInfo("TCPTransport.run: TCP disconnect received");
-				MultiplexTcpTransport.this.stop(STATE_NONE);
-			}
-		}
-
-		/**
-		 * Internal handling of reading data from input stream
-		 */
-		private void internalHandleStreamReadError() {
-			if(isHalted){
-				logError(TAG, "TCPTransport.run: Exception during reading data, but thread already halted");
-			} else {
-				logError(TAG, "TCPTransport.run: Exception during reading data");
-				MultiplexTcpTransport.this.stop(STATE_NONE);
-			}
-		}
-	}
-
-	private class WriterThread extends Thread {
-		private boolean isHalted = false;
-		private final boolean mVerbose = false;
-		final BlockingQueue<OutPacket> packetQueue = new LinkedBlockingQueue<>();
-
-		@Override
-		public void run() {
-			while(!isHalted){
-				try{
-					OutPacket packet = packetQueue.take();
-					if(packet == null){
-						continue;
-					}
-
-					OutputStream out;
-					synchronized (MultiplexTcpTransport.this) {
-						out = mOutputStream;
-					}
-
-					if ((out != null) && (!isHalted)) {
-						try {
-							out.write(packet.bytes, packet.offset, packet.count);
-							if (mVerbose) {
-								logInfo("TCPTransport.sendBytesOverTransport: successfully sent data");
-							}
-						} catch (IOException e) {
-							logError(TAG, "TCPTransport.sendBytesOverTransport: error during sending data: " + e.getMessage());
-						}
-					} else {
-						if (isHalted) {
-							logError(TAG, "TCPTransport: sendBytesOverTransport request accepted, thread is cancelled");
-						} else {
-							logError(TAG, "TCPTransport: sendBytesOverTransport request accepted, but output stream is null");
-						}
-					}
-
-				}catch(InterruptedException e){
-					break;
-				}
-			}
-		}
-
-		public void write(byte[] msgBytes, int offset, int count) {
-			if ((msgBytes == null) || (msgBytes.length == 0)) {
-				logInfo("TCPTransport.sendBytesOverTransport: nothing to send");
-				return;
-			}
-
-			if (offset + count > msgBytes.length) {
-				count = msgBytes.length - offset;
-			}
-			packetQueue.add(new OutPacket(msgBytes, offset, count));
-
-		}
-
-		public synchronized void cancel() {
-			isHalted = true;
-			if (mOutputStream != null) {
-				synchronized (MultiplexTcpTransport.this) {
-					try {
-						mOutputStream.flush();
-					} catch (IOException e) {
-						logError(TAG, "TCPTransport flushing output stream failed: " + e.getMessage());
-					}
-
-					try {
-						mOutputStream.close();
-					} catch (IOException e) {
-						logError(TAG, "TCPTransport closing output stream failed: " + e.getMessage());
-					}
-					mOutputStream = null;
-				}
-			}
-		}
-	}
-
-	private final class OutPacket{
-		final byte[] bytes;
-		final int count;
-		final int offset;
-
-		OutPacket(byte[] bytes, int offset, int count){
-			this.bytes = bytes;
-			this.offset = offset;
-			this.count = count;
-		}
-	}
+        this.autoReconnect = autoReconnect;
+        mContext = context;
+        setState(STATE_NONE);
+    }
+
+    public synchronized void start() {
+        if (getState() == STATE_NONE) {
+            synchronized (this) {
+                setState(STATE_CONNECTING);
+                logInfo("TCPTransport: openConnection request accepted. Starting transport thread");
+                try {
+                    mThread = new MultiplexTcpTransport.TcpTransportThread();
+                    mThread.setDaemon(true);
+                    mThread.start();
+
+                    // Initialize the SiphonServer
+                    if (SiphonServer.getSiphonEnabledStatus()) {
+                        SiphonServer.init();
+                    }
+
+                } catch (Exception e) {
+                    logError(TAG, "TCPTransport: Exception during transport thread starting", e);
+                }
+            }
+        } else {
+            logInfo("TCPTransport: openConnection request rejected. Another connection is not finished");
+        }
+
+        // Send the name of the connected device back to the UI Activity
+        Message msg = handler.obtainMessage(SdlRouterService.MESSAGE_DEVICE_NAME);
+        Bundle bundle = new Bundle();
+        bundle.putString(DEVICE_NAME, connectedDeviceName);
+        bundle.putString(DEVICE_ADDRESS, connectedDeviceAddress);
+        msg.setData(bundle);
+        handler.sendMessage(msg);
+    }
+
+
+    @Override
+    protected void stop(int state) {
+        try {
+            if (mThread != null) {
+                mThread.halt();
+                mThread.interrupt();
+            }
+
+            if (writerThread != null) {
+                writerThread.cancel();
+                writerThread = null;
+            }
+
+            if (mSocket != null) {
+                mSocket.close();
+            }
+            mSocket = null;
+        } catch (IOException e) {
+            logError(TAG, "TCPTransport.disconnect: Exception during disconnect: " + e.getMessage());
+        }
+
+        setState(state);
+    }
+
+    @Override
+    public void write(byte[] out, int offset, int count) {
+        // Create temporary object
+        MultiplexTcpTransport.WriterThread r;
+        // Synchronize a copy of the ConnectedThread
+        synchronized (this) {
+            if (mState != STATE_CONNECTED) return;
+            r = writerThread;
+            //r.write(out,offset,count);
+        }
+        // Perform the write unsynchronized
+        r.write(out, offset, count);
+    }
+
+    /**
+     * Implementation of waiting required delay that cannot be interrupted
+     *
+     * @param timeMs Time in milliseconds of required delay
+     */
+    private void waitFor(long timeMs) {
+        long endTime = System.currentTimeMillis() + timeMs;
+        while (System.currentTimeMillis() < endTime) {
+            synchronized (this) {
+                try {
+                    wait(endTime - System.currentTimeMillis());
+                } catch (Exception e) {
+                    // Nothing To Do, simple wait
+                }
+            }
+        }
+    }
+
+    private void startWriteThread() {
+        if (writerThread == null) {
+            writerThread = new MultiplexTcpTransport.WriterThread();
+            writerThread.start();
+        }
+    }
+
+    /**
+     * Internal class that represents separate thread, that does actual work, related to connecting/reading/writing data
+     */
+    private class TcpTransportThread extends Thread {
+        final SdlPsm psm;
+
+        public TcpTransportThread() {
+            psm = new SdlPsm();
+        }
+
+        /**
+         * Represents current thread state - halted or not. This flag is used to change internal behavior depending
+         * on current state.
+         */
+        private Boolean isHalted = false;
+
+        /**
+         * Method that marks thread as halted.
+         */
+        public void halt() {
+            isHalted = true;
+        }
+
+        /**
+         * Tries to connect to the SmartDeviceLink core. Behavior depends autoReconnect configuration param:
+         * a) If autoReconnect is false, then only one connect try will be performed.
+         * b) If autoReconnect is true, then in case of connection error continuous reconnect will be performed
+         * after short delay until connection will be established or retry count will be reached
+         *
+         * @return true if connection established and false otherwise
+         */
+        private boolean connect() {
+            boolean bConnected;
+            int remainingRetry = RECONNECT_RETRY_COUNT;
+
+            synchronized (MultiplexTcpTransport.this) {
+                do {
+                    try {
+
+                        if ((null != mSocket) && (!mSocket.isClosed())) {
+                            logInfo("TCPTransport.connect: Socket is not closed. Trying to close it");
+                            mSocket.close();
+                        }
+
+                        logInfo(String.format("TCPTransport.connect: Socket is closed. Trying to connect to %s", getAddress()));
+                        mSocket = WiFiSocketFactory.createSocket(mContext);
+                        mSocket.connect(new InetSocketAddress(ipAddress, port));
+                        mOutputStream = mSocket.getOutputStream();
+                        mInputStream = mSocket.getInputStream();
+                        startWriteThread();
+                    } catch (IOException e) {
+                        logError(TAG, "TCPTransport.connect: Exception during connect stage: " + e.getMessage());
+                    }
+
+                    bConnected = (null != mSocket) && mSocket.isConnected();
+
+                    if (bConnected) {
+                        logInfo("TCPTransport.connect: Socket connected");
+                        setState(STATE_CONNECTED);
+                    } else {
+                        if (autoReconnect) {
+                            remainingRetry--;
+                            logInfo(String.format(Locale.US, "TCPTransport.connect: Socket not connected. AutoReconnect is ON. retryCount is: %d. Waiting for reconnect delay: %d"
+                                    , remainingRetry, RECONNECT_DELAY));
+                            waitFor(RECONNECT_DELAY);
+                        } else {
+                            logInfo("TCPTransport.connect: Socket not connected. AutoReconnect is OFF");
+                        }
+                    }
+                } while ((!bConnected) && (autoReconnect) && (remainingRetry > 0) && (!isHalted));
+
+                return bConnected;
+            }
+        }
+
+        /**
+         * Performs actual thread work
+         */
+        @Override
+        public void run() {
+            logInfo("TCPTransport.run: transport thread created. Starting connect stage");
+            psm.reset();
+            while (!isHalted) {
+                setState(STATE_CONNECTING);
+                if (!connect()) {
+                    if (isHalted) {
+                        logInfo("TCPTransport.run: Connection failed, but thread already halted");
+                    } else {
+                        MultiplexTcpTransport.this.stop(STATE_NONE);
+                    }
+                    break;
+                }
+
+                synchronized (MultiplexTcpTransport.this) {
+                    setState(STATE_CONNECTED);
+                }
+
+                byte input;
+                byte[] buffer = new byte[READ_BUFFER_SIZE];
+                int bytesRead;
+                boolean stateProgress = false;
+                while (!isHalted) {
+                    //logInfo("TCPTransport.run: Waiting for data...");
+                    try {
+                        //input = (byte) mInputStream.read();
+                        bytesRead = mInputStream.read(buffer);
+                    } catch (IOException e) {
+                        internalHandleStreamReadError();
+                        break;
+                    }
+
+                    if (bytesRead == -1) {
+                        // Javadoc says -1 indicates end of input stream.  In TCP case this means loss
+                        // of connection from HU (no exception is thrown when HU connection is lost).
+                        internalHandleStreamReadError();
+                        break;
+                    }
+
+                    synchronized (MultiplexTcpTransport.this) {
+                        if (mThread.isInterrupted()) {
+                            logInfo("TCPTransport.run: Got new data but thread is interrupted");
+                            break;
+                        }
+                    }
+                    for (int i = 0; i < bytesRead; i++) {
+                        //logInfo("TCPTransport.run: Got new data");
+                        // Send the response of what we received
+                        input = buffer[i];
+                        stateProgress = psm.handleByte(input);
+                        if (!stateProgress) {//We are trying to weed through the bad packet info until we get something
+
+                            //Log.w(TAG, "Packet State Machine did not move forward from state - "+ psm.getState()+". PSM being Reset.");
+                            psm.reset();
+                        }
+
+                        if (psm.getState() == SdlPsm.FINISHED_STATE) {
+                            synchronized (MultiplexTcpTransport.this) {
+                                DebugTool.logInfo(TAG, "Packet formed, sending off");
+                                SdlPacket packet = psm.getFormedPacket();
+                                packet.setTransportRecord(getTransportRecord());
+                                handler.obtainMessage(SdlRouterService.MESSAGE_READ, packet).sendToTarget();
+                            }
+                            //We put a trace statement in the message read so we can avoid all the extra bytes
+                            psm.reset();
+                        }
+                        //FIXME logInfo(String.format("TCPTransport.run: Received %d bytes", bytesRead));
+                    }
+                }
+            }
+
+            logInfo("TCPTransport.run: Thread terminated");
+            setState(STATE_NONE);
+        }
+
+        /**
+         * Internal handling of Tcp disconnection
+         */
+        private void internalHandleTCPDisconnect() {
+            if (isHalted) {
+                logInfo("TCPTransport.run: TCP disconnect received, but thread already halted");
+            } else {
+                logInfo("TCPTransport.run: TCP disconnect received");
+                MultiplexTcpTransport.this.stop(STATE_NONE);
+            }
+        }
+
+        /**
+         * Internal handling of reading data from input stream
+         */
+        private void internalHandleStreamReadError() {
+            if (isHalted) {
+                logError(TAG, "TCPTransport.run: Exception during reading data, but thread already halted");
+            } else {
+                logError(TAG, "TCPTransport.run: Exception during reading data");
+                MultiplexTcpTransport.this.stop(STATE_NONE);
+            }
+        }
+    }
+
+    private class WriterThread extends Thread {
+        private boolean isHalted = false;
+        private final boolean mVerbose = false;
+        final BlockingQueue<OutPacket> packetQueue = new LinkedBlockingQueue<>();
+
+        @Override
+        public void run() {
+            while (!isHalted) {
+                try {
+                    OutPacket packet = packetQueue.take();
+                    if (packet == null) {
+                        continue;
+                    }
+
+                    OutputStream out;
+                    synchronized (MultiplexTcpTransport.this) {
+                        out = mOutputStream;
+                    }
+
+                    if ((out != null) && (!isHalted)) {
+                        try {
+                            out.write(packet.bytes, packet.offset, packet.count);
+                            if (mVerbose) {
+                                logInfo("TCPTransport.sendBytesOverTransport: successfully sent data");
+                            }
+                        } catch (IOException e) {
+                            logError(TAG, "TCPTransport.sendBytesOverTransport: error during sending data: " + e.getMessage());
+                        }
+                    } else {
+                        if (isHalted) {
+                            logError(TAG, "TCPTransport: sendBytesOverTransport request accepted, thread is cancelled");
+                        } else {
+                            logError(TAG, "TCPTransport: sendBytesOverTransport request accepted, but output stream is null");
+                        }
+                    }
+
+                } catch (InterruptedException e) {
+                    break;
+                }
+            }
+        }
+
+        public void write(byte[] msgBytes, int offset, int count) {
+            if ((msgBytes == null) || (msgBytes.length == 0)) {
+                logInfo("TCPTransport.sendBytesOverTransport: nothing to send");
+                return;
+            }
+
+            if (offset + count > msgBytes.length) {
+                count = msgBytes.length - offset;
+            }
+            packetQueue.add(new OutPacket(msgBytes, offset, count));
+
+        }
+
+        public synchronized void cancel() {
+            isHalted = true;
+            if (mOutputStream != null) {
+                synchronized (MultiplexTcpTransport.this) {
+                    try {
+                        mOutputStream.flush();
+                    } catch (IOException e) {
+                        logError(TAG, "TCPTransport flushing output stream failed: " + e.getMessage());
+                    }
+
+                    try {
+                        mOutputStream.close();
+                    } catch (IOException e) {
+                        logError(TAG, "TCPTransport closing output stream failed: " + e.getMessage());
+                    }
+                    mOutputStream = null;
+                }
+            }
+        }
+    }
+
+    private final class OutPacket {
+        final byte[] bytes;
+        final int count;
+        final int offset;
+
+        OutPacket(byte[] bytes, int offset, int count) {
+            this.bytes = bytes;
+            this.offset = offset;
+            this.count = count;
+        }
+    }
 
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
index e2dd06521..343aa6c97 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
@@ -42,247 +42,259 @@ import java.util.Arrays;
 import java.util.List;
 
 @SuppressWarnings("WeakerAccess")
-public class MultiplexTransportConfig extends BaseTransportConfig{
+public class MultiplexTransportConfig extends BaseTransportConfig {
 
     /**
      * Multiplexing security will be turned off. All router services will be trusted.
      */
-    public static final int FLAG_MULTI_SECURITY_OFF         = 0x00;
+    public static final int FLAG_MULTI_SECURITY_OFF = 0x00;
     /**
-     *  Multiplexing security will be minimal. Only trusted router services will be used. Trusted router list will be obtain from 
-     *  server. List will be refreshed every <b>30 days</b> or during next connection session if an SDL enabled app has been
-     *  installed or uninstalled. 
+     * Multiplexing security will be minimal. Only trusted router services will be used. Trusted router list will be obtain from
+     * server. List will be refreshed every <b>30 days</b> or during next connection session if an SDL enabled app has been
+     * installed or uninstalled.
      */
-    public static final int FLAG_MULTI_SECURITY_LOW         = 0x10;
+    public static final int FLAG_MULTI_SECURITY_LOW = 0x10;
     /**
-     *  Multiplexing security will be on at a normal level. Only trusted router services will be used. Trusted router list will be obtain from 
-     *  server. List will be refreshed every <b>7 days</b> or during next connection session if an SDL enabled app has been
-     *  installed or uninstalled. 
+     * Multiplexing security will be on at a normal level. Only trusted router services will be used. Trusted router list will be obtain from
+     * server. List will be refreshed every <b>7 days</b> or during next connection session if an SDL enabled app has been
+     * installed or uninstalled.
      */
-    public static final int FLAG_MULTI_SECURITY_MED         = 0x20;
+    public static final int FLAG_MULTI_SECURITY_MED = 0x20;
     /**
-     *  Multiplexing security will be very strict. Only trusted router services installed from trusted app stores will 
-     *  be used. Trusted router list will be obtain from server. List will be refreshed every <b>7 days</b> 
-     *  or during next connection session if an SDL enabled app has been installed or uninstalled. 
+     * Multiplexing security will be very strict. Only trusted router services installed from trusted app stores will
+     * be used. Trusted router list will be obtain from server. List will be refreshed every <b>7 days</b>
+     * or during next connection session if an SDL enabled app has been installed or uninstalled.
      */
-    public static final int FLAG_MULTI_SECURITY_HIGH        = 0x30;
-	
-	final Context context;
-	final String appId;
-	ComponentName service;
-	int securityLevel;
-
-	List<TransportType> primaryTransports, secondaryTransports;
-	boolean requiresHighBandwidth = false;
-	Boolean requiresAudioSupport = null;
-	TransportListener transportListener;
-
-	
-	public MultiplexTransportConfig(Context context, String appId) {
-		this.context = context;
-		this.appId = appId;
-		this.securityLevel = FLAG_MULTI_SECURITY_MED;
-		this.primaryTransports = Arrays.asList(TransportType.USB, TransportType.BLUETOOTH);
-		this.secondaryTransports = Arrays.asList(TransportType.TCP, TransportType.USB, TransportType.BLUETOOTH);
-
-	}
-
-	public MultiplexTransportConfig(Context context, String appId, int securityLevel) {
-		this.context = context;
-		this.appId = appId;
-		this.securityLevel = securityLevel;
-		this.primaryTransports = Arrays.asList(TransportType.USB, TransportType.BLUETOOTH);
-		this.secondaryTransports = Arrays.asList(TransportType.TCP, TransportType.USB, TransportType.BLUETOOTH);
-	}	
-
-	/**
-	 * Overridden abstract method which returns specific type of this transport configuration.
-	 * 
-	 * @return Constant value TransportType.MULTIPLEX. 
-	 * 
-	 * @see TransportType
-	 */
-	public TransportType getTransportType() {
-		return TransportType.MULTIPLEX;
-	}
-
-	/**
-	 * Gets the context attached to this config
-	 * @return context supplied during creation
-	 */
-	public Context getContext(){
-		return this.context;
-	}
-
-	/**
-	 * Gets the ComponentName of the router service attached to this config
-	 * @return ComponentName of the router service that will be bound to
-	 */
-	public ComponentName getService() {
-		return service;
-	}
-
-	/**
-	 * Supplies the config with the router service that should be bound to
-	 * @param service the router service that should be bound to
-	 */
-	public void setService(ComponentName service) {
-		this.service = service;
-	}
-
-	/**
-	 * Sets the security level that should be used to verify a router service that is to be bound
-	 * @param securityLevel the security level that will be used to perform certain tests
-	 * @see #FLAG_MULTI_SECURITY_OFF
-	 * @see #FLAG_MULTI_SECURITY_LOW
-	 * @see #FLAG_MULTI_SECURITY_MED
-	 * @see #FLAG_MULTI_SECURITY_HIGH
-	 */
-	public void setSecurityLevel(int securityLevel){
-		this.securityLevel = securityLevel;
-	}
-
-	/**
-	 * Get the security level that will be used to verify a router service before binding
-	 * @return the set security level
-	 * @see #FLAG_MULTI_SECURITY_OFF
-	 * @see #FLAG_MULTI_SECURITY_LOW
-	 * @see #FLAG_MULTI_SECURITY_MED
-	 * @see #FLAG_MULTI_SECURITY_HIGH
-	 */
-	public int getSecurityLevel(){
-		return securityLevel;
-	}
-
-	/**
-	 * Set whether or not this app requires the use of a transport that supports high bandwidth
-	 * services. Common use is when an app uses the video/audio streaming services and there is no
-	 * other integration that could be useful to the user.
-	 * <br><br> <b>For example:</b>
-	 * <br><b>1. </b>If an app intends to perform audio or video streaming and does not wish
-	 * to appear on the module when that isn't possible, a value of true should be sent.
-	 * <br><b>2. </b>If the same app wishes to appear on the module even when those services aren't available
-	 * a value of true should be sent. In this case, the app could display a message prompting the
-	 * user to "Please connect USB or Wifi" or it could have a separate integration like giving turn
-	 * by turn directions in place of streaming the full navigation map.
-	 * @param requiresHighBandwidth whether the app should be treated as requiring a high
-	 *                                 bandwidth transport.
-	 */
-	public void setRequiresHighBandwidth(boolean requiresHighBandwidth){
-		this.requiresHighBandwidth = requiresHighBandwidth;
-	}
-
-	/**
-	 * Get the setting from this config to see whether the app should be treated as requiring a high
-	 * bandwidth transport.
-	 * @return whether the app should be treated as requiring a high
-	 * bandwidth transport.
-	 */
-	public boolean requiresHighBandwidth(){
-		return this.requiresHighBandwidth;
-	}
-
-	/**
-	 * Set whether or not this app requires the use of an audio streaming output device
-	 *
-	 * @param requiresAudioSupport whether the app should be treated as requiring an audio streaming
-	 *                             output device
-	 */
-	public void setRequiresAudioSupport(boolean requiresAudioSupport){
-		this.requiresAudioSupport = requiresAudioSupport;
-	}
-
-	/**
-	 * Get the setting from this config to see whether the app should be treated as requiring an
-	 * audio streaming output device
-	 *
-	 * @return whether the app should be treated as requiring an audio streaming output device
-	 */
-	public Boolean requiresAudioSupport(){
-		return this.requiresAudioSupport;
-	}
-
-
-
-	/**
-	 * This will set the order in which a primary transport is determined to be accepted or not.
-	 * In the case of previous protocol versions ( < 5.1)
-	 * @param transports list of transports that can be used as primary
-	 */
-	public void setPrimaryTransports(List<TransportType> transports){
-		if(transports != null){
-			//Sanitize
-			transports.remove(TransportType.MULTIPLEX);
-			this.primaryTransports = transports;
-		}
-	}
-
-	/**
-	 * Get the list of primary transports that are set to be accepted by this config
-	 * @return  acceptable primary transports
-	 */
-	public List<TransportType> getPrimaryTransports(){
-		return this.primaryTransports;
-	}
-
-	/**
-	 * This will set the order in which a primary transport is determined to be accepted or not.
-	 * In the case of previous protocol versions ( < 5.1)
-	 * @param transports list of transports that can be used as secondary
-	 **/
-	public void setSecondaryTransports(List<TransportType> transports){
-		if(transports != null){
-			//Sanitize
-			transports.remove(TransportType.MULTIPLEX);
-			this.secondaryTransports = transports;
-		}
-	}
-
-	/**
-	 * Get the list of secondary transports that are set to be accepted by this config
-	 * @return  acceptable secondary transports
-	 */
-	public List<TransportType> getSecondaryTransports(){
-		return this.secondaryTransports;
-	}
-
-	/**
-	 * Set a lister for transport events. Useful when connected high bandwidth services like audio
-	 * or video streaming
-	 * @param listener the TransportListener that will be called back when transport events happen
-	 */
-	public void setTransportListener(TransportListener listener){
-		this.transportListener = listener;
-	}
-
-	/**
-	 * Getter for the supplied transport listener
-	 * @return the transport listener if any
-	 */
-	public TransportListener getTransportListener(){
-		return this.transportListener;
-	}
-
-	/**
-	 * Callback to be used if the state of the transports needs to be monitored for any reason.
-	 */
-	public interface TransportListener{
-		/**
-		 * Gets called whenever there is a change in the available transports for use
-		 * @param connectedTransports the currently connected transports
-		 * @param audioStreamTransportAvail true if there is either an audio streaming supported
-		 *                                        transport currently connected or a transport is
-		 *                                        available to connect with. False if there is no
-		 *                                        transport connected to support audio streaming and
-		 *                                        no possibility in the foreseeable future.
-		 * @param videoStreamTransportAvail true if there is either a video streaming supported
-		 *                                        transport currently connected or a transport is
-		 *                                        available to connect with. False if there is no
-		 *                                        transport connected to support video streaming and
-		 *                                        no possibility in the foreseeable future.
-		 */
-		void onTransportEvent(List<TransportRecord> connectedTransports, boolean audioStreamTransportAvail,boolean videoStreamTransportAvail);
-	}
+    public static final int FLAG_MULTI_SECURITY_HIGH = 0x30;
+
+    final Context context;
+    final String appId;
+    ComponentName service;
+    int securityLevel;
+
+    List<TransportType> primaryTransports, secondaryTransports;
+    boolean requiresHighBandwidth = false;
+    Boolean requiresAudioSupport = null;
+    TransportListener transportListener;
+
+
+    public MultiplexTransportConfig(Context context, String appId) {
+        this.context = context;
+        this.appId = appId;
+        this.securityLevel = FLAG_MULTI_SECURITY_MED;
+        this.primaryTransports = Arrays.asList(TransportType.USB, TransportType.BLUETOOTH);
+        this.secondaryTransports = Arrays.asList(TransportType.TCP, TransportType.USB, TransportType.BLUETOOTH);
+
+    }
+
+    public MultiplexTransportConfig(Context context, String appId, int securityLevel) {
+        this.context = context;
+        this.appId = appId;
+        this.securityLevel = securityLevel;
+        this.primaryTransports = Arrays.asList(TransportType.USB, TransportType.BLUETOOTH);
+        this.secondaryTransports = Arrays.asList(TransportType.TCP, TransportType.USB, TransportType.BLUETOOTH);
+    }
+
+    /**
+     * Overridden abstract method which returns specific type of this transport configuration.
+     *
+     * @return Constant value TransportType.MULTIPLEX.
+     * @see TransportType
+     */
+    public TransportType getTransportType() {
+        return TransportType.MULTIPLEX;
+    }
+
+    /**
+     * Gets the context attached to this config
+     *
+     * @return context supplied during creation
+     */
+    public Context getContext() {
+        return this.context;
+    }
+
+    /**
+     * Gets the ComponentName of the router service attached to this config
+     *
+     * @return ComponentName of the router service that will be bound to
+     */
+    public ComponentName getService() {
+        return service;
+    }
+
+    /**
+     * Supplies the config with the router service that should be bound to
+     *
+     * @param service the router service that should be bound to
+     */
+    public void setService(ComponentName service) {
+        this.service = service;
+    }
+
+    /**
+     * Sets the security level that should be used to verify a router service that is to be bound
+     *
+     * @param securityLevel the security level that will be used to perform certain tests
+     * @see #FLAG_MULTI_SECURITY_OFF
+     * @see #FLAG_MULTI_SECURITY_LOW
+     * @see #FLAG_MULTI_SECURITY_MED
+     * @see #FLAG_MULTI_SECURITY_HIGH
+     */
+    public void setSecurityLevel(int securityLevel) {
+        this.securityLevel = securityLevel;
+    }
+
+    /**
+     * Get the security level that will be used to verify a router service before binding
+     *
+     * @return the set security level
+     * @see #FLAG_MULTI_SECURITY_OFF
+     * @see #FLAG_MULTI_SECURITY_LOW
+     * @see #FLAG_MULTI_SECURITY_MED
+     * @see #FLAG_MULTI_SECURITY_HIGH
+     */
+    public int getSecurityLevel() {
+        return securityLevel;
+    }
+
+    /**
+     * Set whether or not this app requires the use of a transport that supports high bandwidth
+     * services. Common use is when an app uses the video/audio streaming services and there is no
+     * other integration that could be useful to the user.
+     * <br><br> <b>For example:</b>
+     * <br><b>1. </b>If an app intends to perform audio or video streaming and does not wish
+     * to appear on the module when that isn't possible, a value of true should be sent.
+     * <br><b>2. </b>If the same app wishes to appear on the module even when those services aren't available
+     * a value of true should be sent. In this case, the app could display a message prompting the
+     * user to "Please connect USB or Wifi" or it could have a separate integration like giving turn
+     * by turn directions in place of streaming the full navigation map.
+     *
+     * @param requiresHighBandwidth whether the app should be treated as requiring a high
+     *                              bandwidth transport.
+     */
+    public void setRequiresHighBandwidth(boolean requiresHighBandwidth) {
+        this.requiresHighBandwidth = requiresHighBandwidth;
+    }
+
+    /**
+     * Get the setting from this config to see whether the app should be treated as requiring a high
+     * bandwidth transport.
+     *
+     * @return whether the app should be treated as requiring a high
+     * bandwidth transport.
+     */
+    public boolean requiresHighBandwidth() {
+        return this.requiresHighBandwidth;
+    }
+
+    /**
+     * Set whether or not this app requires the use of an audio streaming output device
+     *
+     * @param requiresAudioSupport whether the app should be treated as requiring an audio streaming
+     *                             output device
+     */
+    public void setRequiresAudioSupport(boolean requiresAudioSupport) {
+        this.requiresAudioSupport = requiresAudioSupport;
+    }
+
+    /**
+     * Get the setting from this config to see whether the app should be treated as requiring an
+     * audio streaming output device
+     *
+     * @return whether the app should be treated as requiring an audio streaming output device
+     */
+    public Boolean requiresAudioSupport() {
+        return this.requiresAudioSupport;
+    }
+
+
+    /**
+     * This will set the order in which a primary transport is determined to be accepted or not.
+     * In the case of previous protocol versions ( < 5.1)
+     *
+     * @param transports list of transports that can be used as primary
+     */
+    public void setPrimaryTransports(List<TransportType> transports) {
+        if (transports != null) {
+            //Sanitize
+            transports.remove(TransportType.MULTIPLEX);
+            this.primaryTransports = transports;
+        }
+    }
+
+    /**
+     * Get the list of primary transports that are set to be accepted by this config
+     *
+     * @return acceptable primary transports
+     */
+    public List<TransportType> getPrimaryTransports() {
+        return this.primaryTransports;
+    }
+
+    /**
+     * This will set the order in which a primary transport is determined to be accepted or not.
+     * In the case of previous protocol versions ( < 5.1)
+     *
+     * @param transports list of transports that can be used as secondary
+     **/
+    public void setSecondaryTransports(List<TransportType> transports) {
+        if (transports != null) {
+            //Sanitize
+            transports.remove(TransportType.MULTIPLEX);
+            this.secondaryTransports = transports;
+        }
+    }
+
+    /**
+     * Get the list of secondary transports that are set to be accepted by this config
+     *
+     * @return acceptable secondary transports
+     */
+    public List<TransportType> getSecondaryTransports() {
+        return this.secondaryTransports;
+    }
+
+    /**
+     * Set a lister for transport events. Useful when connected high bandwidth services like audio
+     * or video streaming
+     *
+     * @param listener the TransportListener that will be called back when transport events happen
+     */
+    public void setTransportListener(TransportListener listener) {
+        this.transportListener = listener;
+    }
+
+    /**
+     * Getter for the supplied transport listener
+     *
+     * @return the transport listener if any
+     */
+    public TransportListener getTransportListener() {
+        return this.transportListener;
+    }
+
+    /**
+     * Callback to be used if the state of the transports needs to be monitored for any reason.
+     */
+    public interface TransportListener {
+        /**
+         * Gets called whenever there is a change in the available transports for use
+         *
+         * @param connectedTransports       the currently connected transports
+         * @param audioStreamTransportAvail true if there is either an audio streaming supported
+         *                                  transport currently connected or a transport is
+         *                                  available to connect with. False if there is no
+         *                                  transport connected to support audio streaming and
+         *                                  no possibility in the foreseeable future.
+         * @param videoStreamTransportAvail true if there is either a video streaming supported
+         *                                  transport currently connected or a transport is
+         *                                  available to connect with. False if there is no
+         *                                  transport connected to support video streaming and
+         *                                  no possibility in the foreseeable future.
+         */
+        void onTransportEvent(List<TransportRecord> connectedTransports, boolean audioStreamTransportAvail, boolean videoStreamTransportAvail);
+    }
 
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java
index e76f2180c..78e3d3b4b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexUsbTransport.java
@@ -48,16 +48,16 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-public class MultiplexUsbTransport extends MultiplexBaseTransport{
+public class MultiplexUsbTransport extends MultiplexBaseTransport {
 
     private static final String TAG = "MultiplexUsbTransport";
 
-    public static final String MANUFACTURER     = "manufacturer";
-    public static final String MODEL            = "model";
-    public static final String VERSION          = "version";
-    public static final String URI              = "uri";
-    public static final String SERIAL           = "serial";
-    public static final String DESCRIPTION      = "description";
+    public static final String MANUFACTURER = "manufacturer";
+    public static final String MODEL = "model";
+    public static final String VERSION = "version";
+    public static final String URI = "uri";
+    public static final String SERIAL = "serial";
+    public static final String DESCRIPTION = "description";
 
     private final Bundle deviceInfo;
     private ReaderThread readerThread;
@@ -65,22 +65,22 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
     private ParcelFileDescriptor parcelFileDescriptor;
     private Boolean connectionSuccessful = null;
 
-    MultiplexUsbTransport(ParcelFileDescriptor parcelFileDescriptor, Handler handler, Bundle bundle){
+    MultiplexUsbTransport(ParcelFileDescriptor parcelFileDescriptor, Handler handler, Bundle bundle) {
         super(handler, TransportType.USB);
-        if(parcelFileDescriptor == null){
+        if (parcelFileDescriptor == null) {
             DebugTool.logError(TAG, "Error with object");
             this.parcelFileDescriptor = null;
             throw new ExceptionInInitializerError("ParcelFileDescriptor can't be null");
-        }else{
+        } else {
             this.parcelFileDescriptor = parcelFileDescriptor;
             connectedDeviceName = "USB";
             deviceInfo = bundle;
-            if(deviceInfo != null){
+            if (deviceInfo != null) {
                 //Fill in info
                 connectedDeviceAddress = bundle.getString(SERIAL);
-                if(connectedDeviceAddress == null){
+                if (connectedDeviceAddress == null) {
                     connectedDeviceAddress = bundle.getString(URI);
-                    if(connectedDeviceAddress == null) {
+                    if (connectedDeviceAddress == null) {
                         connectedDeviceAddress = bundle.getString(DESCRIPTION);
                         if (connectedDeviceAddress == null) {
                             connectedDeviceAddress = bundle.getString(MODEL);
@@ -91,16 +91,16 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
                     }
                 }
 
-            }else{
+            } else {
                 connectedDeviceAddress = "USB";
             }
         }
     }
 
-    public synchronized void start(){
+    public synchronized void start() {
         setState(STATE_CONNECTING);
         FileDescriptor fileDescriptor = parcelFileDescriptor.getFileDescriptor();
-        if(fileDescriptor == null || !fileDescriptor.valid()){
+        if (fileDescriptor == null || !fileDescriptor.valid()) {
             DebugTool.logError(TAG, "USB FD was null or not valid,");
             setState(STATE_NONE);
             return;
@@ -138,8 +138,8 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
             readerThread = null;
         }
 
-        if( (connectionSuccessful== null || connectionSuccessful == true )      //else, the connection was bad. Not closing the PFD helps recover
-                && parcelFileDescriptor != null){
+        if ((connectionSuccessful == null || connectionSuccessful == true)      //else, the connection was bad. Not closing the PFD helps recover
+                && parcelFileDescriptor != null) {
             try {
                 parcelFileDescriptor.close();
             } catch (IOException e) {
@@ -156,9 +156,10 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
 
     /**
      * Write to the ConnectedThread in an unsynchronized manner
+     *
      * @param out The bytes to write
      */
-    public void write(byte[] out,  int offset, int count) {
+    public void write(byte[] out, int offset, int count) {
         // Create temporary object
         MultiplexUsbTransport.WriterThread r;
         // Synchronize a copy of the ConnectedThread
@@ -168,7 +169,7 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
             //r.write(out,offset,count);
         }
         // Perform the write unsynchronized
-        r.write(out,offset,count);
+        r.write(out, offset, count);
     }
 
     /**
@@ -204,12 +205,12 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
         }, 250);
     }
 
-    private class ReaderThread extends Thread{
+    private class ReaderThread extends Thread {
         final SdlPsm psm;
 
         final InputStream inputStream;
 
-        public ReaderThread(final FileDescriptor fileDescriptor){
+        public ReaderThread(final FileDescriptor fileDescriptor) {
             psm = new SdlPsm();
             inputStream = new FileInputStream(fileDescriptor);
         }
@@ -228,31 +229,31 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
                     bytesRead = inputStream.read(buffer);
                     if (bytesRead == -1) {
                         if (isInterrupted()) {
-                            DebugTool.logError(TAG,"EOF reached, and thread is interrupted");
+                            DebugTool.logError(TAG, "EOF reached, and thread is interrupted");
                         } else {
-                            DebugTool.logInfo(TAG,"EOF reached, disconnecting!");
+                            DebugTool.logInfo(TAG, "EOF reached, disconnecting!");
                             connectionLost();
                         }
                         return;
                     }
                     if (isInterrupted()) {
-                        DebugTool.logWarning(TAG,"Read some data, but thread is interrupted");
+                        DebugTool.logWarning(TAG, "Read some data, but thread is interrupted");
                         return;
                     }
-                    if(connectionSuccessful != null && connectionSuccessful == false){
+                    if (connectionSuccessful != null && connectionSuccessful == false) {
                         connectionSuccessful = true;
                     }
                     byte input;
-                    for(int i=0;i<bytesRead; i++){
-                        input=buffer[i];
+                    for (int i = 0; i < bytesRead; i++) {
+                        input = buffer[i];
                         stateProgress = psm.handleByte(input);
-                        if(!stateProgress){//We are trying to weed through the bad packet info until we get something
+                        if (!stateProgress) {//We are trying to weed through the bad packet info until we get something
                             //Log.w(TAG, "Packet State Machine did not move forward from state - "+ psm.getState()+". PSM being Reset.");
                             psm.reset();
                             continue; //Move to the next iteration of the loop
                         }
 
-                        if(psm.getState() == SdlPsm.FINISHED_STATE){
+                        if (psm.getState() == SdlPsm.FINISHED_STATE) {
                             synchronized (MultiplexUsbTransport.this) {
                                 //Log.d(TAG, "Packet formed, sending off");
                                 SdlPacket packet = psm.getFormedPacket();
@@ -268,13 +269,13 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
                     }
                 } catch (IOException e) {
                     if (isInterrupted()) {
-                        DebugTool.logWarning(TAG,"Can't read data, and thread is interrupted");
+                        DebugTool.logWarning(TAG, "Can't read data, and thread is interrupted");
                     } else {
-                        DebugTool.logWarning(TAG,"Can't read data, disconnecting!");
+                        DebugTool.logWarning(TAG, "Can't read data, disconnecting!");
                         connectionLost();
                     }
                     return;
-                } catch (Exception e){
+                } catch (Exception e) {
                     connectionLost();
                 }
             }
@@ -284,11 +285,11 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
         public synchronized void cancel() {
             try {
                 //Log.d(TAG, "Calling Cancel in the Read thread");
-                if(inputStream!=null){
+                if (inputStream != null) {
                     inputStream.close();
                 }
 
-            } catch (IOException|NullPointerException e) { // NPE is ONLY to catch error on mmInStream
+            } catch (IOException | NullPointerException e) { // NPE is ONLY to catch error on mmInStream
                 // Log.trace(TAG, "Read Thread: " + e.getMessage());
                 // Socket or stream is already closed
             }
@@ -314,21 +315,22 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
 
         /**
          * Write to the connected OutStream.
-         * @param buffer  The bytes to write
+         *
+         * @param buffer The bytes to write
          */
         public void write(byte[] buffer, int offset, int count) {
             try {
-                if(buffer==null){
+                if (buffer == null) {
                     DebugTool.logWarning(TAG, "Can't write to device, nothing to send");
                     return;
                 }
                 //This would be a good spot to log out all bytes received
                 mmOutStream.write(buffer, offset, count);
-                if(connectionSuccessful == null){
+                if (connectionSuccessful == null) {
                     connectionSuccessful = false;
                 }
                 //Log.w(TAG, "Wrote out to device: bytes = "+ count);
-            } catch (IOException|NullPointerException e) { // STRICTLY to catch mmOutStream NPE
+            } catch (IOException | NullPointerException e) { // STRICTLY to catch mmOutStream NPE
                 // Exception during write
                 //OMG! WE MUST NOT BE CONNECTED ANYMORE! LET THE USER KNOW
                 DebugTool.logError(TAG, "Error sending bytes to connected device!");
@@ -338,14 +340,14 @@ public class MultiplexUsbTransport extends MultiplexBaseTransport{
 
         public synchronized void cancel() {
             try {
-                if(mmOutStream!=null){
+                if (mmOutStream != null) {
                     mmOutStream.flush();
                     mmOutStream.close();
 
                 }
             } catch (IOException e) {
                 // close() of connect socket failed
-                DebugTool.logInfo(TAG,  "Write Thread: " + e.getMessage());
+                DebugTool.logInfo(TAG, "Write Thread: " + e.getMessage());
             }
         }
     }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
index 39f5909b5..e29ebf1d3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
@@ -77,776 +77,813 @@ import java.util.concurrent.atomic.AtomicInteger;
  * After that, you have the option to set if you want to test in a production setting. If not, it will default to a debug setting.
  * Once you are ready to check if the router service is trusted you simply call routerServiceValidator.validate();
  * <br><br> This validator should be passed into the multiplexing transport construction as well.
- * @author Joey Grover
  *
+ * @author Joey Grover
  */
 public class RouterServiceValidator {
-	private static final String TAG = "RSVP";
-	public static final String ROUTER_SERVICE_PACKAGE = "com.sdl.router";
-
-	private static final String REQUEST_PREFIX = "https://woprjr.smartdevicelink.com/api/1/applications/queryTrustedRouters"; 
-
-	private static final String DEFAULT_APP_LIST = "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] },\"com.ford.fordpass\" : { \"versionBlacklist\":[] } }}"; 
-	
-	
-	private static final String JSON_RESPONSE_OBJECT_TAG = "response";
-	private static final String JSON_RESPONSE_APP_VERSIONS_TAG = "versionBlacklist";
-
-	private static final String JSON_PUT_ARRAY_TAG = "installedApps";
-	private static final String JSON_APP_PACKAGE_TAG = "packageName";
-	private static final String JSON_APP_VERSION_TAG = "version";
-
-	
-	private static final long REFRESH_TRUSTED_APP_LIST_TIME_DAY 	= 3600000 * 24; // A day in ms
-	
-	private static final String SDL = "sdl";
-	private static final String SDL_PACKAGE_LIST = "sdl_package_list";
-	private static final String SDL_PACKAGE_LIST_TIMESTAMP = "sdl_package_list_timestamp";
-	private static final String SDL_LAST_REQUEST = "sdl_last_request";
-	private static final String SDL_RSVP_SECURITY_LEVEL = "sdl_rsvp_security_level";
-
-	
-	//Flags to aid in debugging and production checks
-	public static final int FLAG_DEBUG_NONE 				= 0x00;
-	public static final int FLAG_DEBUG_PACKAGE_CHECK 		= 0x01;
-	/**
-	 * This will flag the validator to check for app version during debugging. 
-	 * <br><br><b>NOTE: This flag will include a package check as well.
-	 */
-	public static final int FLAG_DEBUG_VERSION_CHECK 		= 0x03; //We use 3 because version check will be 2, but since a version check implies a package check we do 2+1=3;
-	public static final int FLAG_DEBUG_INSTALLED_FROM_CHECK = 0x04;
-	public static final int FLAG_DEBUG_USE_TIMESTAMP_CHECK = 0x05;
-
-	public static final int FLAG_DEBUG_PERFORM_ALL_CHECKS 	= 0xFF;
-	
-	
-	private int flags = FLAG_DEBUG_NONE;
-
-	private Context context;
-	private boolean inDebugMode = false;
-	private static boolean pendingListRefresh = false;
-
-	private ComponentName service;//This is how we can save different routers over another in a waterfall method if we choose to.
-
-	private static int securityLevel = -1;
-	
-	public RouterServiceValidator(Context context){
-		this.context = context;
-		inDebugMode = inDebugMode();
-	}
-	
-	public RouterServiceValidator(Context context, ComponentName service){
-		this.context = context;
-		inDebugMode = inDebugMode();
-		this.service = service;
-	}
-
-	public RouterServiceValidator(@NonNull MultiplexTransportConfig config){
-		this.context = config.context;
-		this.service = config.service;
-		setSecurityLevel(config.securityLevel);
-		inDebugMode = inDebugMode();
-	}
-
-	/**
-	 * Asynchronously validate the target RouterService, which includes finding the right RouterService.
-	 * @param callback: callback gets called when validation finishes.
-	 */
-	public void validateAsync(final ValidationStatusCallback callback) {
-		if(securityLevel == -1){
-			securityLevel = getSecurityLevel(context);
-		}
-
-		final PackageManager pm = context.getPackageManager();
-		//Grab the package for the currently running router service. We need this call regardless of if we are in debug mode or not.
-
-		if(this.service != null){
-			DebugTool.logInfo(TAG, "Supplied service name of " + this.service.getClassName());
-			if(Build.VERSION.SDK_INT < Build.VERSION_CODES.O && !isServiceRunning(context,this.service)){
-				//This means our service isn't actually running, so set to null. Hopefully we can find a real router service after this.
-				service = null;
-				DebugTool.logWarning(TAG, "Supplied service is not actually running.");
-			} else {
-				// If the running router service is created by this app, the validation is good by default
-				if (this.service.getPackageName().equals(context.getPackageName()) && callback != null) {
-					callback.onFinishedValidation(true, this.service);
-					return;
-				}
-			}
-		}
-
-		if(this.service == null){
-			DebugTool.logInfo(TAG, "about finding the best Router by using retrieveBestRouterServiceName");
-			new FindRouterTask(new FindConnectedRouterCallback() {
-				@Override
-				public void onFound(ComponentName component) {
-					DebugTool.logInfo(TAG, "FindConnectedRouterCallback.onFound got called. Package=" + component);
-					checkTrustedRouter(callback, pm, component);
-				}
-
-				@Override
-				public void onFailed() {
-					DebugTool.logInfo(TAG, "FindConnectedRouterCallback.onFailed was called");
-					if (callback != null) {
-						callback.onFinishedValidation(false, null);
-					}
-				}
-			}).execute(this.context);
-		} else {
-			// already found the RouterService
-			checkTrustedRouter(callback, pm, service);
-		}
-
-	}
-
-	/**
-	 * checkTrustedRouter: This checks to see if the given component is Trusted RouterService,
-	 * and calls ValidationStatusCallback#onFinishedValidation.
-	 *
-	 * @param callback
-	 * @param pm
-	 * @param component
-	 */
-	private void checkTrustedRouter(final ValidationStatusCallback callback, final PackageManager pm, final ComponentName component) {
-		String packageName = appPackageForComponentName(component, pm);
-		boolean valid = (securityLevel == MultiplexTransportConfig.FLAG_MULTI_SECURITY_OFF);
-
-		if(!valid && packageName!=null){//Make sure there is a service running
-			if(wasInstalledByAppStore(packageName)){ //Was this package installed from a trusted app store
-				if( isTrustedPackage(packageName, pm)){//Is this package on the list of trusted apps.
-					valid = true;
-				}
-			}
-		}
-		if (callback != null) {
-			callback.onFinishedValidation(valid, component);
-			if (valid) {
-				synchronized (this) {
-					this.service = component;
-				}
-			}
-		}
-	}
-	/**
-	 * This method retrieves the best routerservice name asynchronously.
-	 * @param context
-	 */
-	//private void retrieveBestRouterServiceName(Context context) {
-	//	FindRouterTask task = new FindRouterTask(null);
-	//	task.execute(context);
-	//}
-
-	/**
-	 * FindRouterTask: AsyncTask to find the connected RouterService.
-	 */
-	class FindRouterTask extends AsyncTask<Context, Void, ComponentName> {
-		final FindConnectedRouterCallback mCallback;
-		final Handler mHandler = new Handler(Looper.getMainLooper());
-		final Integer TIMEOUT_MSEC = 10000; // 10 sec
-
-		FindRouterTask(FindConnectedRouterCallback callback) {
-			mCallback = callback;
-		}
-
-		@Override
-		protected ComponentName doInBackground(final Context... contexts) {
-			// let's use ServiceFinder here
-			final BlockingQueue<ComponentName> serviceQueue = new LinkedBlockingQueue<>();
-			final AtomicInteger _counter = new AtomicInteger(0);
-			Context context = contexts[0];
-			final Thread _currentThread = Thread.currentThread();
-			new ServiceFinder(context, context.getPackageName(), new ServiceFinder.ServiceFinderCallback() {
-				@Override
-				public void onComplete(Vector<ComponentName> routerServices) {
-					// OK, we found the routerServices. Let's see one-by-one.
-					if (routerServices == null || routerServices.isEmpty()) {
-						_currentThread.interrupt();
-						return;
-					}
-
-
-					final int numServices = routerServices.size();
-					for (ComponentName name: routerServices) {
-						final SdlRouterStatusProvider provider = new SdlRouterStatusProvider(contexts[0], name, new SdlRouterStatusProvider.ConnectedStatusCallback() {
-							@Override
-							public void onConnectionStatusUpdate(final boolean connected, final ComponentName service, final Context context) {
-								// make sure this part runs on main thread.
-								mHandler.post(new Runnable() {
-									@Override
-									public void run() {
-										_counter.incrementAndGet();
-										if (connected) {
-											DebugTool.logInfo(TAG, "We found the connected service (" + service + "); currentThread is " + Thread.currentThread().getName());
-											serviceQueue.add(service);
-										} else if (_counter.get() == numServices) {
-											DebugTool.logInfo(TAG, "SdlRouterStatusProvider returns service=" + service + "; connected=" + connected);
-											_currentThread.interrupt();
-										}
-									}
-								});
-							}
-						});
-						DebugTool.logInfo(TAG, "about checkIsConnected; thread=" + Thread.currentThread().getName());
-						provider.checkIsConnected();
-					}
-				}
-			});
-
-			try {
-				ComponentName found = serviceQueue.poll(TIMEOUT_MSEC, TimeUnit.MILLISECONDS);
-				return found;
-			} catch(InterruptedException e) {
-				DebugTool.logInfo(TAG,"FindRouterTask was interrupted because connected Router cannot be found");
-			}
-			return null;
-		}
-
-		@Override
-		protected void onPostExecute(ComponentName componentName) {
-			DebugTool.logInfo(TAG,"onPostExecute componentName=" + componentName);
-			super.onPostExecute(componentName);
-			if (mCallback != null) {
-				if (componentName != null && componentName.getPackageName() != null && componentName.getPackageName().length() != 0) {
-					mCallback.onFound(componentName);
-				} else {
-					mCallback.onFailed();
-				}
-			}
-		}
-
-	}
-
-	/**
-	 * FindConnectedRouterCallback
-	 * Used internally for validating router service.
-	 */
-	private interface FindConnectedRouterCallback {
-		void onFound(ComponentName component);
-		void onFailed();
-	}
-
-	interface ValidationStatusCallback {
-		void onFinishedValidation(boolean valid, ComponentName name);
-	}
-
-	/**
-	 * This will ensure that all router services are aware that there are no valid router services running and should start up 
-	 */
-	private void wakeUpRouterServices(){
-		if(BluetoothAdapter.getDefaultAdapter()!=null && BluetoothAdapter.getDefaultAdapter().isEnabled()){
-			Intent intent = new Intent(TransportConstants.START_ROUTER_SERVICE_ACTION);
-			intent.putExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA, true);
-			AndroidTools.sendExplicitBroadcast(context,intent,null);
-		}
-	}
-	public ComponentName getService(){
-		return this.service;
-	}
-
-	private boolean shouldOverrideVersionCheck(){
-		return (this.inDebugMode && ((this.flags & FLAG_DEBUG_VERSION_CHECK) != FLAG_DEBUG_VERSION_CHECK));
-	}
-	
-	private boolean shouldOverridePackageName(){
-		return (this.inDebugMode && ((this.flags & FLAG_DEBUG_PACKAGE_CHECK) != FLAG_DEBUG_PACKAGE_CHECK));
-	}
-	
-	private boolean shouldOverrideInstalledFrom(){
-		return securityLevel< MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH 
-				|| (this.inDebugMode && ((this.flags & FLAG_DEBUG_INSTALLED_FROM_CHECK) != FLAG_DEBUG_INSTALLED_FROM_CHECK));
-	}
-	
-	private boolean shouldOverrideTimeCheck(){
-		return (this.inDebugMode && ((this.flags & FLAG_DEBUG_USE_TIMESTAMP_CHECK) != FLAG_DEBUG_USE_TIMESTAMP_CHECK));
-	}
-	
-	
-	/**
-	 *  Use this method if you would like to test your app in a production setting rather than defaulting to a
-	 * debug mode where you connect to whatever router service is running.
-	 * <br><br><b>These flags are only used in debugging mode. During production they will be ignored.</b>
-	 * @param flags
-	 */
-	public void setFlags(int flags){
-		this.flags = flags;
-	}
-	
-	public void setSecurityLevel(int securityLevel){
-		RouterServiceValidator.securityLevel = securityLevel;
-		cacheSecurityLevel(this.context,securityLevel);
-	}
-	
-	protected static long getRefreshRate(){
-		switch(securityLevel){
-		case MultiplexTransportConfig.FLAG_MULTI_SECURITY_LOW:
-			return 30 * REFRESH_TRUSTED_APP_LIST_TIME_DAY; 
-		case MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH:
-		case MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED:
-		default:
-			return 7 * REFRESH_TRUSTED_APP_LIST_TIME_DAY; 
-		
-		}
-	}
-	
-	/**
-	 * This method will find which router service is running. Use that info to find out more about that app and service.
-	 * It will store the found service for later use and return the package name if found. 
-	 * @param pm An instance of a package manager. This is no longer used so null can be sent.
-	 * @return
-	 */
-	public ComponentName componentNameForServiceRunning(PackageManager pm){
-		if(context==null){
-			return null;
-		}
-		ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-		//PackageManager pm = context.getPackageManager();
-		
-		if (manager != null) {
-			for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
-				//Log.d(TAG, service.service.getClassName());
-				//We will check to see if it contains this name, should be pretty specific
-				if ((service.service.getClassName()).toLowerCase(Locale.US).contains(SdlBroadcastReceiver.SDL_ROUTER_SERVICE_CLASS_NAME)) {
-					//this.service = service.service; //This is great
-					if (service.started && service.restarting == 0) { //If this service has been started and is not crashed
-						return service.service; //appPackageForComponenetName(service.service,pm);
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-	
-	/**
-	 * Returns the package name for the component name
-	 * @param cn
-	 * @param pm
-	 * @return
-	 */
-	private String appPackageForComponentName(ComponentName cn,PackageManager pm ){
-		if(cn!=null && pm!=null){
-			ServiceInfo info;
-			try {
-				info = pm.getServiceInfo(cn, 0);
-				return info.applicationInfo.packageName;
-			} catch (NameNotFoundException e) {
-				e.printStackTrace();
-			}
-		}
-		return null;
-		
-	}
-	
-	/**
-	 * Check to see if the app was installed from a trusted app store.
-	 * @param packageName the package name of the app to be tested
-	 * @return whether or not the app was installed from a trusted app store
-	 */
-	public boolean wasInstalledByAppStore(String packageName){
-		if(shouldOverrideInstalledFrom()){
-			return true;
-		}
-		PackageManager packageManager = context.getPackageManager();
-		try {
-			final ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName, 0);
-			if(TrustedAppStore.isTrustedStore(packageManager.getInstallerPackageName(applicationInfo.packageName))){
-				// App was installed by trusted app store
-				return true;
-			}
-		} catch (final NameNotFoundException e) {
-			e.printStackTrace();
-			return false;
-		}
-		return false;
-	}
-	
-	/**
-	 * This method will check to see if this app is a debug build. If it is, we will attempt to connect to any router service.
-	 * If false, it will only connect to approved apps with router services.
-	 * @return
-	 */
-	public boolean inDebugMode(){
-		return (0 != (context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE));
-	}
-	
-	
-	private boolean isTrustedPackage(String packageName, PackageManager pm){
-		if(packageName == null){
-			return false;
-		}
-		
-		if(shouldOverridePackageName()){ //If we don't care about package names, just return true;
-			return true;
-		}
-
-		int version = -1;
-		try {version = pm.getPackageInfo(packageName,0).versionCode;} catch (NameNotFoundException e1) {e1.printStackTrace(); return false;}
-		
-		JSONObject trustedApps = stringToJson(getTrustedList(context));
-		JSONArray versions;
-		JSONObject app;
-
-		try {
-			app = trustedApps.getJSONObject(packageName);
-		} catch (JSONException e) {
-			e.printStackTrace();
-			return false;
-		} 
-		
-		if(app!=null){
-			//At this point, an app object was found in the JSON list that matches the package name
-			if(shouldOverrideVersionCheck()){ //If we don't care about versions, just return true
-				return true;
-			}
-			try { versions = app.getJSONArray(JSON_RESPONSE_APP_VERSIONS_TAG); } catch (JSONException e) {	e.printStackTrace();return false;}
-			return verifyVersion(version, versions);
-		}
-		
-		return false;
-	}
-	
-	protected boolean verifyVersion(int version, JSONArray versions){
-		if(version<0){
-			return false;
-		}
-		if(versions == null || versions.length()==0){
-			return true;
-		}
-		for(int i=0;i<versions.length();i++){
-			try {
-				if(version == versions.getInt(i)){
-					return false;
-				}
-			} catch (JSONException e) {
-				continue;
-			}
-		}//We didn't find our version in the black list.
-		return true;
-	}
-	
-	/**
-	 * Using the knowledge that all SDL enabled apps have an SDL Broadcast Receiver that has an intent filter that includes a specific 
-	 * intent. 
-	 * @return 
-	 */
-	private static List<SdlApp> findAllSdlApps(Context context){
-		List<SdlApp> apps = new ArrayList<>();
-		PackageManager packageManager = context.getPackageManager();
-		Intent intent = new Intent();
-		intent.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION);
-		List<ResolveInfo> infoList = packageManager.queryBroadcastReceivers(intent, 0);
-		//We want to sort our list so that we know it's the same every time
-		Collections.sort(infoList,new Comparator<ResolveInfo>() {
-	        @Override
-	        public int compare(ResolveInfo lhs, ResolveInfo rhs) {
-	            return lhs.activityInfo.packageName.compareTo(rhs.activityInfo.packageName);
-	        }
-	    });
-		if(infoList!=null){
-			String packageName;
-			for(ResolveInfo info : infoList){
-				//Log.i(TAG, "SDL apps: " + info.activityInfo.packageName);
-				packageName = info.activityInfo.packageName;
-				try {
-					apps.add(new SdlApp(packageName,packageManager.getPackageInfo(packageName,0).versionCode));
-				} catch (NameNotFoundException e) {
-					e.printStackTrace();
-				}
-			}
-			
-			return apps;
-		}else{
-			DebugTool.logInfo(TAG, "No SDL apps, list was null");
-			return null;
-		}
-	}
-	
-	/**
-	 * Performs a look up against installed SDL apps that support the router service.
-	 * When it receives a list back from the server it will store it for later use.
-	 * @param context
-	 */
-	public static boolean createTrustedListRequest(final Context context, boolean forceRefresh){
-		return createTrustedListRequest(context,forceRefresh,null,null);
-	}
-	public static boolean createTrustedListRequest(final Context context, boolean forceRefresh, TrustedListCallback listCallback){DebugTool.logInfo(TAG,"Checking to make sure we have a list");
-		return createTrustedListRequest(context,forceRefresh,null,listCallback);
-	}
-	
-	protected static boolean createTrustedListRequest(final Context context, boolean forceRefresh,HttpRequestTask.HttpRequestTaskCallback cb, final TrustedListCallback listCallback ){
-		if(context == null){
-			return false;
-		}
-		else if(getSecurityLevel(context) == MultiplexTransportConfig.FLAG_MULTI_SECURITY_OFF){ //If security is off, we can just return now
-			if(listCallback!=null){
-				listCallback.onListObtained(true);
-			}
-			return false;
-		}
-
-		pendingListRefresh = true;
-		//Might want to store a flag letting this class know a request is currently pending
-		StringBuilder builder = new StringBuilder();
-		builder.append(REQUEST_PREFIX);
-		
-		List<SdlApp> apps = findAllSdlApps(context);
-		
-		final JSONObject object = new JSONObject();
-		JSONArray array = new JSONArray();
-		JSONObject jsonApp;
-
-		if(apps != null) {
-			for (SdlApp app : apps) {    //Format all the apps into a JSON object and add it to the JSON array
-				try {
-					jsonApp = new JSONObject();
-					jsonApp.put(JSON_APP_PACKAGE_TAG, app.packageName);
-					jsonApp.put(JSON_APP_VERSION_TAG, app.versionCode);
-					array.put(jsonApp);
-				} catch (JSONException e) {
-					e.printStackTrace();
-					continue;
-				}
-			}
-		}
-		
-		try {object.put(JSON_PUT_ARRAY_TAG, array);} catch (JSONException e) {e.printStackTrace();}
-		
-		if(!forceRefresh && (System.currentTimeMillis()-getTrustedAppListTimeStamp(context))<getRefreshRate()){ 
-			if(object.toString().equals(getLastRequest(context))){
-			//Our list should still be ok for now so we will skip the request
-				pendingListRefresh = false;
-				if(listCallback!=null){
-					listCallback.onListObtained(true);
-				}
-				return false;
-			}else{
-				DebugTool.logInfo(TAG, "Sdl apps have changed. Need to request new trusted router service list.");
-			}
-		}
-		
-		if (cb == null) {
-			cb = new HttpRequestTaskCallback() {
-
-				@Override
-				public void httpCallComplete(String response) {
-					// Might want to check if this list is ok
-					//Log.d(TAG, "APPS! " + response);
-					setTrustedList(context, response);
-					setLastRequest(context, object.toString()); //Save our last request 
-					pendingListRefresh = false;
-					if(listCallback!=null){listCallback.onListObtained(true);}
-				}
-
-				@Override
-				public void httpFailure(int statusCode) {
-					DebugTool.logError(TAG, "Error while requesting trusted app list: "
-							+ statusCode);
-					pendingListRefresh = false;
-					if(listCallback!=null){listCallback.onListObtained(false);}
-				}
-			};
-		}
-
-		new HttpRequestTask(cb).execute(REQUEST_PREFIX,HttpRequestTask.REQUEST_TYPE_POST,object.toString(),"application/json","application/json");
-		
-		return true;
-	}
-	
-	/**
-	 * This method will determine if our supplied component name is really running. 
-	 * @param context
-	 * @param service
-	 * @return
-	 */
-	protected boolean isServiceRunning(Context context, ComponentName service){
-		 ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-		 if (manager != null) {
-			 for (RunningServiceInfo serviceInfo : manager.getRunningServices(Integer.MAX_VALUE)) {
-				 if (serviceInfo.service.equals(service)) {
-					 return true;
-				 }
-			 }
-		 }
-		return false;
-	}
-	
-	
-	/**
-	 * Parses a string into a JSON array
-	 * @param json
-	 * @return
-	 */
-	protected JSONObject stringToJson(String json){
-		if(json==null){
-			return stringToJson(DEFAULT_APP_LIST);
-		}
-		try {
-			JSONObject object = new JSONObject(json);
-			return object.getJSONObject(JSON_RESPONSE_OBJECT_TAG);
-			
-		} catch (JSONException e) {
-			e.printStackTrace();
-			if(!json.equalsIgnoreCase(DEFAULT_APP_LIST)){ //Since we were unable to parse, let's fall back to at least our last known good list. If this list is somehow messed up, just quit.
-				return stringToJson(DEFAULT_APP_LIST);
-			}else{
-				return null;
-			}
-		}		
-	}
-	
-	public static boolean invalidateList(Context context){
-		if(context == null){
-			return false;
-		}
-		SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
-		// Write the new prefs
-		SharedPreferences.Editor prefAdd = pref.edit();
-		prefAdd.putLong(SDL_PACKAGE_LIST_TIMESTAMP, 0); //This will be the last time we updated
-		return prefAdd.commit();
-	}
-	/******************************************************************
-	 *
-	 * Saving the list for later!!!
-	 *
-	 ******************************************************************/
-
-	/**
-	 * Saves the list of available applications into user's shared prefs.
-	 * @param context The application's environment
-	 * @param jsonString The JSON string to save.
-	 */
-	protected static boolean setTrustedList(Context context, String jsonString){
-		if(jsonString!=null && context!=null){
-			SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
-			// Write the new prefs
-    		SharedPreferences.Editor prefAdd = pref.edit();
-    		prefAdd.putString(SDL_PACKAGE_LIST, jsonString);
-    		prefAdd.putLong(SDL_PACKAGE_LIST_TIMESTAMP, System.currentTimeMillis()); //This will be the last time we updated
-    		return prefAdd.commit();
-		}
-		return false;
-	}
-
-	/**
-	 * Retrieves the list of available applications from user's shared prefs.
-	 * @param context The application's environment.
-	 * @return The JSON string that was retrieved.
-	 */
-	protected static String getTrustedList(Context context){
-			if(context!=null){
-				SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
-				return pref.getString(SDL_PACKAGE_LIST, DEFAULT_APP_LIST);
-			}
-			return null;
-	}
-	
-	/**
-	 * Retrieves the time stamp from the user's shared prefs.
-	 * @param context The application's environment.
-	 * @return The time stamp that was retrieved.
-	 */
-	protected static Long getTrustedAppListTimeStamp(Context context){
-		if(context!=null){
-			SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
-			return pref.getLong(SDL_PACKAGE_LIST_TIMESTAMP, 0);
-		}
-		return -1L;
-	}
-
-	protected static boolean setLastRequest(Context context, String request){
-		if(context!=null){
-			SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
-			SharedPreferences.Editor prefAdd = pref.edit();
-			prefAdd.putString(SDL_LAST_REQUEST, request);
-			return prefAdd.commit();
-		}
-		return false;
-	}
-	
-	/**
-	 * Gets the last request JSON object we sent to the RSVP server. It basically contains a list of sdl enabled apps
-	 * @param context
-	 * @return
-	 */
-	protected static String getLastRequest(Context context){
-		if(context!=null){
-			SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
-			return pref.getString(SDL_LAST_REQUEST, null);
-		}
-		return null;
-	}
-	
-	protected static boolean cacheSecurityLevel(Context context, int securityLevel){
-		if(context!=null){
-			SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
-			SharedPreferences.Editor prefAdd = pref.edit();
-			prefAdd.putInt(SDL_RSVP_SECURITY_LEVEL, securityLevel);
-			return prefAdd.commit();
-		}
-		return false;
-	}
-	
-	protected static int getSecurityLevel(Context context){
-		if(context!=null){
-			SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
-			return pref.getInt(SDL_RSVP_SECURITY_LEVEL, MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED);
-		}
-		return MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED;
-	}
-	
-	/**
-	 * Class that holds all the info we want to send/receive from the validation server
-	 */
-	public static class SdlApp{
-		final String packageName;
-		final int versionCode;
-		
-		SdlApp(String packageName, int versionCode){
-			this.packageName = packageName;
-			this.versionCode = versionCode;
-		}
-	}
-	
-	public enum TrustedAppStore{
-		PLAY_STORE("com.android.vending"),
-		AMAZON("com.amazon.venezia"),
-		XIAOMI("com.xiaomi.market"),
-		SAMSUNG("com.sec.android.app.samsungapps"),
-		WANDOUJIA("com.wandoujia.phoenix2"),
-		BAIDU_APP_SEARCH("com.baidu.appsearch"),
-		HIAPK("com.hiapk.marketpho"),
-		;
-		
-		final String packageString;
-		private TrustedAppStore(String packageString){
-			this.packageString = packageString;
-		}
-		
-		/**
-		 * Test if the supplied store package is one of the trusted app stores
-		 * @param packageString
-		 * @return
-		 */
-		public static boolean isTrustedStore(String packageString){
-			if(packageString == null){
-				return false;
-			}
-			TrustedAppStore[] stores = TrustedAppStore.values();
-			for (TrustedAppStore store : stores) {
-				if (packageString.equalsIgnoreCase(store.packageString)) {
-					return true;
-				}
-			}
-			return false;
-		}
-		
-	}
-	/**
-	 * This interface is used as a callback to know when we have either obtained a list or at least returned from our attempt.
-	 *
-	 */
-	public interface TrustedListCallback{
-		void onListObtained(boolean successful);
-	}
+    private static final String TAG = "RSVP";
+    public static final String ROUTER_SERVICE_PACKAGE = "com.sdl.router";
+
+    private static final String REQUEST_PREFIX = "https://woprjr.smartdevicelink.com/api/1/applications/queryTrustedRouters";
+
+    private static final String DEFAULT_APP_LIST = "{\"response\": {\"com.livio.sdl\" : { \"versionBlacklist\":[] }, \"com.lexus.tcapp\" : { \"versionBlacklist\":[] }, \"com.toyota.tcapp\" : { \"versionBlacklist\": [] } , \"com.sdl.router\":{\"versionBlacklist\": [] },\"com.ford.fordpass\" : { \"versionBlacklist\":[] } }}";
+
+
+    private static final String JSON_RESPONSE_OBJECT_TAG = "response";
+    private static final String JSON_RESPONSE_APP_VERSIONS_TAG = "versionBlacklist";
+
+    private static final String JSON_PUT_ARRAY_TAG = "installedApps";
+    private static final String JSON_APP_PACKAGE_TAG = "packageName";
+    private static final String JSON_APP_VERSION_TAG = "version";
+
+
+    private static final long REFRESH_TRUSTED_APP_LIST_TIME_DAY = 3600000 * 24; // A day in ms
+
+    private static final String SDL = "sdl";
+    private static final String SDL_PACKAGE_LIST = "sdl_package_list";
+    private static final String SDL_PACKAGE_LIST_TIMESTAMP = "sdl_package_list_timestamp";
+    private static final String SDL_LAST_REQUEST = "sdl_last_request";
+    private static final String SDL_RSVP_SECURITY_LEVEL = "sdl_rsvp_security_level";
+
+
+    //Flags to aid in debugging and production checks
+    public static final int FLAG_DEBUG_NONE = 0x00;
+    public static final int FLAG_DEBUG_PACKAGE_CHECK = 0x01;
+    /**
+     * This will flag the validator to check for app version during debugging.
+     * <br><br><b>NOTE: This flag will include a package check as well.
+     */
+    public static final int FLAG_DEBUG_VERSION_CHECK = 0x03; //We use 3 because version check will be 2, but since a version check implies a package check we do 2+1=3;
+    public static final int FLAG_DEBUG_INSTALLED_FROM_CHECK = 0x04;
+    public static final int FLAG_DEBUG_USE_TIMESTAMP_CHECK = 0x05;
+
+    public static final int FLAG_DEBUG_PERFORM_ALL_CHECKS = 0xFF;
+
+
+    private int flags = FLAG_DEBUG_NONE;
+
+    private Context context;
+    private boolean inDebugMode = false;
+    private static boolean pendingListRefresh = false;
+
+    private ComponentName service;//This is how we can save different routers over another in a waterfall method if we choose to.
+
+    private static int securityLevel = -1;
+
+    public RouterServiceValidator(Context context) {
+        this.context = context;
+        inDebugMode = inDebugMode();
+    }
+
+    public RouterServiceValidator(Context context, ComponentName service) {
+        this.context = context;
+        inDebugMode = inDebugMode();
+        this.service = service;
+    }
+
+    public RouterServiceValidator(@NonNull MultiplexTransportConfig config) {
+        this.context = config.context;
+        this.service = config.service;
+        setSecurityLevel(config.securityLevel);
+        inDebugMode = inDebugMode();
+    }
+
+    /**
+     * Asynchronously validate the target RouterService, which includes finding the right RouterService.
+     *
+     * @param callback: callback gets called when validation finishes.
+     */
+    public void validateAsync(final ValidationStatusCallback callback) {
+        if (securityLevel == -1) {
+            securityLevel = getSecurityLevel(context);
+        }
+
+        final PackageManager pm = context.getPackageManager();
+        //Grab the package for the currently running router service. We need this call regardless of if we are in debug mode or not.
+
+        if (this.service != null) {
+            DebugTool.logInfo(TAG, "Supplied service name of " + this.service.getClassName());
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O && !isServiceRunning(context, this.service)) {
+                //This means our service isn't actually running, so set to null. Hopefully we can find a real router service after this.
+                service = null;
+                DebugTool.logWarning(TAG, "Supplied service is not actually running.");
+            } else {
+                // If the running router service is created by this app, the validation is good by default
+                if (this.service.getPackageName().equals(context.getPackageName()) && callback != null) {
+                    callback.onFinishedValidation(true, this.service);
+                    return;
+                }
+            }
+        }
+
+        if (this.service == null) {
+            DebugTool.logInfo(TAG, "about finding the best Router by using retrieveBestRouterServiceName");
+            new FindRouterTask(new FindConnectedRouterCallback() {
+                @Override
+                public void onFound(ComponentName component) {
+                    DebugTool.logInfo(TAG, "FindConnectedRouterCallback.onFound got called. Package=" + component);
+                    checkTrustedRouter(callback, pm, component);
+                }
+
+                @Override
+                public void onFailed() {
+                    DebugTool.logInfo(TAG, "FindConnectedRouterCallback.onFailed was called");
+                    if (callback != null) {
+                        callback.onFinishedValidation(false, null);
+                    }
+                }
+            }).execute(this.context);
+        } else {
+            // already found the RouterService
+            checkTrustedRouter(callback, pm, service);
+        }
+
+    }
+
+    /**
+     * checkTrustedRouter: This checks to see if the given component is Trusted RouterService,
+     * and calls ValidationStatusCallback#onFinishedValidation.
+     *
+     * @param callback
+     * @param pm
+     * @param component
+     */
+    private void checkTrustedRouter(final ValidationStatusCallback callback, final PackageManager pm, final ComponentName component) {
+        String packageName = appPackageForComponentName(component, pm);
+        boolean valid = (securityLevel == MultiplexTransportConfig.FLAG_MULTI_SECURITY_OFF);
+
+        if (!valid && packageName != null) {//Make sure there is a service running
+            if (wasInstalledByAppStore(packageName)) { //Was this package installed from a trusted app store
+                if (isTrustedPackage(packageName, pm)) {//Is this package on the list of trusted apps.
+                    valid = true;
+                }
+            }
+        }
+        if (callback != null) {
+            callback.onFinishedValidation(valid, component);
+            if (valid) {
+                synchronized (this) {
+                    this.service = component;
+                }
+            }
+        }
+    }
+    /**
+     * This method retrieves the best routerservice name asynchronously.
+     * @param context
+     */
+    //private void retrieveBestRouterServiceName(Context context) {
+    //	FindRouterTask task = new FindRouterTask(null);
+    //	task.execute(context);
+    //}
+
+    /**
+     * FindRouterTask: AsyncTask to find the connected RouterService.
+     */
+    class FindRouterTask extends AsyncTask<Context, Void, ComponentName> {
+        final FindConnectedRouterCallback mCallback;
+        final Handler mHandler = new Handler(Looper.getMainLooper());
+        final Integer TIMEOUT_MSEC = 10000; // 10 sec
+
+        FindRouterTask(FindConnectedRouterCallback callback) {
+            mCallback = callback;
+        }
+
+        @Override
+        protected ComponentName doInBackground(final Context... contexts) {
+            // let's use ServiceFinder here
+            final BlockingQueue<ComponentName> serviceQueue = new LinkedBlockingQueue<>();
+            final AtomicInteger _counter = new AtomicInteger(0);
+            Context context = contexts[0];
+            final Thread _currentThread = Thread.currentThread();
+            new ServiceFinder(context, context.getPackageName(), new ServiceFinder.ServiceFinderCallback() {
+                @Override
+                public void onComplete(Vector<ComponentName> routerServices) {
+                    // OK, we found the routerServices. Let's see one-by-one.
+                    if (routerServices == null || routerServices.isEmpty()) {
+                        _currentThread.interrupt();
+                        return;
+                    }
+
+
+                    final int numServices = routerServices.size();
+                    for (ComponentName name : routerServices) {
+                        final SdlRouterStatusProvider provider = new SdlRouterStatusProvider(contexts[0], name, new SdlRouterStatusProvider.ConnectedStatusCallback() {
+                            @Override
+                            public void onConnectionStatusUpdate(final boolean connected, final ComponentName service, final Context context) {
+                                // make sure this part runs on main thread.
+                                mHandler.post(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        _counter.incrementAndGet();
+                                        if (connected) {
+                                            DebugTool.logInfo(TAG, "We found the connected service (" + service + "); currentThread is " + Thread.currentThread().getName());
+                                            serviceQueue.add(service);
+                                        } else if (_counter.get() == numServices) {
+                                            DebugTool.logInfo(TAG, "SdlRouterStatusProvider returns service=" + service + "; connected=" + connected);
+                                            _currentThread.interrupt();
+                                        }
+                                    }
+                                });
+                            }
+                        });
+                        DebugTool.logInfo(TAG, "about checkIsConnected; thread=" + Thread.currentThread().getName());
+                        provider.checkIsConnected();
+                    }
+                }
+            });
+
+            try {
+                ComponentName found = serviceQueue.poll(TIMEOUT_MSEC, TimeUnit.MILLISECONDS);
+                return found;
+            } catch (InterruptedException e) {
+                DebugTool.logInfo(TAG, "FindRouterTask was interrupted because connected Router cannot be found");
+            }
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(ComponentName componentName) {
+            DebugTool.logInfo(TAG, "onPostExecute componentName=" + componentName);
+            super.onPostExecute(componentName);
+            if (mCallback != null) {
+                if (componentName != null && componentName.getPackageName() != null && componentName.getPackageName().length() != 0) {
+                    mCallback.onFound(componentName);
+                } else {
+                    mCallback.onFailed();
+                }
+            }
+        }
+
+    }
+
+    /**
+     * FindConnectedRouterCallback
+     * Used internally for validating router service.
+     */
+    private interface FindConnectedRouterCallback {
+        void onFound(ComponentName component);
+
+        void onFailed();
+    }
+
+    interface ValidationStatusCallback {
+        void onFinishedValidation(boolean valid, ComponentName name);
+    }
+
+    /**
+     * This will ensure that all router services are aware that there are no valid router services running and should start up
+     */
+    private void wakeUpRouterServices() {
+        if (BluetoothAdapter.getDefaultAdapter() != null && BluetoothAdapter.getDefaultAdapter().isEnabled()) {
+            Intent intent = new Intent(TransportConstants.START_ROUTER_SERVICE_ACTION);
+            intent.putExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA, true);
+            AndroidTools.sendExplicitBroadcast(context, intent, null);
+        }
+    }
+
+    public ComponentName getService() {
+        return this.service;
+    }
+
+    private boolean shouldOverrideVersionCheck() {
+        return (this.inDebugMode && ((this.flags & FLAG_DEBUG_VERSION_CHECK) != FLAG_DEBUG_VERSION_CHECK));
+    }
+
+    private boolean shouldOverridePackageName() {
+        return (this.inDebugMode && ((this.flags & FLAG_DEBUG_PACKAGE_CHECK) != FLAG_DEBUG_PACKAGE_CHECK));
+    }
+
+    private boolean shouldOverrideInstalledFrom() {
+        return securityLevel < MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH
+                || (this.inDebugMode && ((this.flags & FLAG_DEBUG_INSTALLED_FROM_CHECK) != FLAG_DEBUG_INSTALLED_FROM_CHECK));
+    }
+
+    private boolean shouldOverrideTimeCheck() {
+        return (this.inDebugMode && ((this.flags & FLAG_DEBUG_USE_TIMESTAMP_CHECK) != FLAG_DEBUG_USE_TIMESTAMP_CHECK));
+    }
+
+
+    /**
+     * Use this method if you would like to test your app in a production setting rather than defaulting to a
+     * debug mode where you connect to whatever router service is running.
+     * <br><br><b>These flags are only used in debugging mode. During production they will be ignored.</b>
+     *
+     * @param flags
+     */
+    public void setFlags(int flags) {
+        this.flags = flags;
+    }
+
+    public void setSecurityLevel(int securityLevel) {
+        RouterServiceValidator.securityLevel = securityLevel;
+        cacheSecurityLevel(this.context, securityLevel);
+    }
+
+    protected static long getRefreshRate() {
+        switch (securityLevel) {
+            case MultiplexTransportConfig.FLAG_MULTI_SECURITY_LOW:
+                return 30 * REFRESH_TRUSTED_APP_LIST_TIME_DAY;
+            case MultiplexTransportConfig.FLAG_MULTI_SECURITY_HIGH:
+            case MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED:
+            default:
+                return 7 * REFRESH_TRUSTED_APP_LIST_TIME_DAY;
+
+        }
+    }
+
+    /**
+     * This method will find which router service is running. Use that info to find out more about that app and service.
+     * It will store the found service for later use and return the package name if found.
+     *
+     * @param pm An instance of a package manager. This is no longer used so null can be sent.
+     * @return
+     */
+    public ComponentName componentNameForServiceRunning(PackageManager pm) {
+        if (context == null) {
+            return null;
+        }
+        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        //PackageManager pm = context.getPackageManager();
+
+        if (manager != null) {
+            for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+                //Log.d(TAG, service.service.getClassName());
+                //We will check to see if it contains this name, should be pretty specific
+                if ((service.service.getClassName()).toLowerCase(Locale.US).contains(SdlBroadcastReceiver.SDL_ROUTER_SERVICE_CLASS_NAME)) {
+                    //this.service = service.service; //This is great
+                    if (service.started && service.restarting == 0) { //If this service has been started and is not crashed
+                        return service.service; //appPackageForComponenetName(service.service,pm);
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the package name for the component name
+     *
+     * @param cn
+     * @param pm
+     * @return
+     */
+    private String appPackageForComponentName(ComponentName cn, PackageManager pm) {
+        if (cn != null && pm != null) {
+            ServiceInfo info;
+            try {
+                info = pm.getServiceInfo(cn, 0);
+                return info.applicationInfo.packageName;
+            } catch (NameNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+
+    }
+
+    /**
+     * Check to see if the app was installed from a trusted app store.
+     *
+     * @param packageName the package name of the app to be tested
+     * @return whether or not the app was installed from a trusted app store
+     */
+    public boolean wasInstalledByAppStore(String packageName) {
+        if (shouldOverrideInstalledFrom()) {
+            return true;
+        }
+        PackageManager packageManager = context.getPackageManager();
+        try {
+            final ApplicationInfo applicationInfo = packageManager.getApplicationInfo(packageName, 0);
+            if (TrustedAppStore.isTrustedStore(packageManager.getInstallerPackageName(applicationInfo.packageName))) {
+                // App was installed by trusted app store
+                return true;
+            }
+        } catch (final NameNotFoundException e) {
+            e.printStackTrace();
+            return false;
+        }
+        return false;
+    }
+
+    /**
+     * This method will check to see if this app is a debug build. If it is, we will attempt to connect to any router service.
+     * If false, it will only connect to approved apps with router services.
+     *
+     * @return
+     */
+    public boolean inDebugMode() {
+        return (0 != (context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE));
+    }
+
+
+    private boolean isTrustedPackage(String packageName, PackageManager pm) {
+        if (packageName == null) {
+            return false;
+        }
+
+        if (shouldOverridePackageName()) { //If we don't care about package names, just return true;
+            return true;
+        }
+
+        int version = -1;
+        try {
+            version = pm.getPackageInfo(packageName, 0).versionCode;
+        } catch (NameNotFoundException e1) {
+            e1.printStackTrace();
+            return false;
+        }
+
+        JSONObject trustedApps = stringToJson(getTrustedList(context));
+        JSONArray versions;
+        JSONObject app;
+
+        try {
+            app = trustedApps.getJSONObject(packageName);
+        } catch (JSONException e) {
+            e.printStackTrace();
+            return false;
+        }
+
+        if (app != null) {
+            //At this point, an app object was found in the JSON list that matches the package name
+            if (shouldOverrideVersionCheck()) { //If we don't care about versions, just return true
+                return true;
+            }
+            try {
+                versions = app.getJSONArray(JSON_RESPONSE_APP_VERSIONS_TAG);
+            } catch (JSONException e) {
+                e.printStackTrace();
+                return false;
+            }
+            return verifyVersion(version, versions);
+        }
+
+        return false;
+    }
+
+    protected boolean verifyVersion(int version, JSONArray versions) {
+        if (version < 0) {
+            return false;
+        }
+        if (versions == null || versions.length() == 0) {
+            return true;
+        }
+        for (int i = 0; i < versions.length(); i++) {
+            try {
+                if (version == versions.getInt(i)) {
+                    return false;
+                }
+            } catch (JSONException e) {
+                continue;
+            }
+        }//We didn't find our version in the black list.
+        return true;
+    }
+
+    /**
+     * Using the knowledge that all SDL enabled apps have an SDL Broadcast Receiver that has an intent filter that includes a specific
+     * intent.
+     *
+     * @return
+     */
+    private static List<SdlApp> findAllSdlApps(Context context) {
+        List<SdlApp> apps = new ArrayList<>();
+        PackageManager packageManager = context.getPackageManager();
+        Intent intent = new Intent();
+        intent.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION);
+        List<ResolveInfo> infoList = packageManager.queryBroadcastReceivers(intent, 0);
+        //We want to sort our list so that we know it's the same every time
+        Collections.sort(infoList, new Comparator<ResolveInfo>() {
+            @Override
+            public int compare(ResolveInfo lhs, ResolveInfo rhs) {
+                return lhs.activityInfo.packageName.compareTo(rhs.activityInfo.packageName);
+            }
+        });
+        if (infoList != null) {
+            String packageName;
+            for (ResolveInfo info : infoList) {
+                //Log.i(TAG, "SDL apps: " + info.activityInfo.packageName);
+                packageName = info.activityInfo.packageName;
+                try {
+                    apps.add(new SdlApp(packageName, packageManager.getPackageInfo(packageName, 0).versionCode));
+                } catch (NameNotFoundException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            return apps;
+        } else {
+            DebugTool.logInfo(TAG, "No SDL apps, list was null");
+            return null;
+        }
+    }
+
+    /**
+     * Performs a look up against installed SDL apps that support the router service.
+     * When it receives a list back from the server it will store it for later use.
+     *
+     * @param context
+     */
+    public static boolean createTrustedListRequest(final Context context, boolean forceRefresh) {
+        return createTrustedListRequest(context, forceRefresh, null, null);
+    }
+
+    public static boolean createTrustedListRequest(final Context context, boolean forceRefresh, TrustedListCallback listCallback) {
+        DebugTool.logInfo(TAG, "Checking to make sure we have a list");
+        return createTrustedListRequest(context, forceRefresh, null, listCallback);
+    }
+
+    protected static boolean createTrustedListRequest(final Context context, boolean forceRefresh, HttpRequestTask.HttpRequestTaskCallback cb, final TrustedListCallback listCallback) {
+        if (context == null) {
+            return false;
+        } else if (getSecurityLevel(context) == MultiplexTransportConfig.FLAG_MULTI_SECURITY_OFF) { //If security is off, we can just return now
+            if (listCallback != null) {
+                listCallback.onListObtained(true);
+            }
+            return false;
+        }
+
+        pendingListRefresh = true;
+        //Might want to store a flag letting this class know a request is currently pending
+        StringBuilder builder = new StringBuilder();
+        builder.append(REQUEST_PREFIX);
+
+        List<SdlApp> apps = findAllSdlApps(context);
+
+        final JSONObject object = new JSONObject();
+        JSONArray array = new JSONArray();
+        JSONObject jsonApp;
+
+        if (apps != null) {
+            for (SdlApp app : apps) {    //Format all the apps into a JSON object and add it to the JSON array
+                try {
+                    jsonApp = new JSONObject();
+                    jsonApp.put(JSON_APP_PACKAGE_TAG, app.packageName);
+                    jsonApp.put(JSON_APP_VERSION_TAG, app.versionCode);
+                    array.put(jsonApp);
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                    continue;
+                }
+            }
+        }
+
+        try {
+            object.put(JSON_PUT_ARRAY_TAG, array);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        if (!forceRefresh && (System.currentTimeMillis() - getTrustedAppListTimeStamp(context)) < getRefreshRate()) {
+            if (object.toString().equals(getLastRequest(context))) {
+                //Our list should still be ok for now so we will skip the request
+                pendingListRefresh = false;
+                if (listCallback != null) {
+                    listCallback.onListObtained(true);
+                }
+                return false;
+            } else {
+                DebugTool.logInfo(TAG, "Sdl apps have changed. Need to request new trusted router service list.");
+            }
+        }
+
+        if (cb == null) {
+            cb = new HttpRequestTaskCallback() {
+
+                @Override
+                public void httpCallComplete(String response) {
+                    // Might want to check if this list is ok
+                    //Log.d(TAG, "APPS! " + response);
+                    setTrustedList(context, response);
+                    setLastRequest(context, object.toString()); //Save our last request
+                    pendingListRefresh = false;
+                    if (listCallback != null) {
+                        listCallback.onListObtained(true);
+                    }
+                }
+
+                @Override
+                public void httpFailure(int statusCode) {
+                    DebugTool.logError(TAG, "Error while requesting trusted app list: "
+                            + statusCode);
+                    pendingListRefresh = false;
+                    if (listCallback != null) {
+                        listCallback.onListObtained(false);
+                    }
+                }
+            };
+        }
+
+        new HttpRequestTask(cb).execute(REQUEST_PREFIX, HttpRequestTask.REQUEST_TYPE_POST, object.toString(), "application/json", "application/json");
+
+        return true;
+    }
+
+    /**
+     * This method will determine if our supplied component name is really running.
+     *
+     * @param context
+     * @param service
+     * @return
+     */
+    protected boolean isServiceRunning(Context context, ComponentName service) {
+        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        if (manager != null) {
+            for (RunningServiceInfo serviceInfo : manager.getRunningServices(Integer.MAX_VALUE)) {
+                if (serviceInfo.service.equals(service)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * Parses a string into a JSON array
+     *
+     * @param json
+     * @return
+     */
+    protected JSONObject stringToJson(String json) {
+        if (json == null) {
+            return stringToJson(DEFAULT_APP_LIST);
+        }
+        try {
+            JSONObject object = new JSONObject(json);
+            return object.getJSONObject(JSON_RESPONSE_OBJECT_TAG);
+
+        } catch (JSONException e) {
+            e.printStackTrace();
+            if (!json.equalsIgnoreCase(DEFAULT_APP_LIST)) { //Since we were unable to parse, let's fall back to at least our last known good list. If this list is somehow messed up, just quit.
+                return stringToJson(DEFAULT_APP_LIST);
+            } else {
+                return null;
+            }
+        }
+    }
+
+    public static boolean invalidateList(Context context) {
+        if (context == null) {
+            return false;
+        }
+        SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
+        // Write the new prefs
+        SharedPreferences.Editor prefAdd = pref.edit();
+        prefAdd.putLong(SDL_PACKAGE_LIST_TIMESTAMP, 0); //This will be the last time we updated
+        return prefAdd.commit();
+    }
+    /******************************************************************
+     *
+     * Saving the list for later!!!
+     *
+     ******************************************************************/
+
+    /**
+     * Saves the list of available applications into user's shared prefs.
+     *
+     * @param context    The application's environment
+     * @param jsonString The JSON string to save.
+     */
+    protected static boolean setTrustedList(Context context, String jsonString) {
+        if (jsonString != null && context != null) {
+            SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
+            // Write the new prefs
+            SharedPreferences.Editor prefAdd = pref.edit();
+            prefAdd.putString(SDL_PACKAGE_LIST, jsonString);
+            prefAdd.putLong(SDL_PACKAGE_LIST_TIMESTAMP, System.currentTimeMillis()); //This will be the last time we updated
+            return prefAdd.commit();
+        }
+        return false;
+    }
+
+    /**
+     * Retrieves the list of available applications from user's shared prefs.
+     *
+     * @param context The application's environment.
+     * @return The JSON string that was retrieved.
+     */
+    protected static String getTrustedList(Context context) {
+        if (context != null) {
+            SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
+            return pref.getString(SDL_PACKAGE_LIST, DEFAULT_APP_LIST);
+        }
+        return null;
+    }
+
+    /**
+     * Retrieves the time stamp from the user's shared prefs.
+     *
+     * @param context The application's environment.
+     * @return The time stamp that was retrieved.
+     */
+    protected static Long getTrustedAppListTimeStamp(Context context) {
+        if (context != null) {
+            SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
+            return pref.getLong(SDL_PACKAGE_LIST_TIMESTAMP, 0);
+        }
+        return -1L;
+    }
+
+    protected static boolean setLastRequest(Context context, String request) {
+        if (context != null) {
+            SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
+            SharedPreferences.Editor prefAdd = pref.edit();
+            prefAdd.putString(SDL_LAST_REQUEST, request);
+            return prefAdd.commit();
+        }
+        return false;
+    }
+
+    /**
+     * Gets the last request JSON object we sent to the RSVP server. It basically contains a list of sdl enabled apps
+     *
+     * @param context
+     * @return
+     */
+    protected static String getLastRequest(Context context) {
+        if (context != null) {
+            SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
+            return pref.getString(SDL_LAST_REQUEST, null);
+        }
+        return null;
+    }
+
+    protected static boolean cacheSecurityLevel(Context context, int securityLevel) {
+        if (context != null) {
+            SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
+            SharedPreferences.Editor prefAdd = pref.edit();
+            prefAdd.putInt(SDL_RSVP_SECURITY_LEVEL, securityLevel);
+            return prefAdd.commit();
+        }
+        return false;
+    }
+
+    protected static int getSecurityLevel(Context context) {
+        if (context != null) {
+            SharedPreferences pref = context.getSharedPreferences(SDL, Context.MODE_PRIVATE);
+            return pref.getInt(SDL_RSVP_SECURITY_LEVEL, MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED);
+        }
+        return MultiplexTransportConfig.FLAG_MULTI_SECURITY_MED;
+    }
+
+    /**
+     * Class that holds all the info we want to send/receive from the validation server
+     */
+    public static class SdlApp {
+        final String packageName;
+        final int versionCode;
+
+        SdlApp(String packageName, int versionCode) {
+            this.packageName = packageName;
+            this.versionCode = versionCode;
+        }
+    }
+
+    public enum TrustedAppStore {
+        PLAY_STORE("com.android.vending"),
+        AMAZON("com.amazon.venezia"),
+        XIAOMI("com.xiaomi.market"),
+        SAMSUNG("com.sec.android.app.samsungapps"),
+        WANDOUJIA("com.wandoujia.phoenix2"),
+        BAIDU_APP_SEARCH("com.baidu.appsearch"),
+        HIAPK("com.hiapk.marketpho"),
+        ;
+
+        final String packageString;
+
+        private TrustedAppStore(String packageString) {
+            this.packageString = packageString;
+        }
+
+        /**
+         * Test if the supplied store package is one of the trusted app stores
+         *
+         * @param packageString
+         * @return
+         */
+        public static boolean isTrustedStore(String packageString) {
+            if (packageString == null) {
+                return false;
+            }
+            TrustedAppStore[] stores = TrustedAppStore.values();
+            for (TrustedAppStore store : stores) {
+                if (packageString.equalsIgnoreCase(store.packageString)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+    }
+
+    /**
+     * This interface is used as a callback to know when we have either obtained a list or at least returned from our attempt.
+     */
+    public interface TrustedListCallback {
+        void onListObtained(boolean successful);
+    }
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
index 3229d4abd..605200ce5 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
@@ -65,551 +65,560 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 
 import static com.smartdevicelink.transport.TransportConstants.FOREGROUND_EXTRA;
 
-public abstract class SdlBroadcastReceiver extends BroadcastReceiver{
-	
-	private static final String TAG = "Sdl Broadcast Receiver";
-
-	protected static final String SDL_ROUTER_SERVICE_CLASS_NAME 			= "sdlrouterservice";
-	
-	public static final String LOCAL_ROUTER_SERVICE_EXTRA					= "router_service";
-	public static final String LOCAL_ROUTER_SERVICE_DID_START_OWN			= "did_start";
-	
-	public static final String TRANSPORT_GLOBAL_PREFS 						= "SdlTransportPrefs"; 
-	public static final String IS_TRANSPORT_CONNECTED						= "isTransportConnected"; 
-		
-	public static Vector<ComponentName> runningBluetoothServicePackage = null;
+public abstract class SdlBroadcastReceiver extends BroadcastReceiver {
+
+    private static final String TAG = "Sdl Broadcast Receiver";
+
+    protected static final String SDL_ROUTER_SERVICE_CLASS_NAME = "sdlrouterservice";
+
+    public static final String LOCAL_ROUTER_SERVICE_EXTRA = "router_service";
+    public static final String LOCAL_ROUTER_SERVICE_DID_START_OWN = "did_start";
+
+    public static final String TRANSPORT_GLOBAL_PREFS = "SdlTransportPrefs";
+    public static final String IS_TRANSPORT_CONNECTED = "isTransportConnected";
+
+    public static Vector<ComponentName> runningBluetoothServicePackage = null;
 
     @SuppressWarnings("rawtypes")
-	private static Class localRouterClass;
+    private static Class localRouterClass;
 
     private static final Object QUEUED_SERVICE_LOCK = new Object();
     private static ComponentName queuedService = null;
-	private static Thread.UncaughtExceptionHandler foregroundExceptionHandler = null;
+    private static Thread.UncaughtExceptionHandler foregroundExceptionHandler = null;
     private static final Object DEVICE_LISTENER_LOCK = new Object();
-	private static SdlDeviceListener sdlDeviceListener;
-
-	public int getRouterServiceVersion(){
-		return SdlRouterService.ROUTER_SERVICE_VERSION_NUMBER;	
-	}
-	
-	@Override
-	@CallSuper
-	public void onReceive(Context context, Intent intent) {
-		//Log.i(TAG, "Sdl Receiver Activated");
-		final String action = intent.getAction();
-		if(action == null){
-			return;
-		}
-
-		BluetoothDevice device = null;
-
-		if(action.equalsIgnoreCase(Intent.ACTION_PACKAGE_ADDED)
-				|| action.equalsIgnoreCase(Intent.ACTION_PACKAGE_REPLACED)){
-			//The package manager has sent out a new broadcast. 
-			RouterServiceValidator.invalidateList(context);
-			return;
-		}
-		
-        if(!(action.equalsIgnoreCase(BluetoothDevice.ACTION_ACL_CONNECTED)
-        		|| action.equalsIgnoreCase(TransportConstants.ACTION_USB_ACCESSORY_ATTACHED)
-        		|| action.equalsIgnoreCase(TransportConstants.START_ROUTER_SERVICE_ACTION))){
-        	//We don't want anything else here if the child class called super and has different intent filters
-        	//Log.i(TAG, "Unwanted intent from child class");
-        	return;
+    private static SdlDeviceListener sdlDeviceListener;
+
+    public int getRouterServiceVersion() {
+        return SdlRouterService.ROUTER_SERVICE_VERSION_NUMBER;
+    }
+
+    @Override
+    @CallSuper
+    public void onReceive(Context context, Intent intent) {
+        //Log.i(TAG, "Sdl Receiver Activated");
+        final String action = intent.getAction();
+        if (action == null) {
+            return;
+        }
+
+        BluetoothDevice device = null;
+
+        if (action.equalsIgnoreCase(Intent.ACTION_PACKAGE_ADDED)
+                || action.equalsIgnoreCase(Intent.ACTION_PACKAGE_REPLACED)) {
+            //The package manager has sent out a new broadcast.
+            RouterServiceValidator.invalidateList(context);
+            return;
+        }
+
+        if (!(action.equalsIgnoreCase(BluetoothDevice.ACTION_ACL_CONNECTED)
+                || action.equalsIgnoreCase(TransportConstants.ACTION_USB_ACCESSORY_ATTACHED)
+                || action.equalsIgnoreCase(TransportConstants.START_ROUTER_SERVICE_ACTION))) {
+            //We don't want anything else here if the child class called super and has different intent filters
+            //Log.i(TAG, "Unwanted intent from child class");
+            return;
         }
-        
-        if(action.equalsIgnoreCase(TransportConstants.ACTION_USB_ACCESSORY_ATTACHED)){
-			DebugTool.logInfo(TAG,"Usb connected");
-        	intent.setAction(null);
-			onSdlEnabled(context, intent);
-			return;
+
+        if (action.equalsIgnoreCase(TransportConstants.ACTION_USB_ACCESSORY_ATTACHED)) {
+            DebugTool.logInfo(TAG, "Usb connected");
+            intent.setAction(null);
+            onSdlEnabled(context, intent);
+            return;
+        }
+
+        if (intent.hasExtra(BluetoothDevice.EXTRA_DEVICE)) {    //Grab the bluetooth device if available
+            device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+        }
+
+        boolean didStart = false;
+        if (localRouterClass == null) {
+            localRouterClass = defineLocalSdlRouterClass();
+            // we need to check this again because for USB apps, the returned class can still be null
+            if (AndroidTools.isDebugMode(context)) {
+                IntegrationValidator.ValidationResult result = IntegrationValidator.validate(context, localRouterClass, 0);
+                if (!result.isSuccessful()) {
+                    throw new RuntimeException(result.getResultText());
+                }
+            }
+        }
+
+        if (localRouterClass != null && localRouterClass.getName().equalsIgnoreCase(com.smartdevicelink.transport.SdlRouterService.class.getName())) {
+            DebugTool.logError(TAG, "You cannot use the default SdlRouterService class, it must be extended in your project. THIS WILL THROW AN EXCEPTION IN FUTURE RELEASES!!");
+        }
+
+        //This will only be true if we are being told to reopen our SDL service because SDL is enabled
+        if (action.equalsIgnoreCase(TransportConstants.START_ROUTER_SERVICE_ACTION)) {
+            if (intent.hasExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_EXTRA)) {
+                if (intent.getBooleanExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_EXTRA, false)) {
+                    String packageName = intent.getStringExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_APP_PACKAGE);
+                    final ComponentName componentName = intent.getParcelableExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_CMP_NAME);
+                    if (componentName != null) {
+                        final Intent finalIntent = intent;
+                        final Context finalContext = context;
+                        RouterServiceValidator.createTrustedListRequest(context, false, new TrustedListCallback() {
+                            @Override
+                            public void onListObtained(boolean successful) {
+                                //Log.v(TAG, "SDL enabled by router service from " + packageName + " component package " + componentName.getPackageName()  + " - " + componentName.getClassName());
+                                //List obtained. Let's start our service
+                                queuedService = componentName;
+                                finalIntent.setAction("com.sdl.noaction"); //Replace what's there so we do go into some unintended loop
+                                String transportType = finalIntent.getStringExtra(TransportConstants.START_ROUTER_SERVICE_TRANSPORT_CONNECTED);
+                                if (transportType != null) {
+                                    if (TransportType.USB.toString().equals(transportType)) {
+                                        finalIntent.putExtra(UsbManager.EXTRA_ACCESSORY, (Parcelable) null);
+                                    }
+                                }
+                                onSdlEnabled(finalContext, finalIntent);
+                            }
+
+                        });
+                    }
+
+                }
+                return;
+            } else if (intent.getBooleanExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA, false)) {
+                //We were told to wake up our router services
+                boolean altServiceWake = intent.getBooleanExtra(TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT, false);
+                didStart = wakeUpRouterService(context, false, altServiceWake, device);
+
+            }
         }
 
-		if(intent.hasExtra(BluetoothDevice.EXTRA_DEVICE)){	//Grab the bluetooth device if available
-			device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-		}
-
-		boolean didStart = false;
-		if (localRouterClass == null){
-			localRouterClass = defineLocalSdlRouterClass();
-			// we need to check this again because for USB apps, the returned class can still be null
-			if (AndroidTools.isDebugMode(context)) {
-				IntegrationValidator.ValidationResult result =	IntegrationValidator.validate(context, localRouterClass, 0);
-				if(!result.isSuccessful()){
-					throw new RuntimeException(result.getResultText());
-				}
-			}
-		}
-
-		if(localRouterClass != null && localRouterClass.getName().equalsIgnoreCase(com.smartdevicelink.transport.SdlRouterService.class.getName())){
-			DebugTool.logError(TAG, "You cannot use the default SdlRouterService class, it must be extended in your project. THIS WILL THROW AN EXCEPTION IN FUTURE RELEASES!!");
-		}
-
-		//This will only be true if we are being told to reopen our SDL service because SDL is enabled
-		if(action.equalsIgnoreCase(TransportConstants.START_ROUTER_SERVICE_ACTION)){ 
-			if(intent.hasExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_EXTRA)){	
-				if(intent.getBooleanExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_EXTRA, false)){
-					String packageName = intent.getStringExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_APP_PACKAGE);
-					final ComponentName componentName = intent.getParcelableExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_CMP_NAME);
-					if(componentName!=null){
-						final Intent finalIntent = intent;
-						final Context finalContext = context;
-						RouterServiceValidator.createTrustedListRequest(context, false, new TrustedListCallback(){
-							@Override
-							public void onListObtained(boolean successful) {
-								//Log.v(TAG, "SDL enabled by router service from " + packageName + " component package " + componentName.getPackageName()  + " - " + componentName.getClassName());
-								//List obtained. Let's start our service
-								queuedService = componentName;
-								finalIntent.setAction("com.sdl.noaction"); //Replace what's there so we do go into some unintended loop
-								String  transportType = finalIntent.getStringExtra(TransportConstants.START_ROUTER_SERVICE_TRANSPORT_CONNECTED);
-								if(transportType!= null ){
-									if(TransportType.USB.toString().equals(transportType)){
-										finalIntent.putExtra(UsbManager.EXTRA_ACCESSORY, (Parcelable)null);
-									}
-								}
-								onSdlEnabled(finalContext, finalIntent);
-							}
-							
-						});
-					}
-
-				}
-				return;
-			}else if(intent.getBooleanExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA, false)){
-				//We were told to wake up our router services
-				boolean altServiceWake = intent.getBooleanExtra(TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT, false);
-				didStart = wakeUpRouterService(context, false,altServiceWake,device );
-				
-			}
-		}
-
-
-		DebugTool.logInfo(TAG, "Check for local router");
-	    if(localRouterClass!=null){ //If there is a supplied router service lets run some logic regarding starting one
-	    	
-	    	if(!didStart){DebugTool.logInfo(TAG, "attempting to wake up router service");
-	    		didStart = wakeUpRouterService(context, true,false, device);
-	    	}
-
-	    	//So even though we started our own version, on some older phones we find that two services are started up so we want to make sure we send our version that we are working with
-	    	//We will send it an intent with the version number of the local instance and an intent to start this instance
-	    	
-	    	Intent serviceIntent =  new Intent(context, localRouterClass);
-	    	SdlRouterService.LocalRouterService self = SdlRouterService.getLocalRouterService(serviceIntent, serviceIntent.getComponent());
-	    	Intent restart = new Intent(SdlRouterService.REGISTER_NEWER_SERVER_INSTANCE_ACTION);
-	    	restart.putExtra(LOCAL_ROUTER_SERVICE_EXTRA, self);
-	    	restart.putExtra(LOCAL_ROUTER_SERVICE_DID_START_OWN, didStart);
-	    	context.sendBroadcast(restart);
-	    }
-	}
+
+        DebugTool.logInfo(TAG, "Check for local router");
+        if (localRouterClass != null) { //If there is a supplied router service lets run some logic regarding starting one
+
+            if (!didStart) {
+                DebugTool.logInfo(TAG, "attempting to wake up router service");
+                didStart = wakeUpRouterService(context, true, false, device);
+            }
+
+            //So even though we started our own version, on some older phones we find that two services are started up so we want to make sure we send our version that we are working with
+            //We will send it an intent with the version number of the local instance and an intent to start this instance
+
+            Intent serviceIntent = new Intent(context, localRouterClass);
+            SdlRouterService.LocalRouterService self = SdlRouterService.getLocalRouterService(serviceIntent, serviceIntent.getComponent());
+            Intent restart = new Intent(SdlRouterService.REGISTER_NEWER_SERVER_INSTANCE_ACTION);
+            restart.putExtra(LOCAL_ROUTER_SERVICE_EXTRA, self);
+            restart.putExtra(LOCAL_ROUTER_SERVICE_DID_START_OWN, didStart);
+            context.sendBroadcast(restart);
+        }
+    }
 
     /**
      * This method will attempt to start the router service.
-     * @param context to be used to start the service and send broadcasts
-     * @param componentName the router service that should be started
+     *
+     * @param context          to be used to start the service and send broadcasts
+     * @param componentName    the router service that should be started
      * @param altTransportWake if the alt transport flag should be set. Only used in debug
-     * @param device the connected bluetooth device
+     * @param device           the connected bluetooth device
      */
-	private static void startRouterService(Context context, ComponentName componentName, boolean altTransportWake, BluetoothDevice device, boolean confirmedDevice) {
-		if (componentName == null) {
-			return;
-		}
+    private static void startRouterService(Context context, ComponentName componentName, boolean altTransportWake, BluetoothDevice device, boolean confirmedDevice) {
+        if (componentName == null) {
+            return;
+        }
 
-		Intent serviceIntent = new Intent();
-		serviceIntent.setComponent(componentName);
+        Intent serviceIntent = new Intent();
+        serviceIntent.setComponent(componentName);
 
-		if (altTransportWake) {
-			serviceIntent.setAction(TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT);
-		}
+        if (altTransportWake) {
+            serviceIntent.setAction(TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT);
+        }
 
-		if (device != null) {
-			serviceIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
-		}
+        if (device != null) {
+            serviceIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
+        }
 
-		if (confirmedDevice) {
-		    serviceIntent.putExtra(TransportConstants.CONFIRMED_SDL_DEVICE, confirmedDevice);
+        if (confirmedDevice) {
+            serviceIntent.putExtra(TransportConstants.CONFIRMED_SDL_DEVICE, confirmedDevice);
         }
 
-		try {
-			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-				context.startService(serviceIntent);
-			} else {
-				serviceIntent.putExtra(FOREGROUND_EXTRA, true);
-				DebugTool.logInfo(TAG, "Attempting to startForegroundService - " + System.currentTimeMillis());
-				setForegroundExceptionHandler(); //Prevent ANR in case the OS takes too long to start the service
-				context.startForegroundService(serviceIntent);
-
-			}
-			//Make sure to send this out for old apps to close down
-			SdlRouterService.LocalRouterService self = SdlRouterService.getLocalRouterService(serviceIntent, serviceIntent.getComponent());
-			Intent restart = new Intent(SdlRouterService.REGISTER_NEWER_SERVER_INSTANCE_ACTION);
-			restart.putExtra(LOCAL_ROUTER_SERVICE_EXTRA, self);
-			restart.putExtra(LOCAL_ROUTER_SERVICE_DID_START_OWN, true);
-			context.sendBroadcast(restart);
-
-		} catch (SecurityException e) {
+        try {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                context.startService(serviceIntent);
+            } else {
+                serviceIntent.putExtra(FOREGROUND_EXTRA, true);
+                DebugTool.logInfo(TAG, "Attempting to startForegroundService - " + System.currentTimeMillis());
+                setForegroundExceptionHandler(); //Prevent ANR in case the OS takes too long to start the service
+                context.startForegroundService(serviceIntent);
+
+            }
+            //Make sure to send this out for old apps to close down
+            SdlRouterService.LocalRouterService self = SdlRouterService.getLocalRouterService(serviceIntent, serviceIntent.getComponent());
+            Intent restart = new Intent(SdlRouterService.REGISTER_NEWER_SERVER_INSTANCE_ACTION);
+            restart.putExtra(LOCAL_ROUTER_SERVICE_EXTRA, self);
+            restart.putExtra(LOCAL_ROUTER_SERVICE_DID_START_OWN, true);
+            context.sendBroadcast(restart);
+
+        } catch (SecurityException e) {
             DebugTool.logError(TAG, "Security exception, process is bad");
-		}
-	}
-
-	private boolean wakeUpRouterService(final Context context, final boolean ping, final boolean altTransportWake, final BluetoothDevice device){
-	    new ServiceFinder(context, context.getPackageName(), new ServiceFinder.ServiceFinderCallback() {
-				@Override
-				public void onComplete(Vector<ComponentName> routerServices) {
-					runningBluetoothServicePackage = new Vector<>();
-					runningBluetoothServicePackage.addAll(routerServices);
-					if (runningBluetoothServicePackage.isEmpty()) {
-						//If there isn't a service running we should try to start one
-						//We will try to sort the SDL enabled apps and find the one that's been installed the longest
-						final List<SdlAppInfo> sdlAppInfoList = AndroidTools.querySdlAppInfo(context, new SdlAppInfo.BestRouterComparator());
-						synchronized (DEVICE_LISTENER_LOCK) {
-							final boolean sdlDeviceListenerEnabled = SdlDeviceListener.isFeatureSupported(sdlAppInfoList);
-							if (sdlDeviceListenerEnabled) {
-								String myPackage = context.getPackageName();
-								String routerServicePackage = null;
-								if (sdlAppInfoList != null && !sdlAppInfoList.isEmpty() && sdlAppInfoList.get(0).getRouterServiceComponentName() != null) {
-									routerServicePackage = sdlAppInfoList.get(0).getRouterServiceComponentName().getPackageName();
-								}
-                                DebugTool.logInfo(TAG,  ": This app's package: " + myPackage);
-                                DebugTool.logInfo(TAG,  ": Router service app's package: " + routerServicePackage);
-								if (myPackage != null && myPackage.equalsIgnoreCase(routerServicePackage)) {
-									SdlDeviceListener sdlDeviceListener = getSdlDeviceListener(context, device);
-									if (!sdlDeviceListener.isRunning()) {
-										sdlDeviceListener.start();
-									}
-								} else {
-                                    DebugTool.logInfo(TAG,  ": Not the app to start the router service nor device listener");
-								}
-								return;
-							}
-						}
-
-						if (sdlAppInfoList != null && !sdlAppInfoList.isEmpty()) {
-							startRouterService(context, sdlAppInfoList.get(0).getRouterServiceComponentName(), altTransportWake, device, false);
-						} else{
-                            DebugTool.logInfo(TAG, "No SDL Router Services found");
-                            DebugTool.logInfo(TAG, "WARNING: This application has not specified its SdlRouterService correctly in the manifest. THIS WILL THROW AN EXCEPTION IN FUTURE RELEASES!!");
-							return;
-						}
-
-					} else { //There are currently running services
-						if(DebugTool.isDebugEnabled()){
-							for(ComponentName service : runningBluetoothServicePackage){
-								DebugTool.logInfo(TAG, "Currently running router service: " + service.getPackageName());
-							}
-						}
-						if (altTransportWake) {
-							wakeRouterServiceAltTransport(context);
-							return;
-						}else{
-							for(ComponentName service : runningBluetoothServicePackage){
-								pingRouterService(context,service.getPackageName(),service.getClassName());
-							}
-						}
-						return;
-					}
-				}
-			});
-	    return true;
-	}
-
-	private void wakeRouterServiceAltTransport(Context context){
-		Intent serviceIntent = new Intent();
-		serviceIntent.setAction(TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT);
-		for (ComponentName compName : runningBluetoothServicePackage) {
-			serviceIntent.setComponent(compName);
-			try{
-				context.startService(serviceIntent);
-			} catch (Exception e){
-				DebugTool.logError(TAG, "Can't start router service for alt transport");
-			}
-
-		}
-	}
-
-	/**
-	 * This method will set a new UncaughtExceptionHandler for the current thread. The only
-	 * purpose of the custom UncaughtExceptionHandler is to catch the rare occurrence that the
-	 * SdlRouterService can't be started fast enough by the system after calling
-	 * startForegroundService so the onCreate method doesn't get called before the foreground promise
-	 * timer expires. The new UncaughtExceptionHandler will catch that specific exception and tell the
-	 * main looper to continue forward. This still leaves the SdlRouterService killed, but prevents
-	 * an ANR to the app that makes the startForegroundService call.
-	 */
-	static protected void setForegroundExceptionHandler() {
-		final Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
-		if(defaultUncaughtExceptionHandler != foregroundExceptionHandler){
-			foregroundExceptionHandler = new Thread.UncaughtExceptionHandler() {
-				@Override
-				public void uncaughtException(Thread t, Throwable e) {
-					if (e != null
-							&& e instanceof AndroidRuntimeException
-							&& "android.app.RemoteServiceException".equals(e.getClass().getName())  //android.app.RemoteServiceException is a private class
-							&& e.getMessage() != null
-							&& e.getMessage().contains("SdlRouterService")) {
-
-						DebugTool.logInfo(TAG, "Handling failed startForegroundService call");
-						Looper.loop();
-					} else if (defaultUncaughtExceptionHandler != null) { //No other exception should be handled
-						defaultUncaughtExceptionHandler.uncaughtException(t, e);
-					}
-				}
-			};
-			Thread.setDefaultUncaughtExceptionHandler(foregroundExceptionHandler);
-		}
-	}
-
-	/**
-	 * Determines if an instance of the Router Service is currently running on the device.<p>
-	 * <b>Note:</b> This method no longer works on Android Oreo or newer
-	 * @param context A context to access Android system services through.
-	 * @return True if a SDL Router Service is currently running, false otherwise.
-	 */
-	private static boolean isRouterServiceRunning(Context context){
-		if(context == null){
-			DebugTool.logError(TAG, "Can't look for router service, context supplied was null");
-			return false;
-		}
-		if (runningBluetoothServicePackage == null) {
-			runningBluetoothServicePackage = new Vector<>();
-		} else {
-			runningBluetoothServicePackage.clear();
-		}
-		ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-		if (manager != null) {
-			manager.getRunningAppProcesses();
-		}
-		List<RunningServiceInfo> runningServices;
-		try {
-			runningServices = manager.getRunningServices(Integer.MAX_VALUE);
-		} catch (NullPointerException e) {
-			DebugTool.logError(TAG, "Can't get list of running services");
-			return false;
-		}
-		for (RunningServiceInfo service : runningServices) {
-			//We will check to see if it contains this name, should be pretty specific
-			//Log.d(TAG, "Found Service: "+ service.service.getClassName());
-			if ((service.service.getClassName()).toLowerCase(Locale.US).contains(SDL_ROUTER_SERVICE_CLASS_NAME) && AndroidTools.isServiceExported(context, service.service)) {
-				runningBluetoothServicePackage.add(service.service);    //Store which instance is running
-			}
-		}
-		return runningBluetoothServicePackage.size() > 0;
-		
-	}
-
-	/**
-	 * Attempts to ping a running router service. It does call startForegroundService so it is
+        }
+    }
+
+    private boolean wakeUpRouterService(final Context context, final boolean ping, final boolean altTransportWake, final BluetoothDevice device) {
+        new ServiceFinder(context, context.getPackageName(), new ServiceFinder.ServiceFinderCallback() {
+            @Override
+            public void onComplete(Vector<ComponentName> routerServices) {
+                runningBluetoothServicePackage = new Vector<>();
+                runningBluetoothServicePackage.addAll(routerServices);
+                if (runningBluetoothServicePackage.isEmpty()) {
+                    //If there isn't a service running we should try to start one
+                    //We will try to sort the SDL enabled apps and find the one that's been installed the longest
+                    final List<SdlAppInfo> sdlAppInfoList = AndroidTools.querySdlAppInfo(context, new SdlAppInfo.BestRouterComparator());
+                    synchronized (DEVICE_LISTENER_LOCK) {
+                        final boolean sdlDeviceListenerEnabled = SdlDeviceListener.isFeatureSupported(sdlAppInfoList);
+                        if (sdlDeviceListenerEnabled) {
+                            String myPackage = context.getPackageName();
+                            String routerServicePackage = null;
+                            if (sdlAppInfoList != null && !sdlAppInfoList.isEmpty() && sdlAppInfoList.get(0).getRouterServiceComponentName() != null) {
+                                routerServicePackage = sdlAppInfoList.get(0).getRouterServiceComponentName().getPackageName();
+                            }
+                            DebugTool.logInfo(TAG, ": This app's package: " + myPackage);
+                            DebugTool.logInfo(TAG, ": Router service app's package: " + routerServicePackage);
+                            if (myPackage != null && myPackage.equalsIgnoreCase(routerServicePackage)) {
+                                SdlDeviceListener sdlDeviceListener = getSdlDeviceListener(context, device);
+                                if (!sdlDeviceListener.isRunning()) {
+                                    sdlDeviceListener.start();
+                                }
+                            } else {
+                                DebugTool.logInfo(TAG, ": Not the app to start the router service nor device listener");
+                            }
+                            return;
+                        }
+                    }
+
+                    if (sdlAppInfoList != null && !sdlAppInfoList.isEmpty()) {
+                        startRouterService(context, sdlAppInfoList.get(0).getRouterServiceComponentName(), altTransportWake, device, false);
+                    } else {
+                        DebugTool.logInfo(TAG, "No SDL Router Services found");
+                        DebugTool.logInfo(TAG, "WARNING: This application has not specified its SdlRouterService correctly in the manifest. THIS WILL THROW AN EXCEPTION IN FUTURE RELEASES!!");
+                        return;
+                    }
+
+                } else { //There are currently running services
+                    if (DebugTool.isDebugEnabled()) {
+                        for (ComponentName service : runningBluetoothServicePackage) {
+                            DebugTool.logInfo(TAG, "Currently running router service: " + service.getPackageName());
+                        }
+                    }
+                    if (altTransportWake) {
+                        wakeRouterServiceAltTransport(context);
+                        return;
+                    } else {
+                        for (ComponentName service : runningBluetoothServicePackage) {
+                            pingRouterService(context, service.getPackageName(), service.getClassName());
+                        }
+                    }
+                    return;
+                }
+            }
+        });
+        return true;
+    }
+
+    private void wakeRouterServiceAltTransport(Context context) {
+        Intent serviceIntent = new Intent();
+        serviceIntent.setAction(TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT);
+        for (ComponentName compName : runningBluetoothServicePackage) {
+            serviceIntent.setComponent(compName);
+            try {
+                context.startService(serviceIntent);
+            } catch (Exception e) {
+                DebugTool.logError(TAG, "Can't start router service for alt transport");
+            }
+
+        }
+    }
+
+    /**
+     * This method will set a new UncaughtExceptionHandler for the current thread. The only
+     * purpose of the custom UncaughtExceptionHandler is to catch the rare occurrence that the
+     * SdlRouterService can't be started fast enough by the system after calling
+     * startForegroundService so the onCreate method doesn't get called before the foreground promise
+     * timer expires. The new UncaughtExceptionHandler will catch that specific exception and tell the
+     * main looper to continue forward. This still leaves the SdlRouterService killed, but prevents
+     * an ANR to the app that makes the startForegroundService call.
+     */
+    static protected void setForegroundExceptionHandler() {
+        final Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
+        if (defaultUncaughtExceptionHandler != foregroundExceptionHandler) {
+            foregroundExceptionHandler = new Thread.UncaughtExceptionHandler() {
+                @Override
+                public void uncaughtException(Thread t, Throwable e) {
+                    if (e != null
+                            && e instanceof AndroidRuntimeException
+                            && "android.app.RemoteServiceException".equals(e.getClass().getName())  //android.app.RemoteServiceException is a private class
+                            && e.getMessage() != null
+                            && e.getMessage().contains("SdlRouterService")) {
+
+                        DebugTool.logInfo(TAG, "Handling failed startForegroundService call");
+                        Looper.loop();
+                    } else if (defaultUncaughtExceptionHandler != null) { //No other exception should be handled
+                        defaultUncaughtExceptionHandler.uncaughtException(t, e);
+                    }
+                }
+            };
+            Thread.setDefaultUncaughtExceptionHandler(foregroundExceptionHandler);
+        }
+    }
+
+    /**
+     * Determines if an instance of the Router Service is currently running on the device.<p>
+     * <b>Note:</b> This method no longer works on Android Oreo or newer
+     *
+     * @param context A context to access Android system services through.
+     * @return True if a SDL Router Service is currently running, false otherwise.
+     */
+    private static boolean isRouterServiceRunning(Context context) {
+        if (context == null) {
+            DebugTool.logError(TAG, "Can't look for router service, context supplied was null");
+            return false;
+        }
+        if (runningBluetoothServicePackage == null) {
+            runningBluetoothServicePackage = new Vector<>();
+        } else {
+            runningBluetoothServicePackage.clear();
+        }
+        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        if (manager != null) {
+            manager.getRunningAppProcesses();
+        }
+        List<RunningServiceInfo> runningServices;
+        try {
+            runningServices = manager.getRunningServices(Integer.MAX_VALUE);
+        } catch (NullPointerException e) {
+            DebugTool.logError(TAG, "Can't get list of running services");
+            return false;
+        }
+        for (RunningServiceInfo service : runningServices) {
+            //We will check to see if it contains this name, should be pretty specific
+            //Log.d(TAG, "Found Service: "+ service.service.getClassName());
+            if ((service.service.getClassName()).toLowerCase(Locale.US).contains(SDL_ROUTER_SERVICE_CLASS_NAME) && AndroidTools.isServiceExported(context, service.service)) {
+                runningBluetoothServicePackage.add(service.service);    //Store which instance is running
+            }
+        }
+        return runningBluetoothServicePackage.size() > 0;
+
+    }
+
+    /**
+     * Attempts to ping a running router service. It does call startForegroundService so it is
      * important to only call this as a ping if the service is already started.
-	 * @param context A context to access Android system services through.
-	 * @param packageName Package name for service to ping
-	 * @param className Class name for service to ping
-	 */
-	protected static void pingRouterService(Context context, String packageName, String className){
-		if(context == null || packageName == null || className == null){
-			return;
-		}
-		try{
-			Intent intent = new Intent();
-			intent.setClassName(packageName, className);
-			intent.putExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA, true);
-			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
-				intent.putExtra(FOREGROUND_EXTRA, true);
-				DebugTool.logInfo(TAG, "Attempting to startForegroundService - " + System.currentTimeMillis());
-				setForegroundExceptionHandler(); //Prevent ANR in case the OS takes too long to start the service
-				context.startForegroundService(intent);
-			}else {
-				context.startService(intent);
-			}
-		}catch(SecurityException e){
-			DebugTool.logError(TAG, "Security exception, process is bad");
-			// This service could not be started
-		}
-	}
-
-	/**
-	 * This call will reach out to all SDL related router services to check if they're connected. If a the router service is connected, it will react by pinging all clients. This receiver will then
-	 * receive that ping and if the router service is trusted, the onSdlEnabled method will be called. 
-	 * @param context
-	 */
-	public static void queryForConnectedService(final Context context){
-		if (AndroidTools.isDebugMode(context)) {
-			int flag = 0;
-			if(localRouterClass == null) {
-				flag = IntegrationValidator.FLAG_SKIP_ROUTER_SERVICE_CHECK;
-			}
-
-			IntegrationValidator.ValidationResult result =	IntegrationValidator.validate(context, localRouterClass, flag);
-			if(!result.isSuccessful()){
-				throw new RuntimeException(result.getResultText());
-			}
-		}
-		//Leverage existing call. Include ping bit
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){
-			ServiceFinder finder = new ServiceFinder(context, context.getPackageName(), new ServiceFinder.ServiceFinderCallback() {
-				@Override
-				public void onComplete(Vector<ComponentName> routerServices) {
-					runningBluetoothServicePackage = new Vector<>();
-					runningBluetoothServicePackage.addAll(routerServices);
-					requestTransportStatus(context,null,true,false);
-				}
-			});
-
-		}else{
-			requestTransportStatus(context,null,true,true);
-		}
-	}
-	/**
-	 * If a Router Service is running, this method determines if that service is connected to a device over some form of transport.
-	 * @param context A context to access Android system services through. If null is passed, this will always return false
-	 * @param callback Use this callback to find out if the router service is connected or not. 
-	 */
-	private static void requestTransportStatus(Context context, final SdlRouterStatusProvider.ConnectedStatusCallback callback, final boolean triggerRouterServicePing, final boolean lookForServices){
-		if(context == null){
-			if(callback!=null){
-				callback.onConnectionStatusUpdate(false, null,context);
-			}
-			return;
-		}
-		if((!lookForServices || isRouterServiceRunning(context)) && !runningBluetoothServicePackage.isEmpty()){	//So there is a service up, let's see if it's connected
-			final ConcurrentLinkedQueue<ComponentName> list = new ConcurrentLinkedQueue<>(runningBluetoothServicePackage);
-			final SdlRouterStatusProvider.ConnectedStatusCallback sdlBrCallback = new SdlRouterStatusProvider.ConnectedStatusCallback() {	
-
-				@Override
-				public void onConnectionStatusUpdate(boolean connected, ComponentName service,Context context) {
-					if(!connected && !list.isEmpty()){
-						SdlRouterStatusProvider provider = new SdlRouterStatusProvider(context,list.poll(), this);
-						if(triggerRouterServicePing){provider.setFlags(TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING);	}
-						provider.checkIsConnected();
-					}else{
-						if(service!=null){
-							DebugTool.logInfo(TAG, service.getPackageName() + " is connected = " + connected);
-						}else{
-							DebugTool.logInfo(TAG, "No service is connected/running");
-						}
-						if(callback!=null){
-							callback.onConnectionStatusUpdate(connected, service,context);
-						}
-						list.clear();
-					}
-
-				}
-			};
-			final SdlRouterStatusProvider provider = new SdlRouterStatusProvider(context,list.poll(),sdlBrCallback);
-			if(triggerRouterServicePing){
-				provider.setFlags(TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING);
-			}
-			//Lets ensure we have a current list of trusted router services
-			RouterServiceValidator.createTrustedListRequest(context, false, new TrustedListCallback(){
-				@Override
-				public void onListObtained(boolean successful) {
-					//This will kick off our check of router services
-					provider.checkIsConnected();
-				}
-			});
-				
-		}else{
-			DebugTool.logWarning(TAG, "Router service isn't running, returning false.");
-			if(isBluetoothConnected()){
-				DebugTool.logInfo(TAG, "Bluetooth is connected. Attempting to ping Router Service");
-				Intent serviceIntent = new Intent();
-				serviceIntent.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION);
-				serviceIntent.putExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA, true);
-	    		AndroidTools.sendExplicitBroadcast(context, serviceIntent,null);
-			}
-
-			if(callback!=null){
-				callback.onConnectionStatusUpdate(false, null,context);
-			}
-		}
-	}
-
-	@SuppressWarnings({"MissingPermission"})
-	private static boolean isBluetoothConnected() {
-		BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-		if(bluetoothAdapter != null && bluetoothAdapter.isEnabled()) {
-			int  a2dpState  = bluetoothAdapter.getProfileConnectionState(BluetoothProfile.A2DP);
-			int headSetState  = bluetoothAdapter.getProfileConnectionState(BluetoothProfile.HEADSET);
-
-			return ((a2dpState == BluetoothAdapter.STATE_CONNECTED || a2dpState == BluetoothAdapter.STATE_CONNECTING)
-					&& (headSetState == BluetoothAdapter.STATE_CONNECTED || headSetState == BluetoothAdapter.STATE_CONNECTING));
-		}
-		return false;
-	}
-
-
-	private static SdlDeviceListener getSdlDeviceListener(Context context, BluetoothDevice bluetoothDevice){
-
-		synchronized (DEVICE_LISTENER_LOCK){
-			if (sdlDeviceListener == null){
-				sdlDeviceListener = new SdlDeviceListener(context, bluetoothDevice, new SdlDeviceListener.Callback() {
-					@Override
-					public boolean onTransportConnected(Context context, BluetoothDevice bluetoothDevice) {
-
-						synchronized (DEVICE_LISTENER_LOCK){
-							sdlDeviceListener = null;
-							if(context != null) {
-								final List<SdlAppInfo> sdlAppInfoList = AndroidTools.querySdlAppInfo(context, new SdlAppInfo.BestRouterComparator());
-								if(sdlAppInfoList != null && !sdlAppInfoList.isEmpty()) {
-									ComponentName routerService = sdlAppInfoList.get(0).getRouterServiceComponentName();
-									startRouterService(context, routerService, false, bluetoothDevice, true);
-								}
-							}
-						}
-
-						return false;
-					}
-
-					@Override
-					public void onTransportDisconnected(BluetoothDevice bluetoothDevice) {
-						synchronized (DEVICE_LISTENER_LOCK){
-							sdlDeviceListener = null;
-						}
-					}
-
-					@Override
-					public void onTransportError(BluetoothDevice bluetoothDevice) {
-						synchronized (DEVICE_LISTENER_LOCK){
-							sdlDeviceListener = null;
-						}
-					}
-				});
-			}
-		}
-
-		return sdlDeviceListener;
-	}
-
-	public static ComponentName consumeQueuedRouterService(){
-		synchronized(QUEUED_SERVICE_LOCK){
-			ComponentName retVal = queuedService;
-			queuedService = null;
-			return retVal;
-		}
-	}
-	
-	/**
-	 * We need to define this for local copy of the Sdl Router Service class.
-	 * It will be the main point of connection for Sdl enabled apps
-	 * @return Return the local copy of SdlRouterService.class
-	 * {@inheritDoc}
-	 */
-	public abstract Class<? extends SdlRouterService> defineLocalSdlRouterClass();
-
-	
-	
-	/**
-	 * 
-	 * The developer will need to define exactly what should happen when Sdl is enabled.
-	 * This method will only get called when a Sdl  session is initiated.
-	 * <p> The most useful code here would be to start the activity or service that handles most of the Livio 
-	 * Connect code.
-	 * @param context this is the context that was passed to this receiver when it was called.
-	 * @param intent this is the intent that alerted this broadcast. Make sure to pass all extra it came with to your service/activity
-	 * {@inheritDoc}
-	 */
-	public abstract void onSdlEnabled(Context context, Intent intent);
-	
-	//public abstract void onSdlDisabled(Context context); //Removing for now until we're able to abstract from developer
+     *
+     * @param context     A context to access Android system services through.
+     * @param packageName Package name for service to ping
+     * @param className   Class name for service to ping
+     */
+    protected static void pingRouterService(Context context, String packageName, String className) {
+        if (context == null || packageName == null || className == null) {
+            return;
+        }
+        try {
+            Intent intent = new Intent();
+            intent.setClassName(packageName, className);
+            intent.putExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA, true);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                intent.putExtra(FOREGROUND_EXTRA, true);
+                DebugTool.logInfo(TAG, "Attempting to startForegroundService - " + System.currentTimeMillis());
+                setForegroundExceptionHandler(); //Prevent ANR in case the OS takes too long to start the service
+                context.startForegroundService(intent);
+            } else {
+                context.startService(intent);
+            }
+        } catch (SecurityException e) {
+            DebugTool.logError(TAG, "Security exception, process is bad");
+            // This service could not be started
+        }
+    }
+
+    /**
+     * This call will reach out to all SDL related router services to check if they're connected. If a the router service is connected, it will react by pinging all clients. This receiver will then
+     * receive that ping and if the router service is trusted, the onSdlEnabled method will be called.
+     *
+     * @param context
+     */
+    public static void queryForConnectedService(final Context context) {
+        if (AndroidTools.isDebugMode(context)) {
+            int flag = 0;
+            if (localRouterClass == null) {
+                flag = IntegrationValidator.FLAG_SKIP_ROUTER_SERVICE_CHECK;
+            }
+
+            IntegrationValidator.ValidationResult result = IntegrationValidator.validate(context, localRouterClass, flag);
+            if (!result.isSuccessful()) {
+                throw new RuntimeException(result.getResultText());
+            }
+        }
+        //Leverage existing call. Include ping bit
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            ServiceFinder finder = new ServiceFinder(context, context.getPackageName(), new ServiceFinder.ServiceFinderCallback() {
+                @Override
+                public void onComplete(Vector<ComponentName> routerServices) {
+                    runningBluetoothServicePackage = new Vector<>();
+                    runningBluetoothServicePackage.addAll(routerServices);
+                    requestTransportStatus(context, null, true, false);
+                }
+            });
+
+        } else {
+            requestTransportStatus(context, null, true, true);
+        }
+    }
+
+    /**
+     * If a Router Service is running, this method determines if that service is connected to a device over some form of transport.
+     *
+     * @param context  A context to access Android system services through. If null is passed, this will always return false
+     * @param callback Use this callback to find out if the router service is connected or not.
+     */
+    private static void requestTransportStatus(Context context, final SdlRouterStatusProvider.ConnectedStatusCallback callback, final boolean triggerRouterServicePing, final boolean lookForServices) {
+        if (context == null) {
+            if (callback != null) {
+                callback.onConnectionStatusUpdate(false, null, context);
+            }
+            return;
+        }
+        if ((!lookForServices || isRouterServiceRunning(context)) && !runningBluetoothServicePackage.isEmpty()) {    //So there is a service up, let's see if it's connected
+            final ConcurrentLinkedQueue<ComponentName> list = new ConcurrentLinkedQueue<>(runningBluetoothServicePackage);
+            final SdlRouterStatusProvider.ConnectedStatusCallback sdlBrCallback = new SdlRouterStatusProvider.ConnectedStatusCallback() {
+
+                @Override
+                public void onConnectionStatusUpdate(boolean connected, ComponentName service, Context context) {
+                    if (!connected && !list.isEmpty()) {
+                        SdlRouterStatusProvider provider = new SdlRouterStatusProvider(context, list.poll(), this);
+                        if (triggerRouterServicePing) {
+                            provider.setFlags(TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING);
+                        }
+                        provider.checkIsConnected();
+                    } else {
+                        if (service != null) {
+                            DebugTool.logInfo(TAG, service.getPackageName() + " is connected = " + connected);
+                        } else {
+                            DebugTool.logInfo(TAG, "No service is connected/running");
+                        }
+                        if (callback != null) {
+                            callback.onConnectionStatusUpdate(connected, service, context);
+                        }
+                        list.clear();
+                    }
+
+                }
+            };
+            final SdlRouterStatusProvider provider = new SdlRouterStatusProvider(context, list.poll(), sdlBrCallback);
+            if (triggerRouterServicePing) {
+                provider.setFlags(TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING);
+            }
+            //Lets ensure we have a current list of trusted router services
+            RouterServiceValidator.createTrustedListRequest(context, false, new TrustedListCallback() {
+                @Override
+                public void onListObtained(boolean successful) {
+                    //This will kick off our check of router services
+                    provider.checkIsConnected();
+                }
+            });
+
+        } else {
+            DebugTool.logWarning(TAG, "Router service isn't running, returning false.");
+            if (isBluetoothConnected()) {
+                DebugTool.logInfo(TAG, "Bluetooth is connected. Attempting to ping Router Service");
+                Intent serviceIntent = new Intent();
+                serviceIntent.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION);
+                serviceIntent.putExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA, true);
+                AndroidTools.sendExplicitBroadcast(context, serviceIntent, null);
+            }
+
+            if (callback != null) {
+                callback.onConnectionStatusUpdate(false, null, context);
+            }
+        }
+    }
+
+    @SuppressWarnings({"MissingPermission"})
+    private static boolean isBluetoothConnected() {
+        BluetoothAdapter bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (bluetoothAdapter != null && bluetoothAdapter.isEnabled()) {
+            int a2dpState = bluetoothAdapter.getProfileConnectionState(BluetoothProfile.A2DP);
+            int headSetState = bluetoothAdapter.getProfileConnectionState(BluetoothProfile.HEADSET);
+
+            return ((a2dpState == BluetoothAdapter.STATE_CONNECTED || a2dpState == BluetoothAdapter.STATE_CONNECTING)
+                    && (headSetState == BluetoothAdapter.STATE_CONNECTED || headSetState == BluetoothAdapter.STATE_CONNECTING));
+        }
+        return false;
+    }
+
+
+    private static SdlDeviceListener getSdlDeviceListener(Context context, BluetoothDevice bluetoothDevice) {
+
+        synchronized (DEVICE_LISTENER_LOCK) {
+            if (sdlDeviceListener == null) {
+                sdlDeviceListener = new SdlDeviceListener(context, bluetoothDevice, new SdlDeviceListener.Callback() {
+                    @Override
+                    public boolean onTransportConnected(Context context, BluetoothDevice bluetoothDevice) {
+
+                        synchronized (DEVICE_LISTENER_LOCK) {
+                            sdlDeviceListener = null;
+                            if (context != null) {
+                                final List<SdlAppInfo> sdlAppInfoList = AndroidTools.querySdlAppInfo(context, new SdlAppInfo.BestRouterComparator());
+                                if (sdlAppInfoList != null && !sdlAppInfoList.isEmpty()) {
+                                    ComponentName routerService = sdlAppInfoList.get(0).getRouterServiceComponentName();
+                                    startRouterService(context, routerService, false, bluetoothDevice, true);
+                                }
+                            }
+                        }
+
+                        return false;
+                    }
+
+                    @Override
+                    public void onTransportDisconnected(BluetoothDevice bluetoothDevice) {
+                        synchronized (DEVICE_LISTENER_LOCK) {
+                            sdlDeviceListener = null;
+                        }
+                    }
+
+                    @Override
+                    public void onTransportError(BluetoothDevice bluetoothDevice) {
+                        synchronized (DEVICE_LISTENER_LOCK) {
+                            sdlDeviceListener = null;
+                        }
+                    }
+                });
+            }
+        }
+
+        return sdlDeviceListener;
+    }
+
+    public static ComponentName consumeQueuedRouterService() {
+        synchronized (QUEUED_SERVICE_LOCK) {
+            ComponentName retVal = queuedService;
+            queuedService = null;
+            return retVal;
+        }
+    }
+
+    /**
+     * We need to define this for local copy of the Sdl Router Service class.
+     * It will be the main point of connection for Sdl enabled apps
+     *
+     * @return Return the local copy of SdlRouterService.class
+     * {@inheritDoc}
+     */
+    public abstract Class<? extends SdlRouterService> defineLocalSdlRouterClass();
+
+
+    /**
+     * The developer will need to define exactly what should happen when Sdl is enabled.
+     * This method will only get called when a Sdl  session is initiated.
+     * <p> The most useful code here would be to start the activity or service that handles most of the Livio
+     * Connect code.
+     *
+     * @param context this is the context that was passed to this receiver when it was called.
+     * @param intent  this is the intent that alerted this broadcast. Make sure to pass all extra it came with to your service/activity
+     *                {@inheritDoc}
+     */
+    public abstract void onSdlEnabled(Context context, Intent intent);
+
+    //public abstract void onSdlDisabled(Context context); //Removing for now until we're able to abstract from developer
 
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
index 8f569e7a2..49de58abf 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
@@ -130,32 +130,34 @@ import static com.smartdevicelink.transport.TransportConstants.TRANSPORT_DISCONN
 /**
  * <b>This class should not be modified by anyone outside of the approved contributors of the SmartDeviceLink project.</b>
  * This service is a central point of communication between hardware and the registered clients. It will multiplex a single transport
- * to provide a connection for a theoretical infinite amount of SDL sessions. 
- * @author Joey Grover
+ * to provide a connection for a theoretical infinite amount of SDL sessions.
  *
+ * @author Joey Grover
  */
 @SuppressWarnings({"UnusedReturnValue", "WeakerAccess", "Convert2Diamond", "deprecation"})
-public class SdlRouterService extends Service{
-	
-	private static final String TAG = "Sdl Router Service";
-	/**
-	 * <b> NOTE: DO NOT MODIFY THIS UNLESS YOU KNOW WHAT YOU'RE DOING.</b>
-	 */
-	protected static final int ROUTER_SERVICE_VERSION_NUMBER = 13;
-
-	private static final String ROUTER_SERVICE_PROCESS = "com.smartdevicelink.router";
-	
-	private static final int FOREGROUND_SERVICE_ID = 849;
-	
-	private static final long CLIENT_PING_DELAY = 1000;
-	
-	public static final String REGISTER_NEWER_SERVER_INSTANCE_ACTION		= "com.sdl.android.newservice";
-
-	public static final String SDL_NOTIFICATION_FAQS_PAGE = "https://smartdevicelink.com/en/guides/android/frequently-asked-questions/sdl-notifications/";
-
-	public static final String REGISTER_WITH_ROUTER_ACTION 					= "com.sdl.android.register";
-	
-	/** Message types sent from the BluetoothReadService Handler */
+public class SdlRouterService extends Service {
+
+    private static final String TAG = "Sdl Router Service";
+    /**
+     * <b> NOTE: DO NOT MODIFY THIS UNLESS YOU KNOW WHAT YOU'RE DOING.</b>
+     */
+    protected static final int ROUTER_SERVICE_VERSION_NUMBER = 13;
+
+    private static final String ROUTER_SERVICE_PROCESS = "com.smartdevicelink.router";
+
+    private static final int FOREGROUND_SERVICE_ID = 849;
+
+    private static final long CLIENT_PING_DELAY = 1000;
+
+    public static final String REGISTER_NEWER_SERVER_INSTANCE_ACTION = "com.sdl.android.newservice";
+
+    public static final String SDL_NOTIFICATION_FAQS_PAGE = "https://smartdevicelink.com/en/guides/android/frequently-asked-questions/sdl-notifications/";
+
+    public static final String REGISTER_WITH_ROUTER_ACTION = "com.sdl.android.register";
+
+    /**
+     * Message types sent from the BluetoothReadService Handler
+     */
     public static final int MESSAGE_STATE_CHANGE = 1;
     public static final int MESSAGE_READ = 2;
     public static final int MESSAGE_WRITE = 3;
@@ -163,1742 +165,1748 @@ public class SdlRouterService extends Service{
     public static final int MESSAGE_LOG = 5;
 
     @SuppressWarnings("FieldCanBeLocal")
-	private final int UNREGISTER_APP_INTERFACE_CORRELATION_ID = 65530;
-
-	/* Bluetooth Transport */
-	private MultiplexBluetoothTransport bluetoothTransport = null;
-	private final Handler bluetoothHandler = new TransportHandler(this);
+    private final int UNREGISTER_APP_INTERFACE_CORRELATION_ID = 65530;
 
-	/* USB Transport */
-	private MultiplexUsbTransport usbTransport;
-	private final Handler usbHandler = new TransportHandler(this);
+    /* Bluetooth Transport */
+    private MultiplexBluetoothTransport bluetoothTransport = null;
+    private final Handler bluetoothHandler = new TransportHandler(this);
 
-	/* TCP Transport */
-	private MultiplexTcpTransport tcpTransport;
-	private final Handler tcpHandler = new TransportHandler(this);
-
-	/**
-	 * Preference location where the service stores known SDL status based on device address
-	 */
-	protected static final String SDL_DEVICE_STATUS_SHARED_PREFS = "sdl.device.status";
-	/**
-	 * Preference location where generic key/values can be stored
-	 */
-	protected static final String SDL_ROUTER_SERVICE_PREFS = "sdl.router.service.prefs";
-	protected static final String KEY_AVOID_NOTIFICATION_CHANNEL_DELETE = "avoidNotificationChannelDelete";
+    /* USB Transport */
+    private MultiplexUsbTransport usbTransport;
+    private final Handler usbHandler = new TransportHandler(this);
 
+    /* TCP Transport */
+    private MultiplexTcpTransport tcpTransport;
+    private final Handler tcpHandler = new TransportHandler(this);
 
+    /**
+     * Preference location where the service stores known SDL status based on device address
+     */
+    protected static final String SDL_DEVICE_STATUS_SHARED_PREFS = "sdl.device.status";
+    /**
+     * Preference location where generic key/values can be stored
+     */
+    protected static final String SDL_ROUTER_SERVICE_PREFS = "sdl.router.service.prefs";
+    protected static final String KEY_AVOID_NOTIFICATION_CHANNEL_DELETE = "avoidNotificationChannelDelete";
 
 
-	private static boolean connectAsClient = false;
-	private static boolean closing = false;
-	private static Thread.UncaughtExceptionHandler routerServiceExceptionHandler = null;
+    private static boolean connectAsClient = false;
+    private static boolean closing = false;
+    private static Thread.UncaughtExceptionHandler routerServiceExceptionHandler = null;
 
-    private Handler  altTransportTimerHandler, foregroundTimeoutHandler;
-    private Runnable  altTransportTimerRunnable, foregroundTimeoutRunnable;
+    private Handler altTransportTimerHandler, foregroundTimeoutHandler;
+    private Runnable altTransportTimerRunnable, foregroundTimeoutRunnable;
     private final static int ALT_TRANSPORT_TIMEOUT_RUNNABLE = 30000, FOREGROUND_TIMEOUT = 10000;
 
     private boolean wrongProcess = false;
-	private boolean initPassed = false;
-	private boolean hasCalledStartForeground = false;
-
-	public static HashMap<String,RegisteredApp> registeredApps;
-	private SparseArray<String> bluetoothSessionMap, usbSessionMap, tcpSessionMap;
-	private SparseIntArray sessionHashIdMap;
-	private SparseIntArray cleanedSessionMap;
-	private final Object SESSION_LOCK = new Object(), REGISTERED_APPS_LOCK = new Object(),
-			PING_COUNT_LOCK = new Object(), FOREGROUND_NOTIFICATION_LOCK = new Object();
-	
-	private static Messenger altTransportService = null;
-	
-	private boolean startSequenceComplete = false;
-	
-	private ExecutorService packetExecutor = null;
-	ConcurrentHashMap<TransportType, PacketWriteTaskMaster>  packetWriteTaskMasterMap = null;
-
-
-	/**
-	 * This flag is to keep track of if we are currently acting as a foreground service
-	 */
-	private boolean isForeground = false;
-
-	private int cachedModuleVersion = -1;
-	
-	/**
-	 * Executor for making sure clients are still running during trying times
-	 */
-	private ScheduledExecutorService clientPingExecutor = null;
-	Intent pingIntent = null;
-	private boolean isPingingClients = false;
-	int pingCount = 0;
-
-	
-	/* **************************************************************************************************************************************
-	****************************************************************************************************************************************
-	***********************************************  Broadcast Receivers START  **************************************************************
-	****************************************************************************************************************************************
-	****************************************************************************************************************************************/	
-	
-	/** create our receiver from the router service */
-	final BroadcastReceiver mainServiceReceiver = new BroadcastReceiver()
-	{
-		@Override
-		public void onReceive(Context context, Intent intent) 
-		{				
-			//Let's grab where to reply to this intent at. We will keep it temp right now because we may have to deny registration
-			String action =intent.getStringExtra(SEND_PACKET_TO_APP_LOCATION_EXTRA_NAME);
-			sendBroadcast(prepareRegistrationIntent(action));
-		}
-	};
-	
-	private Intent prepareRegistrationIntent(String action){
-		Intent registrationIntent = new Intent();
-		registrationIntent.setAction(action);
-		registrationIntent.putExtra(TransportConstants.BIND_LOCATION_PACKAGE_NAME_EXTRA, this.getPackageName());
-		registrationIntent.putExtra(TransportConstants.BIND_LOCATION_CLASS_NAME_EXTRA, this.getClass().getName());
-		registrationIntent.setFlags((Intent.FLAG_RECEIVER_FOREGROUND));
-		return registrationIntent;
-	}
-
-	private void onAppRegistered(RegisteredApp app){
-		//Log.enableDebug(receivedIntent.getBooleanExtra(LOG_BASIC_DEBUG_BOOLEAN_EXTRA, false));
-		//Log.enableBluetoothTraceLogging(receivedIntent.getBooleanExtra(LOG_TRACE_BT_DEBUG_BOOLEAN_EXTRA, false));
-		//Ok this is where we should do some authenticating...maybe. 
-		//Should we ask for all relevant data in this packet?
-		if(bluetoothAvailable()){
-			if(startSequenceComplete &&
-					!connectAsClient && (bluetoothTransport ==null
-					|| bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_NONE)){
-				DebugTool.logError(TAG, "Serial service not initialized while registering app");
-				//Maybe we should try to do a connect here instead
-				DebugTool.logInfo(TAG, "Serial service being restarted");
-				initBluetoothSerialService();
-
-
-			}
-		}
-
-		DebugTool.logInfo(TAG, app.appId + " has just been registered with SDL Router Service");
-	}
-
-	/**
-	 * If the user disconnects the bluetooth device we will want to stop SDL and our current
-	 * connection through RFCOMM
-	 */
-	final BroadcastReceiver mListenForDisconnect = new BroadcastReceiver()
-			{
-				@Override
-				@SuppressWarnings("MissingPermission")
-				public void onReceive(Context context, Intent intent) 
-				{
-					String action = intent.getAction();
-			    	if(action == null){
-						DebugTool.logInfo(TAG, "Disconnect received with no action.");
-					}else {
-						DebugTool.logInfo(TAG, "Disconnect received. Action: " + intent.getAction());
-
-						if(action.equalsIgnoreCase(BluetoothAdapter.ACTION_STATE_CHANGED)){
-							int bluetoothState = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1);
-							switch (bluetoothState) {
-								case BluetoothAdapter.STATE_TURNING_ON:
-								case BluetoothAdapter.STATE_ON:
-									//There is nothing to do in the case the adapter is turning on or just switched to on
-									return;
-								case BluetoothAdapter.STATE_TURNING_OFF:
-								case BluetoothAdapter.STATE_OFF:
-									DebugTool.logInfo(TAG, "Bluetooth is shutting off, SDL Router Service is closing.");
-									connectAsClient = false;
-									if(!shouldServiceRemainOpen(intent)){
-										closeSelf();
-									}
-									return;
-								default:
-									break;
-							}
-						}
-						//Otherwise
-						connectAsClient = false;
-						if (legacyModeEnabled) {
-							DebugTool.logInfo(TAG, "Legacy mode enabled and bluetooth d/c'ed, restarting router service bluetooth.");
-							enableLegacyMode(false);
-							onTransportDisconnected(new TransportRecord(TransportType.BLUETOOTH,null));
-							initBluetoothSerialService();
-						}
-					}
-			}
-		};
-		
-/* **************************************************************************************************************************************
-***********************************************  Broadcast Receivers End  **************************************************************
-****************************************************************************************************************************************/
-
-		/* **************************************************************************************************************************************
-		*********************************************** Handlers for bound clients **************************************************************
-		****************************************************************************************************************************************/
-
-
-	    /**
-	     * Target we publish for clients to send messages to RouterHandler.
-	     */
-	    final Messenger routerMessenger = new Messenger(new RouterHandler(this));
-	    
-		 /**
-	     * Handler of incoming messages from clients.
-	     */
-	    @SuppressWarnings("Convert2Diamond")
-		static class RouterHandler extends Handler {
-	    	final WeakReference<SdlRouterService> provider;
-
-	    	public RouterHandler(SdlRouterService provider){
-	    		this.provider = new WeakReference<SdlRouterService>(provider);
-	    	}
-
-	        @Override
-	        public void handleMessage(Message msg) {
-	        	if(this.provider.get() == null){
-	        		return;
-	        	}
-	        	final Bundle receivedBundle = msg.getData();
-	        	Bundle returnBundle;
-	        	final SdlRouterService service = this.provider.get();
-	        	
-	            switch (msg.what) {
-	            case TransportConstants.ROUTER_REQUEST_BT_CLIENT_CONNECT:              	
-	            	if(receivedBundle.getBoolean(TransportConstants.CONNECT_AS_CLIENT_BOOLEAN_EXTRA, false)
-	        				&& !connectAsClient){		//We check this flag to make sure we don't try to connect over and over again. On D/C we should set to false
-	        				//Log.d(TAG,"Attempting to connect as bt client");
-	        				BluetoothDevice device = receivedBundle.getParcelable(BluetoothDevice.EXTRA_DEVICE);
-	        				connectAsClient = true;
-	        				if(device==null || !service.bluetoothConnect(device)){
-								DebugTool.logError(TAG, "Unable to connect to bluetooth device");
-	        					connectAsClient = false;
-	        				}
-	        			}
-	            	//**************** We don't break here so we can let the app register as well
-	                case TransportConstants.ROUTER_REGISTER_CLIENT: //msg.arg1 is appId
-	                	//pingClients();
-	                	Message message = Message.obtain();
-	                	message.what = TransportConstants.ROUTER_REGISTER_CLIENT_RESPONSE;
-            			message.arg1 = TransportConstants.REGISTRATION_RESPONSE_SUCESS;
-	                	String appId = receivedBundle.getString(TransportConstants.APP_ID_EXTRA_STRING);
-	                	if(appId == null){
-	                		appId = "" + receivedBundle.getLong(TransportConstants.APP_ID_EXTRA, -1);
-	                	}
-	                	if(appId.length()<=0 || msg.replyTo == null){
-							DebugTool.logWarning(TAG, "Unable to register app as no id or messenger was included");
-	                		if(msg.replyTo!=null){
-	                			message.arg1 = TransportConstants.REGISTRATION_RESPONSE_DENIED_APP_ID_NOT_INCLUDED;
-	                			try {
-									msg.replyTo.send(message);
-								} catch (RemoteException e) {
-									e.printStackTrace();
-								}
-	                		}
-	                		break;
-	                	}
-	                	if(service.legacyModeEnabled){
-							DebugTool.logWarning(TAG, "Unable to register app as legacy mode is enabled");
-	                		if(msg.replyTo!=null){
-	                			message.arg1 = TransportConstants.REGISTRATION_RESPONSE_DENIED_LEGACY_MODE_ENABLED;
-	                			try {
-									msg.replyTo.send(message);
-								} catch (RemoteException e) {
-									e.printStackTrace();
-								}
-	                		}
-	                		break;
-	                	}
-
-						int routerMessagingVersion = receivedBundle.getInt(TransportConstants.ROUTER_MESSAGING_VERSION,1);
-
-						RegisteredApp app = service.new RegisteredApp(appId, routerMessagingVersion, msg.replyTo);
-
-						synchronized(service.REGISTERED_APPS_LOCK){
-	                		RegisteredApp old = registeredApps.put(app.getAppId(), app); 
-	                		if(old!=null){
-								DebugTool.logWarning(TAG, "Replacing already existing app with this app id");
-	                			service.removeAllSessionsForApp(old, true);
-	                			old.close();
-	                		}
-	                	}
-	                	service.onAppRegistered(app);
-
-	            		returnBundle = new Bundle();
-	            		//Add params if connected
-	            		if(service.isPrimaryTransportConnected()){
-                            ArrayList<TransportRecord> records = service.getConnectedTransports();
-	            			returnBundle.putString(TransportConstants.HARDWARE_CONNECTED, records.get(records.size()-1).getType().name());
-							if(app.routerMessagingVersion > 1) {
-								returnBundle.putParcelableArrayList(TransportConstants.CURRENT_HARDWARE_CONNECTED, records);
-							}
-
-	                		if(service.bluetoothTransport != null){
-	                			returnBundle.putString(CONNECTED_DEVICE_STRING_EXTRA_NAME, service.bluetoothTransport.getDeviceName());
-	                		}
-	            		}
-	            		//Add the version of this router service
-	            		returnBundle.putInt(TransportConstants.ROUTER_SERVICE_VERSION, SdlRouterService.ROUTER_SERVICE_VERSION_NUMBER);
-	            		
-	            		message.setData(returnBundle);
-	            		
-	            		int result = app.sendMessage(message);
-	            		if(result == RegisteredApp.SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT){
-	            			synchronized(service.REGISTERED_APPS_LOCK){
-	            				registeredApps.remove(appId);
-	            			}
-	            		}
-	                    break;
-	                case TransportConstants.ROUTER_UNREGISTER_CLIENT:
-	                	String appIdToUnregister = receivedBundle.getString(TransportConstants.APP_ID_EXTRA_STRING);
-	                	if(appIdToUnregister == null){
-	                		appIdToUnregister = "" + receivedBundle.getLong(TransportConstants.APP_ID_EXTRA, -1);
-	                	}
-						DebugTool.logInfo(TAG, "Unregistering client: " + appIdToUnregister);
-	                	RegisteredApp unregisteredApp;
-	                	synchronized(service.REGISTERED_APPS_LOCK){
-	                		unregisteredApp = registeredApps.remove(appIdToUnregister);
-	                	}
-	                	Message response = Message.obtain();
-	                	response.what = TransportConstants.ROUTER_UNREGISTER_CLIENT_RESPONSE;
-	                	if(unregisteredApp == null){
-	                		response.arg1 = TransportConstants.UNREGISTRATION_RESPONSE_FAILED_APP_ID_NOT_FOUND;
-	                		service.removeAllSessionsWithAppId(appIdToUnregister);
-	                	}else{
-	                		response.arg1 = TransportConstants.UNREGISTRATION_RESPONSE_SUCESS;
-	                		service.removeAllSessionsForApp(unregisteredApp,false);
-	                	}
-						DebugTool.logInfo(TAG, "Unregistering client response: " + response.arg1 );
-	                	try {
-	                		msg.replyTo.send(response); //We do this because we aren't guaranteed to find the correct registeredApp to send the message through
-	                	} catch (RemoteException e) {
-	                		e.printStackTrace();
-	                		
-	                	}catch(NullPointerException e2){
-							DebugTool.logError(TAG, "No reply address included, can't send a reply");
-	                	}
-	                	
-	                    break;
-	                case TransportConstants.ROUTER_SEND_PACKET:
-	                	//Log.d(TAG, "Received packet to send");
-	                	if(receivedBundle!=null){
-	                		Runnable packetRun = new Runnable(){
-	                			@Override
-	                			public void run() {
-									String buffAppId = receivedBundle.getString(TransportConstants.APP_ID_EXTRA_STRING);
-									if(buffAppId == null){
-                                        buffAppId = "" + receivedBundle.getLong(TransportConstants.APP_ID_EXTRA, -1);
-                                    }
+    private boolean initPassed = false;
+    private boolean hasCalledStartForeground = false;
+
+    public static HashMap<String, RegisteredApp> registeredApps;
+    private SparseArray<String> bluetoothSessionMap, usbSessionMap, tcpSessionMap;
+    private SparseIntArray sessionHashIdMap;
+    private SparseIntArray cleanedSessionMap;
+    private final Object SESSION_LOCK = new Object(), REGISTERED_APPS_LOCK = new Object(),
+            PING_COUNT_LOCK = new Object(), FOREGROUND_NOTIFICATION_LOCK = new Object();
+
+    private static Messenger altTransportService = null;
+
+    private boolean startSequenceComplete = false;
+
+    private ExecutorService packetExecutor = null;
+    ConcurrentHashMap<TransportType, PacketWriteTaskMaster> packetWriteTaskMasterMap = null;
+
 
-									RegisteredApp buffApp;
-									synchronized(service.REGISTERED_APPS_LOCK){
-                                        buffApp = registeredApps.get(buffAppId);
+    /**
+     * This flag is to keep track of if we are currently acting as a foreground service
+     */
+    private boolean isForeground = false;
+
+    private int cachedModuleVersion = -1;
+
+    /**
+     * Executor for making sure clients are still running during trying times
+     */
+    private ScheduledExecutorService clientPingExecutor = null;
+    Intent pingIntent = null;
+    private boolean isPingingClients = false;
+    int pingCount = 0;
+
+
+    /* **************************************************************************************************************************************
+     ****************************************************************************************************************************************
+     ***********************************************  Broadcast Receivers START  **************************************************************
+     ****************************************************************************************************************************************
+     ****************************************************************************************************************************************/
+
+    /**
+     * create our receiver from the router service
+     */
+    final BroadcastReceiver mainServiceReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            //Let's grab where to reply to this intent at. We will keep it temp right now because we may have to deny registration
+            String action = intent.getStringExtra(SEND_PACKET_TO_APP_LOCATION_EXTRA_NAME);
+            sendBroadcast(prepareRegistrationIntent(action));
+        }
+    };
+
+    private Intent prepareRegistrationIntent(String action) {
+        Intent registrationIntent = new Intent();
+        registrationIntent.setAction(action);
+        registrationIntent.putExtra(TransportConstants.BIND_LOCATION_PACKAGE_NAME_EXTRA, this.getPackageName());
+        registrationIntent.putExtra(TransportConstants.BIND_LOCATION_CLASS_NAME_EXTRA, this.getClass().getName());
+        registrationIntent.setFlags((Intent.FLAG_RECEIVER_FOREGROUND));
+        return registrationIntent;
+    }
+
+    private void onAppRegistered(RegisteredApp app) {
+        //Log.enableDebug(receivedIntent.getBooleanExtra(LOG_BASIC_DEBUG_BOOLEAN_EXTRA, false));
+        //Log.enableBluetoothTraceLogging(receivedIntent.getBooleanExtra(LOG_TRACE_BT_DEBUG_BOOLEAN_EXTRA, false));
+        //Ok this is where we should do some authenticating...maybe.
+        //Should we ask for all relevant data in this packet?
+        if (bluetoothAvailable()) {
+            if (startSequenceComplete &&
+                    !connectAsClient && (bluetoothTransport == null
+                    || bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_NONE)) {
+                DebugTool.logError(TAG, "Serial service not initialized while registering app");
+                //Maybe we should try to do a connect here instead
+                DebugTool.logInfo(TAG, "Serial service being restarted");
+                initBluetoothSerialService();
+
+
+            }
+        }
+
+        DebugTool.logInfo(TAG, app.appId + " has just been registered with SDL Router Service");
+    }
+
+    /**
+     * If the user disconnects the bluetooth device we will want to stop SDL and our current
+     * connection through RFCOMM
+     */
+    final BroadcastReceiver mListenForDisconnect = new BroadcastReceiver() {
+        @Override
+        @SuppressWarnings("MissingPermission")
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action == null) {
+                DebugTool.logInfo(TAG, "Disconnect received with no action.");
+            } else {
+                DebugTool.logInfo(TAG, "Disconnect received. Action: " + intent.getAction());
+
+                if (action.equalsIgnoreCase(BluetoothAdapter.ACTION_STATE_CHANGED)) {
+                    int bluetoothState = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1);
+                    switch (bluetoothState) {
+                        case BluetoothAdapter.STATE_TURNING_ON:
+                        case BluetoothAdapter.STATE_ON:
+                            //There is nothing to do in the case the adapter is turning on or just switched to on
+                            return;
+                        case BluetoothAdapter.STATE_TURNING_OFF:
+                        case BluetoothAdapter.STATE_OFF:
+                            DebugTool.logInfo(TAG, "Bluetooth is shutting off, SDL Router Service is closing.");
+                            connectAsClient = false;
+                            if (!shouldServiceRemainOpen(intent)) {
+                                closeSelf();
+                            }
+                            return;
+                        default:
+                            break;
+                    }
+                }
+                //Otherwise
+                connectAsClient = false;
+                if (legacyModeEnabled) {
+                    DebugTool.logInfo(TAG, "Legacy mode enabled and bluetooth d/c'ed, restarting router service bluetooth.");
+                    enableLegacyMode(false);
+                    onTransportDisconnected(new TransportRecord(TransportType.BLUETOOTH, null));
+                    initBluetoothSerialService();
+                }
+            }
+        }
+    };
+
+    /* **************************************************************************************************************************************
+     ***********************************************  Broadcast Receivers End  **************************************************************
+     ****************************************************************************************************************************************/
+
+    /* **************************************************************************************************************************************
+     *********************************************** Handlers for bound clients **************************************************************
+     ****************************************************************************************************************************************/
+
+
+    /**
+     * Target we publish for clients to send messages to RouterHandler.
+     */
+    final Messenger routerMessenger = new Messenger(new RouterHandler(this));
+
+    /**
+     * Handler of incoming messages from clients.
+     */
+    @SuppressWarnings("Convert2Diamond")
+    static class RouterHandler extends Handler {
+        final WeakReference<SdlRouterService> provider;
+
+        public RouterHandler(SdlRouterService provider) {
+            this.provider = new WeakReference<SdlRouterService>(provider);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            if (this.provider.get() == null) {
+                return;
+            }
+            final Bundle receivedBundle = msg.getData();
+            Bundle returnBundle;
+            final SdlRouterService service = this.provider.get();
+
+            switch (msg.what) {
+                case TransportConstants.ROUTER_REQUEST_BT_CLIENT_CONNECT:
+                    if (receivedBundle.getBoolean(TransportConstants.CONNECT_AS_CLIENT_BOOLEAN_EXTRA, false)
+                            && !connectAsClient) {        //We check this flag to make sure we don't try to connect over and over again. On D/C we should set to false
+                        //Log.d(TAG,"Attempting to connect as bt client");
+                        BluetoothDevice device = receivedBundle.getParcelable(BluetoothDevice.EXTRA_DEVICE);
+                        connectAsClient = true;
+                        if (device == null || !service.bluetoothConnect(device)) {
+                            DebugTool.logError(TAG, "Unable to connect to bluetooth device");
+                            connectAsClient = false;
+                        }
+                    }
+                    //**************** We don't break here so we can let the app register as well
+                case TransportConstants.ROUTER_REGISTER_CLIENT: //msg.arg1 is appId
+                    //pingClients();
+                    Message message = Message.obtain();
+                    message.what = TransportConstants.ROUTER_REGISTER_CLIENT_RESPONSE;
+                    message.arg1 = TransportConstants.REGISTRATION_RESPONSE_SUCESS;
+                    String appId = receivedBundle.getString(TransportConstants.APP_ID_EXTRA_STRING);
+                    if (appId == null) {
+                        appId = "" + receivedBundle.getLong(TransportConstants.APP_ID_EXTRA, -1);
+                    }
+                    if (appId.length() <= 0 || msg.replyTo == null) {
+                        DebugTool.logWarning(TAG, "Unable to register app as no id or messenger was included");
+                        if (msg.replyTo != null) {
+                            message.arg1 = TransportConstants.REGISTRATION_RESPONSE_DENIED_APP_ID_NOT_INCLUDED;
+                            try {
+                                msg.replyTo.send(message);
+                            } catch (RemoteException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        break;
+                    }
+                    if (service.legacyModeEnabled) {
+                        DebugTool.logWarning(TAG, "Unable to register app as legacy mode is enabled");
+                        if (msg.replyTo != null) {
+                            message.arg1 = TransportConstants.REGISTRATION_RESPONSE_DENIED_LEGACY_MODE_ENABLED;
+                            try {
+                                msg.replyTo.send(message);
+                            } catch (RemoteException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        break;
+                    }
+
+                    int routerMessagingVersion = receivedBundle.getInt(TransportConstants.ROUTER_MESSAGING_VERSION, 1);
+
+                    RegisteredApp app = service.new RegisteredApp(appId, routerMessagingVersion, msg.replyTo);
+
+                    synchronized (service.REGISTERED_APPS_LOCK) {
+                        RegisteredApp old = registeredApps.put(app.getAppId(), app);
+                        if (old != null) {
+                            DebugTool.logWarning(TAG, "Replacing already existing app with this app id");
+                            service.removeAllSessionsForApp(old, true);
+                            old.close();
+                        }
+                    }
+                    service.onAppRegistered(app);
+
+                    returnBundle = new Bundle();
+                    //Add params if connected
+                    if (service.isPrimaryTransportConnected()) {
+                        ArrayList<TransportRecord> records = service.getConnectedTransports();
+                        returnBundle.putString(TransportConstants.HARDWARE_CONNECTED, records.get(records.size() - 1).getType().name());
+                        if (app.routerMessagingVersion > 1) {
+                            returnBundle.putParcelableArrayList(TransportConstants.CURRENT_HARDWARE_CONNECTED, records);
+                        }
+
+                        if (service.bluetoothTransport != null) {
+                            returnBundle.putString(CONNECTED_DEVICE_STRING_EXTRA_NAME, service.bluetoothTransport.getDeviceName());
+                        }
+                    }
+                    //Add the version of this router service
+                    returnBundle.putInt(TransportConstants.ROUTER_SERVICE_VERSION, SdlRouterService.ROUTER_SERVICE_VERSION_NUMBER);
+
+                    message.setData(returnBundle);
+
+                    int result = app.sendMessage(message);
+                    if (result == RegisteredApp.SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT) {
+                        synchronized (service.REGISTERED_APPS_LOCK) {
+                            registeredApps.remove(appId);
+                        }
+                    }
+                    break;
+                case TransportConstants.ROUTER_UNREGISTER_CLIENT:
+                    String appIdToUnregister = receivedBundle.getString(TransportConstants.APP_ID_EXTRA_STRING);
+                    if (appIdToUnregister == null) {
+                        appIdToUnregister = "" + receivedBundle.getLong(TransportConstants.APP_ID_EXTRA, -1);
+                    }
+                    DebugTool.logInfo(TAG, "Unregistering client: " + appIdToUnregister);
+                    RegisteredApp unregisteredApp;
+                    synchronized (service.REGISTERED_APPS_LOCK) {
+                        unregisteredApp = registeredApps.remove(appIdToUnregister);
+                    }
+                    Message response = Message.obtain();
+                    response.what = TransportConstants.ROUTER_UNREGISTER_CLIENT_RESPONSE;
+                    if (unregisteredApp == null) {
+                        response.arg1 = TransportConstants.UNREGISTRATION_RESPONSE_FAILED_APP_ID_NOT_FOUND;
+                        service.removeAllSessionsWithAppId(appIdToUnregister);
+                    } else {
+                        response.arg1 = TransportConstants.UNREGISTRATION_RESPONSE_SUCESS;
+                        service.removeAllSessionsForApp(unregisteredApp, false);
+                    }
+                    DebugTool.logInfo(TAG, "Unregistering client response: " + response.arg1);
+                    try {
+                        msg.replyTo.send(response); //We do this because we aren't guaranteed to find the correct registeredApp to send the message through
+                    } catch (RemoteException e) {
+                        e.printStackTrace();
+
+                    } catch (NullPointerException e2) {
+                        DebugTool.logError(TAG, "No reply address included, can't send a reply");
+                    }
+
+                    break;
+                case TransportConstants.ROUTER_SEND_PACKET:
+                    //Log.d(TAG, "Received packet to send");
+                    if (receivedBundle != null) {
+                        Runnable packetRun = new Runnable() {
+                            @Override
+                            public void run() {
+                                String buffAppId = receivedBundle.getString(TransportConstants.APP_ID_EXTRA_STRING);
+                                if (buffAppId == null) {
+                                    buffAppId = "" + receivedBundle.getLong(TransportConstants.APP_ID_EXTRA, -1);
+                                }
+
+                                RegisteredApp buffApp;
+                                synchronized (service.REGISTERED_APPS_LOCK) {
+                                    buffApp = registeredApps.get(buffAppId);
+                                }
+
+                                if (buffApp != null) {
+                                    buffApp.handleIncommingClientMessage(receivedBundle);
+                                } else {
+                                    TransportType transportType = TransportType.valueForString(receivedBundle.getString(TransportConstants.TRANSPORT_TYPE));
+                                    if (transportType == null) {
+
+                                        /* We check bluetooth first because we assume if this value
+                                         * isn't included it is an older version of the proxy and
+                                         * therefore will be expecting this to be bluetooth.
+                                         */
+                                        if (service.bluetoothTransport != null && service.bluetoothTransport.isConnected()) {
+                                            transportType = TransportType.BLUETOOTH;
+                                        } else if (service.usbTransport != null && service.usbTransport.isConnected()) {
+                                            transportType = TransportType.USB;
+                                        } else if (service.tcpTransport != null && service.tcpTransport.isConnected()) {
+                                            transportType = TransportType.TCP;
+                                        } else {
+                                            // This means no transport is connected. Likely the
+                                            // router service has already disconnected and this
+                                            // is now just executing.
+                                            DebugTool.logError(TAG, "Can't send packet, no transport specified and none are connected.");
+                                            return;
+                                        }
+                                        //Log.d(TAG, "Transport type was null, so router set it to " + transportType.name());
+                                        if (transportType != null) {
+                                            receivedBundle.putString(TransportConstants.TRANSPORT_TYPE, transportType.name());
+                                        }
+                                    }
+                                    service.writeBytesToTransport(receivedBundle);
+                                }
+                            }
+                        };
+                        if (service.packetExecutor != null) {
+                            service.packetExecutor.execute(packetRun);
+                        }
+                    }
+                    break;
+                case TransportConstants.ROUTER_REQUEST_NEW_SESSION:
+                    String appIdRequesting = receivedBundle.getString(TransportConstants.APP_ID_EXTRA_STRING);
+                    if (appIdRequesting == null) {
+                        appIdRequesting = "" + receivedBundle.getLong(TransportConstants.APP_ID_EXTRA, -1);
+                    }
+                    Message extraSessionResponse = Message.obtain();
+                    extraSessionResponse.what = TransportConstants.ROUTER_REQUEST_NEW_SESSION_RESPONSE;
+                    if (appIdRequesting.length() > 0) {
+                        synchronized (service.REGISTERED_APPS_LOCK) {
+                            if (registeredApps != null) {
+                                RegisteredApp appRequesting = registeredApps.get(appIdRequesting);
+                                if (appRequesting != null) {
+                                    //Retrieve the transport the app is requesting a new session
+                                    String transport = receivedBundle.getString(TransportConstants.TRANSPORT_TYPE);
+                                    TransportType requestingTransport = null;
+                                    if (transport != null) {
+                                        try {
+                                            requestingTransport = TransportType.valueOf(transport);
+                                        } catch (IllegalArgumentException e) {
+                                        }
+                                    }
+                                    if (requestingTransport == null) {
+                                        /* We check bluetooth first because we assume if this value
+                                         * isn't included it is an older version of the proxy and
+                                         * therefore will be expecting this to be bluetooth.
+                                         */
+                                        if (service.bluetoothTransport != null && service.bluetoothTransport.isConnected()) {
+                                            requestingTransport = TransportType.BLUETOOTH;
+                                        } else if (service.usbTransport != null && service.usbTransport.isConnected()) {
+                                            requestingTransport = TransportType.USB;
+                                        } else if (service.tcpTransport != null && service.tcpTransport.isConnected()) {
+                                            requestingTransport = TransportType.TCP;
+                                        }
+                                    }
+                                    appRequesting.getSessionIds().add((long) -1); //Adding an extra session
+                                    appRequesting.getAwaitingSession().add(requestingTransport);
+                                    extraSessionResponse.arg1 = TransportConstants.ROUTER_REQUEST_NEW_SESSION_RESPONSE_SUCESS;
+                                } else {
+                                    extraSessionResponse.arg1 = TransportConstants.ROUTER_REQUEST_NEW_SESSION_RESPONSE_FAILED_APP_NOT_FOUND;
+                                }
+                            }
+                        }
+                    } else {
+                        extraSessionResponse.arg1 = TransportConstants.ROUTER_REQUEST_NEW_SESSION_RESPONSE_FAILED_APP_ID_NOT_INCL;
+                    }
+                    try {
+                        msg.replyTo.send(extraSessionResponse); //We do this because we aren't guaranteed to find the correct registeredApp to send the message through
+                    } catch (RemoteException e) {
+                        e.printStackTrace();
+                    } catch (NullPointerException e2) {
+                        DebugTool.logError(TAG, "No reply address included, can't send a reply");
+                    }
+                    break;
+                case TransportConstants.ROUTER_REMOVE_SESSION:
+                    String appIdWithSession = receivedBundle.getString(TransportConstants.APP_ID_EXTRA_STRING);
+                    if (appIdWithSession == null) {
+                        appIdWithSession = "" + receivedBundle.getLong(TransportConstants.APP_ID_EXTRA, -1);
+                    }
+                    long sessionId = receivedBundle.getLong(TransportConstants.SESSION_ID_EXTRA, -1);
+
+                    Message removeSessionResponse = Message.obtain();
+                    removeSessionResponse.what = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE;
+                    if (appIdWithSession.length() > 0) {
+                        if (sessionId >= 0) {
+                            synchronized (service.REGISTERED_APPS_LOCK) {
+                                if (registeredApps != null) {
+                                    RegisteredApp appRequesting = registeredApps.get(appIdWithSession);
+                                    if (appRequesting != null) {
+                                        //Might need to check which session is on which transport
+                                        service.removeSessionFromMap((int) sessionId, appRequesting.getTransportsForSession((int) sessionId));
+                                        if (appRequesting.removeSession(sessionId)) {
+                                            removeSessionResponse.arg1 = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE_SUCESS;
+                                        } else {
+                                            removeSessionResponse.arg1 = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE_FAILED_SESSION_NOT_FOUND;
+                                        }
+                                    } else {
+                                        removeSessionResponse.arg1 = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE_FAILED_APP_NOT_FOUND;
+                                    }
+                                }
+                            }
+                        } else {
+                            removeSessionResponse.arg1 = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE_FAILED_SESSION_ID_NOT_INCL;
+                        }
+                    } else {
+                        removeSessionResponse.arg1 = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE_FAILED_APP_ID_NOT_INCL;
+                    }
+                    try {
+                        msg.replyTo.send(removeSessionResponse); //We do this because we aren't guaranteed to find the correct registeredApp to send the message through
+                    } catch (RemoteException e) {
+                        e.printStackTrace();
+                    } catch (NullPointerException e2) {
+                        DebugTool.logError(TAG, "No reply address included, can't send a reply");
+                    }
+                    break;
+                case TransportConstants.ROUTER_REQUEST_SECONDARY_TRANSPORT_CONNECTION:
+                    // Currently this only handles one TCP connection
+
+                    String ipAddress = receivedBundle.getString(ControlFrameTags.RPC.TransportEventUpdate.TCP_IP_ADDRESS);
+                    int port = receivedBundle.getInt(ControlFrameTags.RPC.TransportEventUpdate.TCP_PORT);
+
+                    if (ipAddress != null) {
+                        if (service.tcpTransport != null) {
+                            switch (service.tcpTransport.getState()) {
+                                case MultiplexBaseTransport.STATE_CONNECTED:
+                                case MultiplexBaseTransport.STATE_CONNECTING:
+                                    // A TCP connection is currently active. This version of the
+                                    // router service can't handle multiple TCP transports so just
+                                    // return a connected message to requester.
+                                    if (msg.replyTo != null) {
+                                        // Send a transport connect message to the app that requested
+                                        // the tcp transport
+                                        try {
+                                            msg.replyTo.send(service.createHardwareConnectedMessage(service.tcpTransport.transportRecord));
+                                        } catch (RemoteException e) {
+                                            e.printStackTrace();
+                                        }
                                     }
+                                    //Nothing else to do, so return out of this method
+                                    return;
+
+                                case MultiplexBaseTransport.STATE_NONE:
+                                case MultiplexBaseTransport.STATE_LISTEN:
+                                case MultiplexBaseTransport.STATE_ERROR:
+                                    //Clear out tcp transport
+                                    service.tcpTransport.stop(MultiplexBaseTransport.STATE_NONE);
+                                    service.tcpTransport = null;
+                                    //Do not return, need to create a new TCP connection
+                            }
+
+                        }//else { TCP transport does not exists.}
+
+                        //TCP transport either doesn't exist or is not connected. Start one up.
+                        service.tcpTransport = new MultiplexTcpTransport(port, ipAddress, true, service.tcpHandler, service);
+                        service.tcpTransport.start();
+
+                    }
+                    break;
+                default:
+                    super.handleMessage(msg);
+            }
+        }
+    }
+
+
+    /**
+     * Target we publish for alternative transport (USB) clients to send messages to RouterHandler.
+     */
+    final Messenger altTransportMessenger = new Messenger(new AltTransportHandler(this));
+
+    /**
+     * Handler of incoming messages from an alternative transport (USB).
+     */
+    @SuppressWarnings("Convert2Diamond")
+    static class AltTransportHandler extends Handler {
+        final ClassLoader loader;
+        final WeakReference<SdlRouterService> provider;
+
+        public AltTransportHandler(SdlRouterService provider) {
+            this.provider = new WeakReference<SdlRouterService>(provider);
+            loader = getClass().getClassLoader();
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            if (this.provider.get() == null) {
+                return;
+            }
+            SdlRouterService service = this.provider.get();
+            Bundle receivedBundle = msg.getData();
+            switch (msg.what) {
+                case TransportConstants.HARDWARE_CONNECTION_EVENT:
+                    if (receivedBundle.containsKey(TransportConstants.HARDWARE_DISCONNECTED)) {
+                        //We should shut down, so call
+                        if (altTransportService != null
+                                && altTransportService.equals(msg.replyTo)) {
+                            //The same transport that was connected to the router service is now telling us it's disconnected. Let's inform clients and clear our saved messenger
+                            altTransportService = null;
+                            service.onTransportDisconnected(new TransportRecord(TransportType.valueOf(receivedBundle.getString(TransportConstants.HARDWARE_DISCONNECTED)), null));
+                            service.shouldServiceRemainOpen(null); //this will close the service if bluetooth is not available
+                        }
+                    } else if (receivedBundle.containsKey(TransportConstants.HARDWARE_CONNECTED)) {
+                        Message retMsg = Message.obtain();
+                        retMsg.what = TransportConstants.ROUTER_REGISTER_ALT_TRANSPORT_RESPONSE;
+                        if (altTransportService == null) { //Ok no other transport is connected, this is good
+                            DebugTool.logInfo(TAG, "Alt transport connected.");
+                            if (msg.replyTo == null) {
+                                break;
+                            }
+                            altTransportService = msg.replyTo;
+                            //Clear out the timer to make sure the service knows we're good to go
+                            if (service.altTransportTimerHandler != null && service.altTransportTimerRunnable != null) {
+                                service.altTransportTimerHandler.removeCallbacks(service.altTransportTimerRunnable);
+                            }
+                            service.altTransportTimerHandler = null;
+                            service.altTransportTimerRunnable = null;
+
+                            //Let the alt transport know they are good to go
+                            retMsg.arg1 = TransportConstants.ROUTER_REGISTER_ALT_TRANSPORT_RESPONSE_SUCESS;
+                            service.onTransportConnected(new TransportRecord(TransportType.valueOf(receivedBundle.getString(TransportConstants.HARDWARE_CONNECTED)), null));
+
+                        } else { //There seems to be some other transport connected
+                            //Error
+                            retMsg.arg1 = TransportConstants.ROUTER_REGISTER_ALT_TRANSPORT_ALREADY_CONNECTED;
+                        }
+                        if (msg.replyTo != null) {
+                            try {
+                                msg.replyTo.send(retMsg);
+                            } catch (RemoteException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                    break;
+                case TransportConstants.ROUTER_RECEIVED_PACKET:
+                    if (receivedBundle != null) {
+                        receivedBundle.setClassLoader(loader);//We do this because loading a custom parcelable object isn't possible without it
+                        if (receivedBundle.containsKey(TransportConstants.FORMED_PACKET_EXTRA_NAME)) {
+                            SdlPacket packet = receivedBundle.getParcelable(TransportConstants.FORMED_PACKET_EXTRA_NAME);
+                            if (packet != null) {
+                                service.onPacketRead(packet);
+                            } else {
+                                DebugTool.logWarning(TAG, "Received null packet from alt transport service");
+                            }
+                        } else {
+                            DebugTool.logWarning(TAG, "False positive packet reception");
+                        }
+                    } else {
+                        DebugTool.logError(TAG, "Bundle was null while sending packet to router service from alt transport");
+                    }
+                    break;
+                default:
+                    super.handleMessage(msg);
+            }
+
+        }
+    }
+
+    /**
+     * Target we publish for alternative transport (USB) clients to send messages to RouterHandler.
+     */
+    final Messenger routerStatusMessenger = new Messenger(new RouterStatusHandler(this));
+
+    /**
+     * Handler of incoming messages from an alternative transport (USB).
+     */
+    @SuppressWarnings("Convert2Diamond")
+    static class RouterStatusHandler extends Handler {
+        final WeakReference<SdlRouterService> provider;
+
+        public RouterStatusHandler(SdlRouterService provider) {
+            this.provider = new WeakReference<SdlRouterService>(provider);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            if (this.provider.get() == null) {
+                return;
+            }
+            SdlRouterService service = this.provider.get();
+            switch (msg.what) {
+                case TransportConstants.ROUTER_STATUS_CONNECTED_STATE_REQUEST:
+                    int flags = msg.arg1;
+                    if (msg.replyTo != null) {
+                        Message message = Message.obtain();
+                        message.what = TransportConstants.ROUTER_STATUS_CONNECTED_STATE_RESPONSE;
+                        message.arg1 = (service.isPrimaryTransportConnected()) ? 1 : 0;
+                        try {
+                            msg.replyTo.send(message);
+                        } catch (RemoteException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    if (service.isPrimaryTransportConnected() && ((TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING & flags) == TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING)) {
+                        if (service.pingIntent == null) {
+                            service.initPingIntent();
+                        }
+                        AndroidTools.sendExplicitBroadcast(service.getApplicationContext(), service.pingIntent, null);
+                    }
+                    break;
+                default:
+                    DebugTool.logWarning(TAG, "Unsupported request: " + msg.what);
+                    break;
+            }
+        }
+    }
+
 
-									if(buffApp !=null){
-                                        buffApp.handleIncommingClientMessage(receivedBundle);
-                                    }else{
-										TransportType transportType = TransportType.valueForString(receivedBundle.getString(TransportConstants.TRANSPORT_TYPE));
-										if(transportType == null){
-
-											/* We check bluetooth first because we assume if this value
-											 * isn't included it is an older version of the proxy and
-											 * therefore will be expecting this to be bluetooth.
-											 */
-											if(service.bluetoothTransport != null && service.bluetoothTransport.isConnected()){
-												transportType = TransportType.BLUETOOTH;
-											} else if(service.usbTransport!= null && service.usbTransport.isConnected()){
-												transportType = TransportType.USB;
-											} else if(service.tcpTransport != null && service.tcpTransport.isConnected()){
-												transportType = TransportType.TCP;
-											}else{
-												// This means no transport is connected. Likely the
-												// router service has already disconnected and this
-												// is now just executing.
-												DebugTool.logError(TAG, "Can't send packet, no transport specified and none are connected.");
-												return;
-											}
-											//Log.d(TAG, "Transport type was null, so router set it to " + transportType.name());
-											if(transportType != null){
-												receivedBundle.putString(TransportConstants.TRANSPORT_TYPE, transportType.name());
-											}
-										}
-                                        service.writeBytesToTransport(receivedBundle);
+    /**
+     * Target we publish for alternative transport (USB) clients to send messages to RouterHandler.
+     */
+    final Messenger usbTransferMessenger = new Messenger(new UsbTransferHandler(this));
+
+    /**
+     * Handler of incoming messages from an alternative transport (USB).
+     */
+    @SuppressWarnings("Convert2Diamond")
+    static class UsbTransferHandler extends Handler {
+        final WeakReference<SdlRouterService> provider;
+        Runnable usbCableDisconnectRunnable;
+        BroadcastReceiver usbCableDisconnectBroadcastReceiver;
+
+        public UsbTransferHandler(SdlRouterService provider) {
+            this.provider = new WeakReference<SdlRouterService>(provider);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            if (this.provider.get() == null) {
+                return;
+            }
+            SdlRouterService service = this.provider.get();
+            switch (msg.what) {
+                case TransportConstants.USB_CONNECTED_WITH_DEVICE:
+                    service.enterForeground("Opening USB connection", FOREGROUND_TIMEOUT, false);
+                    service.resetForegroundTimeOut(FOREGROUND_TIMEOUT);
+                    int flags = msg.arg1;
+
+                    ParcelFileDescriptor parcelFileDescriptor = (ParcelFileDescriptor) msg.obj;
+
+                    if (parcelFileDescriptor != null) {
+                        //New USB constructor with PFD
+                        service.usbTransport = new MultiplexUsbTransport(parcelFileDescriptor, service.usbHandler, msg.getData());
+
+
+                        usbCableDisconnectRunnable = new Runnable() {
+                            @Override
+                            public void run() {
+                                if (provider.get() != null && AndroidTools.isUSBCableConnected(provider.get().getApplicationContext())) {
+                                    provider.get().usbTransport.start();
+                                }
+                            }
+                        };
+                        postDelayed(usbCableDisconnectRunnable, 4000);
+
+
+                        // Register a BroadcastReceiver to stop USB transport if USB cable got disconnected
+                        if (provider.get() != null) {
+                            usbCableDisconnectBroadcastReceiver = new BroadcastReceiver() {
+                                @Override
+                                public void onReceive(Context context, Intent intent) {
+                                    int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+                                    if (provider.get() != null && plugged != BatteryManager.BATTERY_PLUGGED_AC && plugged != BatteryManager.BATTERY_PLUGGED_USB) {
+                                        try {
+                                            provider.get().getApplicationContext().unregisterReceiver(usbCableDisconnectBroadcastReceiver);
+                                        } catch (Exception e) {
+                                        }
+                                        removeCallbacks(usbCableDisconnectRunnable);
+                                        if (provider.get().usbTransport != null) {
+                                            provider.get().usbTransport.stop();
+                                        }
                                     }
-								}
-	                		};
-	                		if(service.packetExecutor !=null){
-	                			service.packetExecutor.execute(packetRun);
-	                		}
-	                	}
-	                    break;
-	                case TransportConstants.ROUTER_REQUEST_NEW_SESSION:
-	                	String appIdRequesting = receivedBundle.getString(TransportConstants.APP_ID_EXTRA_STRING);
-	                	if(appIdRequesting == null){
-	                		appIdRequesting = "" + receivedBundle.getLong(TransportConstants.APP_ID_EXTRA, -1);
-	                	}
-	                	Message extraSessionResponse = Message.obtain();
-	                	extraSessionResponse.what = TransportConstants.ROUTER_REQUEST_NEW_SESSION_RESPONSE;
-	                	if(appIdRequesting.length()>0){
-							synchronized(service.REGISTERED_APPS_LOCK){
-								if(registeredApps!=null){
-									RegisteredApp appRequesting = registeredApps.get(appIdRequesting);
-									if(appRequesting!=null){
-										//Retrieve the transport the app is requesting a new session
-										String transport = receivedBundle.getString(TransportConstants.TRANSPORT_TYPE);
-										TransportType requestingTransport = null;
-										if(transport != null){
-											try{
-												requestingTransport = TransportType.valueOf(transport);
-											}catch (IllegalArgumentException e){}
-										}
-										if(requestingTransport == null){
-											/* We check bluetooth first because we assume if this value
-											 * isn't included it is an older version of the proxy and
-											 * therefore will be expecting this to be bluetooth.
-											 */
-											if(service.bluetoothTransport != null && service.bluetoothTransport.isConnected()){
-												requestingTransport = TransportType.BLUETOOTH;
-											}else if(service.usbTransport!= null && service.usbTransport.isConnected()){
-												requestingTransport = TransportType.USB;
-											}else if(service.tcpTransport != null && service.tcpTransport.isConnected()){
-												requestingTransport = TransportType.TCP;
-											}
-										}
-										appRequesting.getSessionIds().add((long)-1); //Adding an extra session
-										appRequesting.getAwaitingSession().add(requestingTransport);
-										extraSessionResponse.arg1 = TransportConstants.ROUTER_REQUEST_NEW_SESSION_RESPONSE_SUCESS;
-									}else{
-										extraSessionResponse.arg1 = TransportConstants.ROUTER_REQUEST_NEW_SESSION_RESPONSE_FAILED_APP_NOT_FOUND;
-									}
-								}
-							}		
-						}else{
-							extraSessionResponse.arg1 = TransportConstants.ROUTER_REQUEST_NEW_SESSION_RESPONSE_FAILED_APP_ID_NOT_INCL;
-						}
-	                	try {
-	                		msg.replyTo.send(extraSessionResponse); //We do this because we aren't guaranteed to find the correct registeredApp to send the message through
-	                	} catch (RemoteException e) {
-	                		e.printStackTrace();
-	                	}catch(NullPointerException e2){
-							DebugTool.logError(TAG, "No reply address included, can't send a reply");
-	                	}
-	                	break;
-	                case  TransportConstants.ROUTER_REMOVE_SESSION:
-	                	String appIdWithSession = receivedBundle.getString(TransportConstants.APP_ID_EXTRA_STRING);
-	                	if(appIdWithSession == null){
-	                		appIdWithSession = "" + receivedBundle.getLong(TransportConstants.APP_ID_EXTRA, -1);
-	                	}
-	                	long sessionId = receivedBundle.getLong(TransportConstants.SESSION_ID_EXTRA, -1);
-
-	                	Message removeSessionResponse = Message.obtain();
-	                	removeSessionResponse.what = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE;
-	                	if(appIdWithSession.length()>0){
-	                		if(sessionId>=0){
-	                			synchronized(service.REGISTERED_APPS_LOCK){
-	                				if(registeredApps!=null){
-	                					RegisteredApp appRequesting = registeredApps.get(appIdWithSession);
-	                					if(appRequesting!=null){
-	                						//Might need to check which session is on which transport
-											service.removeSessionFromMap((int)sessionId, appRequesting.getTransportsForSession((int)sessionId));
-	                						if(appRequesting.removeSession(sessionId)){
-	                							removeSessionResponse.arg1 = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE_SUCESS;
-	                						}else{
-	                							removeSessionResponse.arg1 = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE_FAILED_SESSION_NOT_FOUND;
-	                						}							
-	                					}else{
-	                						removeSessionResponse.arg1 = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE_FAILED_APP_NOT_FOUND;
-	                					}
-	                				}
-	                			}		
-	                		}else{
-							removeSessionResponse.arg1 = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE_FAILED_SESSION_ID_NOT_INCL;
-							}
-	                	}else{
-							removeSessionResponse.arg1 = TransportConstants.ROUTER_REMOVE_SESSION_RESPONSE_FAILED_APP_ID_NOT_INCL;
-						}
-	                	try {
-	                		msg.replyTo.send(removeSessionResponse); //We do this because we aren't guaranteed to find the correct registeredApp to send the message through
-	                	} catch (RemoteException e) {
-	                		e.printStackTrace();
-	                	}catch(NullPointerException e2){
-							DebugTool.logError(TAG, "No reply address included, can't send a reply");
-	                	}
-	                	break;
-	                case TransportConstants.ROUTER_REQUEST_SECONDARY_TRANSPORT_CONNECTION:
-	                	// Currently this only handles one TCP connection
-
-		                String ipAddress = receivedBundle.getString(ControlFrameTags.RPC.TransportEventUpdate.TCP_IP_ADDRESS);
-		                int port = receivedBundle.getInt(ControlFrameTags.RPC.TransportEventUpdate.TCP_PORT);
-
-		                if(ipAddress != null){
-		                	if(service.tcpTransport != null){
-		                		switch (service.tcpTransport.getState()){
-									case MultiplexBaseTransport.STATE_CONNECTED:
-									case MultiplexBaseTransport.STATE_CONNECTING:
-										// A TCP connection is currently active. This version of the
-										// router service can't handle multiple TCP transports so just
-										// return a connected message to requester.
-										if(msg.replyTo != null){
-											// Send a transport connect message to the app that requested
-											// the tcp transport
-											try {
-												msg.replyTo.send(service.createHardwareConnectedMessage(service.tcpTransport.transportRecord));
-											} catch (RemoteException e) {
-												e.printStackTrace();
-											}
-										}
-										//Nothing else to do, so return out of this method
-										return;
-
-									case MultiplexBaseTransport.STATE_NONE:
-									case MultiplexBaseTransport.STATE_LISTEN:
-									case MultiplexBaseTransport.STATE_ERROR:
-										//Clear out tcp transport
-										service.tcpTransport.stop(MultiplexBaseTransport.STATE_NONE);
-										service.tcpTransport = null;
-										//Do not return, need to create a new TCP connection
-								}
-
-							}//else { TCP transport does not exists.}
-
-							//TCP transport either doesn't exist or is not connected. Start one up.
-							service.tcpTransport = new MultiplexTcpTransport(port, ipAddress, true, service.tcpHandler, service);
-							service.tcpTransport.start();
-
-		                }
-	                	break;
-	                default:
-	                    super.handleMessage(msg);
-	            }
-	        }
-	    }
-
-	    
-	    /**
-	     * Target we publish for alternative transport (USB) clients to send messages to RouterHandler.
-	     */
-	    final Messenger altTransportMessenger = new Messenger(new AltTransportHandler(this));
-	    
-		 /**
-	     * Handler of incoming messages from an alternative transport (USB).
-	     */
-	    @SuppressWarnings("Convert2Diamond")
-		static class AltTransportHandler extends Handler {
-	    	final ClassLoader loader;
-	    	final WeakReference<SdlRouterService> provider;
-
-	    	public AltTransportHandler(SdlRouterService provider){
-	    		this.provider = new WeakReference<SdlRouterService>(provider);
-	    		loader = getClass().getClassLoader();
-	    	}
-
-	        @Override
-	        public void handleMessage(Message msg) {
-	        	if(this.provider.get() == null){
-	        		return;
-	        	}
-	        	SdlRouterService service = this.provider.get();
-	        	Bundle receivedBundle = msg.getData();
-	        	switch(msg.what){
-	        	case TransportConstants.HARDWARE_CONNECTION_EVENT:
-        			if(receivedBundle.containsKey(TransportConstants.HARDWARE_DISCONNECTED)){
-        				//We should shut down, so call 
-        				if(altTransportService != null 
-        						&& altTransportService.equals(msg.replyTo)){
-        					//The same transport that was connected to the router service is now telling us it's disconnected. Let's inform clients and clear our saved messenger
-        					altTransportService = null;
-        					service.onTransportDisconnected(new TransportRecord(TransportType.valueOf(receivedBundle.getString(TransportConstants.HARDWARE_DISCONNECTED)),null));
-        					service.shouldServiceRemainOpen(null); //this will close the service if bluetooth is not available
-        				}
-        			}else if(receivedBundle.containsKey(TransportConstants.HARDWARE_CONNECTED)){
-    					Message retMsg =  Message.obtain();
-    					retMsg.what = TransportConstants.ROUTER_REGISTER_ALT_TRANSPORT_RESPONSE;
-        				if(altTransportService == null){ //Ok no other transport is connected, this is good
-							DebugTool.logInfo(TAG, "Alt transport connected.");
-        					if(msg.replyTo == null){
-        						break;
-        					}
-        					altTransportService = msg.replyTo;
-        					//Clear out the timer to make sure the service knows we're good to go
-        					if(service.altTransportTimerHandler!=null && service.altTransportTimerRunnable!=null){
-        						service.altTransportTimerHandler.removeCallbacks(service.altTransportTimerRunnable);
-        					}
-        					service.altTransportTimerHandler = null;
-        					service.altTransportTimerRunnable = null;
-        					
-        					//Let the alt transport know they are good to go
-        					retMsg.arg1 = TransportConstants.ROUTER_REGISTER_ALT_TRANSPORT_RESPONSE_SUCESS;
-        					service.onTransportConnected(new TransportRecord(TransportType.valueOf(receivedBundle.getString(TransportConstants.HARDWARE_CONNECTED)),null));
-
-        				}else{ //There seems to be some other transport connected
-        					//Error
-        					retMsg.arg1 = TransportConstants.ROUTER_REGISTER_ALT_TRANSPORT_ALREADY_CONNECTED;
-        				}
-        				if(msg.replyTo!=null){
-        					try {msg.replyTo.send(retMsg);} catch (RemoteException e) {e.printStackTrace();}
-        				}
-        			}
-            		break;
-	        	case TransportConstants.ROUTER_RECEIVED_PACKET:
-	        		if(receivedBundle!=null){
-	        			receivedBundle.setClassLoader(loader);//We do this because loading a custom parcelable object isn't possible without it
-					if(receivedBundle.containsKey(TransportConstants.FORMED_PACKET_EXTRA_NAME)){
-						SdlPacket packet = receivedBundle.getParcelable(TransportConstants.FORMED_PACKET_EXTRA_NAME);
-						if(packet!=null){
-							service.onPacketRead(packet);
-						}else{
-							DebugTool.logWarning(TAG, "Received null packet from alt transport service");
-						}
-					}else{
-						DebugTool.logWarning(TAG, "False positive packet reception");
-					}
-	            		}else{
-							DebugTool.logError(TAG, "Bundle was null while sending packet to router service from alt transport");
-	            		}
-            			break; 
-	        	default:
-	        		super.handleMessage(msg);
-	        	}
-	        	
-	        }
-	    }
-
-	/**
-	     * Target we publish for alternative transport (USB) clients to send messages to RouterHandler.
-	     */
-	    final Messenger routerStatusMessenger = new Messenger(new RouterStatusHandler(this));
-	    
-		 /**
-	     * Handler of incoming messages from an alternative transport (USB).
-	     */
-	    @SuppressWarnings("Convert2Diamond")
-		static class RouterStatusHandler extends Handler {
-	    	 final WeakReference<SdlRouterService> provider;
-
-	    	 public RouterStatusHandler(SdlRouterService provider){
-				 this.provider = new WeakReference<SdlRouterService>(provider);
-	    	 }
-
-	        @Override
-	        public void handleMessage(Message msg) {
-	        	if(this.provider.get() == null){
-	        		return;
-	        	}
-	        	SdlRouterService service = this.provider.get();
-	        	switch(msg.what){
-	        	case TransportConstants.ROUTER_STATUS_CONNECTED_STATE_REQUEST:
-        			int flags = msg.arg1;
-	        		if(msg.replyTo!=null){
-	        			Message message = Message.obtain();
-	        			message.what = TransportConstants.ROUTER_STATUS_CONNECTED_STATE_RESPONSE;
-	        			message.arg1 = (service.isPrimaryTransportConnected()) ? 1 : 0;
-	        			try {
-	        				msg.replyTo.send(message);
-	        			} catch (RemoteException e) {
-	        				e.printStackTrace();
-	        			}
-	        		}
-	        		if(service.isPrimaryTransportConnected() && ((TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING  & flags) == TransportConstants.ROUTER_STATUS_FLAG_TRIGGER_PING)){
-	        			if(service.pingIntent == null){
-	        				service.initPingIntent();
-	        			}
-	        			AndroidTools.sendExplicitBroadcast(service.getApplicationContext(),service.pingIntent, null);
-	        		}
-	        		break;
-	        	default:
-					DebugTool.logWarning(TAG, "Unsupported request: " + msg.what);
-	        		break;
-	        	}
-	        }
-	    }
-
-
-		/**
-	     * Target we publish for alternative transport (USB) clients to send messages to RouterHandler.
-	     */
-	    final Messenger usbTransferMessenger = new Messenger(new UsbTransferHandler(this));
-
-		 /**
-	     * Handler of incoming messages from an alternative transport (USB).
-	     */
-	    @SuppressWarnings("Convert2Diamond")
-		static class UsbTransferHandler extends Handler {
-	    	 final WeakReference<SdlRouterService> provider;
-	    	 Runnable usbCableDisconnectRunnable;
-	    	 BroadcastReceiver usbCableDisconnectBroadcastReceiver;
-
-	    	 public UsbTransferHandler(SdlRouterService provider){
-				 this.provider = new WeakReference<SdlRouterService>(provider);
-	    	 }
-
-			@Override
-	        public void handleMessage(Message msg) {
-	        	if(this.provider.get() == null){
-	        		return;
-	        	}
-	        	SdlRouterService service = this.provider.get();
-	        	switch(msg.what){
-					case TransportConstants.USB_CONNECTED_WITH_DEVICE:
-						service.enterForeground("Opening USB connection",FOREGROUND_TIMEOUT,false);
-						service.resetForegroundTimeOut(FOREGROUND_TIMEOUT);
-        			int flags = msg.arg1;
-
-					ParcelFileDescriptor parcelFileDescriptor = (ParcelFileDescriptor)msg.obj;
-
-					if(parcelFileDescriptor != null) {
-						//New USB constructor with PFD
-						service.usbTransport = new MultiplexUsbTransport(parcelFileDescriptor, service.usbHandler, msg.getData());
-
-
-						usbCableDisconnectRunnable = new Runnable() {
-							@Override
-							public void run() {
-								if(provider.get() != null && AndroidTools.isUSBCableConnected(provider.get().getApplicationContext())) {
-									provider.get().usbTransport.start();
-								}
-							}
-						};
-						postDelayed(usbCableDisconnectRunnable, 4000);
-
-
-						// Register a BroadcastReceiver to stop USB transport if USB cable got disconnected
-						if (provider.get() != null) {
-							usbCableDisconnectBroadcastReceiver = new BroadcastReceiver() {
-								@Override
-								public void onReceive(Context context, Intent intent) {
-									int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
-									if (provider.get()!= null && plugged != BatteryManager.BATTERY_PLUGGED_AC && plugged != BatteryManager.BATTERY_PLUGGED_USB) {
-										try {
-											provider.get().getApplicationContext().unregisterReceiver(usbCableDisconnectBroadcastReceiver);
-										} catch (Exception e){ }
-										removeCallbacks(usbCableDisconnectRunnable);
-										if (provider.get().usbTransport != null) {
-											provider.get().usbTransport.stop();
-										}
-									}
-								}
-							};
-							provider.get().getApplicationContext().registerReceiver(usbCableDisconnectBroadcastReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-						}
-
-
-					}
-
-	        		if(msg.replyTo!=null){
-	        			Message message = Message.obtain();
-	        			message.what = TransportConstants.ROUTER_USB_ACC_RECEIVED;
-	        			try {
-	        				msg.replyTo.send(message);
-	        			} catch (RemoteException e) {
-	        				e.printStackTrace();
-	        			}
-	        		}
-
-	        		break;
-			        case TransportConstants.ALT_TRANSPORT_CONNECTED:
-			        	break;
-	        	default:
-					DebugTool.logWarning(TAG, "Unsupported request: " + msg.what);
-	        		break;
-	        	}
-	        }
-	    }
-
-/* **************************************************************************************************************************************
-***********************************************  Life Cycle **************************************************************
-****************************************************************************************************************************************/
-
-	@Override
-	public IBinder onBind(Intent intent) {
-		//Check intent to send back the correct binder (client binding vs alt transport)
-		if(intent!=null){
-			if(closing){
-				DebugTool.logWarning(TAG, "Denying bind request due to service shutting down.");
-				return null;
-			}
-			String requestType = intent.getAction();//intent.getIntExtra(TransportConstants.ROUTER_BIND_REQUEST_TYPE_EXTRA, TransportConstants.BIND_REQUEST_TYPE_CLIENT);
-			if(TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT.equals(requestType)){
-				if(0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)){ //Only allow alt transport in debug mode
-					return this.altTransportMessenger.getBinder();
-				}
-			}else if(TransportConstants.BIND_REQUEST_TYPE_CLIENT.equals(requestType)){
-				return this.routerMessenger.getBinder();
-			}else if(TransportConstants.BIND_REQUEST_TYPE_STATUS.equals(requestType)){
-				return this.routerStatusMessenger.getBinder();
-			}else if(TransportConstants.BIND_REQUEST_TYPE_USB_PROVIDER.equals(requestType)){
-			    return this.usbTransferMessenger.getBinder();
-			}else{
-				DebugTool.logWarning(TAG, "Unknown bind request type");
-			}
-			
-		}
-		return null;
-	}
-
-	
-	
-	@Override
-	public boolean onUnbind(Intent intent) {
-		DebugTool.logInfo(TAG, "Unbind being called.");
-		return super.onUnbind(intent);
-	}
-
-
-	private void notifyClients(final Message message){
-		if(message==null){
-			DebugTool.logWarning(TAG, "Can't notify clients, message was null");
-			return;
-		}
-		DebugTool.logInfo(TAG, "Notifying "+ registeredApps.size()+ " clients");
-		int result;
-		synchronized(REGISTERED_APPS_LOCK){
-			Collection<RegisteredApp> apps = registeredApps.values();
-			Iterator<RegisteredApp> it = apps.iterator();
-			Message formattedMessage = new Message();
-			while(it.hasNext()){
-				RegisteredApp app = it.next();
-				formattedMessage.copyFrom(message);
-				//Format the message for the receiving app and appropriate messaging version
-				if(formatMessage(app, formattedMessage)) {
-					result = app.sendMessage(formattedMessage);
-					if (result == RegisteredApp.SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT) {
-						app.close();
-						it.remove();
-					}
-				}
-			}
-
-		}
-	}
-
-	/**
-	 * Formats the message for the app that is to receive it
-	 * @param app
-	 * @param message
-	 * @return if the message should be sent or not
-	 */
-	protected boolean formatMessage(RegisteredApp app, Message message){
-		if( app.routerMessagingVersion <= 1){
-			Bundle bundle = message.getData();
-			if (bundle != null){
-				if(message.what == TransportConstants.HARDWARE_CONNECTION_EVENT) {
-
-					switch (message.arg1){
-						case TransportConstants.HARDWARE_CONNECTION_EVENT_CONNECTED:
-							if(app.isRegisteredOnTransport(-1, null)){
-								//App is already registered on a transport and does not need this update
-								return false;
-							}
-							break;
-						case TransportConstants.HARDWARE_CONNECTION_EVENT_DISCONNECTED:
-							if(bundle.containsKey(TransportConstants.HARDWARE_DISCONNECTED)){
-								TransportType transportType = TransportType.valueOf(bundle.getString(TransportConstants.HARDWARE_DISCONNECTED));
-								if(!app.isRegisteredOnTransport(-1, transportType)){
-									//App is not registered on this transport, not sending
-									return false;
-								}
-							}
-							if (bundle.containsKey(TransportConstants.TRANSPORT_DISCONNECTED)) {
-								//Unable to handle new parcel TransportRecord
-								bundle.remove(TransportConstants.TRANSPORT_DISCONNECTED);
-							}
-							break;
-					}
-
-					//All connection event messages should have this as part of the bundle
-					if (bundle.containsKey(TransportConstants.CURRENT_HARDWARE_CONNECTED)) {
-						//Unable to handle new parcel TransportRecord
-						bundle.remove(TransportConstants.CURRENT_HARDWARE_CONNECTED);
-					}
-
-
-				}
-			}
-		}
-		return true;
-	}
-	
-	private void pingClients(){
-		Message message = Message.obtain();
-		DebugTool.logInfo(TAG, "Pinging "+ registeredApps.size()+ " clients");
-		int result;
-		synchronized(REGISTERED_APPS_LOCK){
-			Collection<RegisteredApp> apps = registeredApps.values();
-			Iterator<RegisteredApp> it = apps.iterator();
-			while(it.hasNext()){
-				RegisteredApp app = it.next();
-				result = app.sendMessage(message);
-				if(result == RegisteredApp.SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT){
-					app.close();
-					Vector<Long> sessions = app.getSessionIds();
-					for(Long session:sessions){
-						if(session !=null && session != -1){
-							List<TransportType> transportTypes = app.getTransportsForSession(session.intValue());
-							if(transportTypes != null && transportTypes.size() > 0){
-								attemptToCleanUpModule(session.intValue(), cachedModuleVersion, transportTypes.get(0) );
-							}
-						}
-					}
-					it.remove();
-				}
-			}
-		}
-	}
-	
-	/**
-	 * We want to make sure we are in the right process here. If there is some sort of developer error
-	 * we want to just close out right away.
-	 * @return if this service is executing in the correct process
-	 */
-	private boolean processCheck(){
-		int myPid = android.os.Process.myPid();
-		ActivityManager am = (ActivityManager)this.getSystemService(ACTIVITY_SERVICE);
-		if(am == null || am.getRunningAppProcesses() == null)
-			return false; // No RunningAppProcesses, let's close out
-		for (RunningAppProcessInfo processInfo : am.getRunningAppProcesses())
-		{
-			if (processInfo != null && processInfo.pid == myPid)
-			{
-				return ROUTER_SERVICE_PROCESS.equals(processInfo.processName);
-			}
-		}
-		return false;
-
-	}
-	
-	@SuppressWarnings("SameParameterValue")
-	private boolean permissionCheck(String permissionToCheck){
-		if(permissionToCheck == null){
-			throw new IllegalArgumentException("permission is null");
-		}
-		return PackageManager.PERMISSION_GRANTED == getBaseContext().checkPermission(permissionToCheck, android.os.Process.myPid(), android.os.Process.myUid());
-	}
-
-	/**
-	 * Runs several checks to ensure this router service has the correct conditions to run properly 
-	 * @return true if this service is set up correctly
-	 */
-	private boolean initCheck(){
-		if(!processCheck()){
-			DebugTool.logError(TAG, "Not using correct process. Shutting down");
-			wrongProcess = true;
-			return false;
-		}
-		if(!permissionCheck(Manifest.permission.BLUETOOTH)){
-			DebugTool.logError(TAG, "Bluetooth Permission is not granted. Shutting down");
-			return false;
-		}
-		if(!AndroidTools.isServiceExported(this, new ComponentName(this, this.getClass()))){ //We want to check to see if our service is actually exported
-			DebugTool.logError(TAG, "Service isn't exported. Shutting down");
-			return false;
-		}
-		return true;
-	}
-
-
-	@Override
-	public void onCreate() {
-		super.onCreate();
-		if (AndroidTools.isDebugMode(getApplicationContext())) {
-			IntegrationValidator.ValidationResult result =	IntegrationValidator.validate(getApplicationContext(), this.getClass(), 0);
-			if(!result.isSuccessful()) {
-				throw new RuntimeException(result.getResultText());
-			}
-		}
-		//Add this first to avoid the runtime exceptions for the entire lifecycle of the service
-		setRouterServiceExceptionHandler();
-		//This must be done regardless of if this service shuts down or not
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-			hasCalledStartForeground = false;
-			enterForeground("Waiting for connection...", FOREGROUND_TIMEOUT/1000, false);
-			hasCalledStartForeground = true;
-			resetForegroundTimeOut(FOREGROUND_TIMEOUT/1000);
-		}
-
-
-		if(!initCheck()){ // Run checks on process and permissions
-			deployNextRouterService();
-			closeSelf();
-			return;
-		}
-		initPassed = true;
-
-
-		synchronized(REGISTERED_APPS_LOCK){
-			registeredApps = new HashMap<String,RegisteredApp>();
-		}
-		closing = false;
-
-		synchronized(SESSION_LOCK){
-			this.bluetoothSessionMap = new SparseArray<String>();
-			this.sessionHashIdMap = new SparseIntArray();
-			this.cleanedSessionMap = new SparseIntArray();
-		}
-
-		packetExecutor =  Executors.newSingleThreadExecutor();
-
-		startUpSequence();
-	}
-
-	/**
-	 * The method will attempt to start up the next router service in line based on the sorting criteria of best router service.
-	 */
-	protected void deployNextRouterService(){
-		List<SdlAppInfo> sdlAppInfoList = AndroidTools.querySdlAppInfo(getApplicationContext(), new SdlAppInfo.BestRouterComparator());
-		if (sdlAppInfoList != null && !sdlAppInfoList.isEmpty()) {
-			ComponentName name = new ComponentName(this, this.getClass());
-			SdlAppInfo info;
-			int listSize = sdlAppInfoList.size();
-			for(int i = 0; i < listSize; i++) {
-				info = sdlAppInfoList.get(i);
-				if(info.getRouterServiceComponentName().equals(name) && listSize > i + 1){
-					SdlAppInfo nextUp = sdlAppInfoList.get(i+1);
-					Intent serviceIntent = new Intent();
-					serviceIntent.setComponent(nextUp.getRouterServiceComponentName());
-					if(Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-						startService(serviceIntent);
-					}else{
-						try{
-							startForegroundService(serviceIntent);
-						}catch (Exception e){
-							DebugTool.logError(TAG, "Unable to start next SDL router service. " + e.getMessage());
-						}
-					}
-					break;
-
-				}
-			}
-		} else{
-			DebugTool.logInfo(TAG, "No sdl apps found");
-			return;
-		}
-		closing = true;
-		closeBluetoothSerialServer();
-		notifyAltTransportOfClose(TransportConstants.ROUTER_SHUTTING_DOWN_REASON_NEWER_SERVICE);
-	}
-	
-	public void startUpSequence(){
-		IntentFilter disconnectFilter = new IntentFilter();
-		disconnectFilter.addAction(BluetoothDevice.ACTION_CLASS_CHANGED);
-		disconnectFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
-		disconnectFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECT_REQUESTED);
-		disconnectFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-		registerReceiver(mListenForDisconnect,disconnectFilter );
-		
-		IntentFilter filter = new IntentFilter();
-		filter.addAction(REGISTER_WITH_ROUTER_ACTION);
-		registerReceiver(mainServiceReceiver,filter);
-		
-		if(!connectAsClient){
-			if(bluetoothAvailable()){
-				initBluetoothSerialService();
-			}
-		}
-		
-		if(altTransportTimerHandler!=null){
-			//There's an alt transport waiting for this service to be started
-			Intent intent =  new Intent(TransportConstants.ALT_TRANSPORT_RECEIVER);
-			sendBroadcast(intent);
-		}
-		
-		startSequenceComplete= true;
-	}
-
-	/**
-	 * This method will set a new UncaughtExceptionHandler for the current thread. The only
-	 * purpose of the custom UncaughtExceptionHandler is to catch the rare occurrence that the
-	 * a specific mobile device/OS can't properly handle the deletion and creation of the foreground
-	 * notification channel that is necessary for foreground services after Android Oreo.
-	 * The new UncaughtExceptionHandler will catch that specific exception and tell the
-	 * main looper to continue forward. This still leaves the SdlRouterService killed, but prevents
-	 * an ANR to the app that makes the startForegroundService call. It will set a flag that will
-	 * prevent the channel from being deleted in the future and therefore avoiding this exception.
-	 */
-	protected void setRouterServiceExceptionHandler() {
-		final Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
-		if (defaultUncaughtExceptionHandler != routerServiceExceptionHandler) {
-			routerServiceExceptionHandler = new Thread.UncaughtExceptionHandler() {
-				@Override
-				public void uncaughtException(Thread t, Throwable e) {
-					if (e != null
-							&& e instanceof AndroidRuntimeException
-							&& "android.app.RemoteServiceException".equals(e.getClass().getName())  //android.app.RemoteServiceException is a private class
-							&& e.getMessage() != null
-							&& e.getMessage().contains("invalid channel for service notification")) { //This is the message received in the exception for notification channel issues
-
-						// Set the flag to not delete the notification channel to avoid this exception in the future
-						try{
-						    SdlRouterService.this.setSdlRouterServicePrefs(KEY_AVOID_NOTIFICATION_CHANNEL_DELETE, true);
-						}catch (Exception exception){
-						    //Unable to save flag for KEY_AVOID_NOTIFICATION_CHANNEL_DELETE
-						}
-						Looper.loop();
-					} else if (defaultUncaughtExceptionHandler != null) { //No other exception should be handled
-						defaultUncaughtExceptionHandler.uncaughtException(t, e);
-					}
-				}
-			};
-			Thread.setDefaultUncaughtExceptionHandler(routerServiceExceptionHandler);
-		}
-	}
-
-
-	@SuppressLint({"NewApi", "MissingPermission"})
-	@Override
-	public int onStartCommand(Intent intent, int flags, int startId) {
-		if(intent != null ){
-			if(intent.getBooleanExtra(FOREGROUND_EXTRA, false)){
-				hasCalledStartForeground = false;
-
-				if (!this.isPrimaryTransportConnected()) {	//If there is no transport connected we need to ensure the service is moved to the foreground
-					String address = null;
-					if(intent.hasExtra(BluetoothDevice.EXTRA_DEVICE)){
-						BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
-						if(device != null){
-							address = device.getAddress();
-						}
-					}
-					boolean confirmedDevice = intent.getBooleanExtra(TransportConstants.CONFIRMED_SDL_DEVICE, false);
-					int timeout = getNotificationTimeout(address, confirmedDevice);
-
-					enterForeground("Waiting for connection...", timeout, false);
-					resetForegroundTimeOut(timeout);
-				} else {
-					enterForeground(createConnectedNotificationText(),0,true);
-				}
-
-				hasCalledStartForeground = true;
-			}
-
-			if(intent.hasExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA)){
-				//Make sure we are listening on RFCOMM
-				if(startSequenceComplete){ //We only check if we are sure we are already through the start up process
-					DebugTool.logInfo(TAG, "Received ping, making sure we are listening to bluetooth rfcomm");
-					initBluetoothSerialService();
-				}
-			}
-		}
-
-		if(!shouldServiceRemainOpen(intent)){
-			closeSelf();
-		}
-
-		if(registeredApps == null){
-			synchronized(REGISTERED_APPS_LOCK){
-				registeredApps = new HashMap<String,RegisteredApp>();
-			}
-		}
-		return START_REDELIVER_INTENT;
-	}
-
-	@SuppressWarnings("ConstantConditions")
-	@Override
-	public void onDestroy(){
-		stopClientPings();
-
-		if(altTransportTimerHandler!=null){
-			altTransportTimerHandler.removeCallbacks(altTransportTimerRunnable);
-			altTransportTimerHandler = null;
-		}
-
-		DebugTool.logWarning(TAG, "Sdl Router Service Destroyed");
-	    closing = true;
-		//No need for this Broadcast Receiver anymore
-		unregisterAllReceivers();
-		closeBluetoothSerialServer();
-		if(registeredApps!=null){
-			synchronized(REGISTERED_APPS_LOCK){
-				registeredApps.clear();
-				registeredApps = null;
-			}
-		}
-		synchronized(SESSION_LOCK){
-			if(this.bluetoothSessionMap !=null){
-				this.bluetoothSessionMap.clear();
-				this.bluetoothSessionMap = null;
-			}
-			if(this.sessionHashIdMap!=null){
-				this.sessionHashIdMap.clear();
-				this.sessionHashIdMap = null;
-			}
-		}
-		
-		//SESSION_LOCK = null;
-		
-		startSequenceComplete=false;
-		if(packetExecutor !=null){
-			packetExecutor.shutdownNow();
-			packetExecutor = null;
-		}
-		
-		exitForeground();
-		if(packetWriteTaskMasterMap != null && packetWriteTaskMasterMap.values() != null) {
-			Collection<PacketWriteTaskMaster> tasks = packetWriteTaskMasterMap.values();
-			for (PacketWriteTaskMaster packetWriteTaskMaster : tasks) {
-				if (packetWriteTaskMaster != null) {
-					packetWriteTaskMaster.close();
-				}
-			}
-		}
-		if(packetWriteTaskMasterMap != null){
-			packetWriteTaskMasterMap.clear();
-		}
-		packetWriteTaskMasterMap = null;
-
-		
-		super.onDestroy();
-		System.gc(); //Lower end phones need this hint
-		if(!wrongProcess){
-			//noinspection EmptyCatchBlock
-			try{
-				android.os.Process.killProcess(android.os.Process.myPid());
-			}catch(Exception e){}
-		}
-	}
-	
-	private void unregisterAllReceivers(){
-		//noinspection EmptyCatchBlock
-		try{
-			unregisterReceiver(mListenForDisconnect);
-			unregisterReceiver(mainServiceReceiver);
-		}catch(Exception e){}
-	}
-	
-	@SuppressWarnings("SameParameterValue")
-	private void notifyAltTransportOfClose(int reason){
-		if(altTransportService!=null){
-			Message msg = Message.obtain();
-			msg.what = TransportConstants.ROUTER_SHUTTING_DOWN_NOTIFICATION;
-			msg.arg1 = reason;
-			try {
-				altTransportService.send(msg);
-			} catch (RemoteException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * Gets the correct timeout for the foreground notification.
-	 * @param address the address of the device that is currently connected
-	 * @return the amount of time for a timeout handler to remove the notification.
-	 */
-	@SuppressLint("MissingPermission")
-	private int getNotificationTimeout(String address, boolean confirmedDevice){
-		if(address != null){
-			if(confirmedDevice || hasSDLConnected(address)){
-				return FOREGROUND_TIMEOUT * 2;
-			}else if(this.isFirstStatusCheck(address)) {
-				// If this is the first time the service has ever connected to this device we want
-				// to ensure we have a record of it
-				setSDLConnectedStatus(address, false);
-				return FOREGROUND_TIMEOUT;
-			}
-		}
-		// If this is a new device or hasn't connected through SDL we want to limit the exposure
-		// of the SDL service in the foreground
-		return FOREGROUND_TIMEOUT/1000;
-	}
-
-	public void resetForegroundTimeOut(long delay){
-		synchronized (FOREGROUND_NOTIFICATION_LOCK) {
-			if (foregroundTimeoutHandler == null) {
-				foregroundTimeoutHandler = new Handler();
-			}
-			if (foregroundTimeoutRunnable == null) {
-				foregroundTimeoutRunnable = new Runnable() {
-					@Override
-					public void run() {
-						if(!getConnectedTransports().isEmpty()){
-							// Updates notification to one of still connected transport
-							enterForeground(createConnectedNotificationText(),0,true);
-							return;
-						}else{
-							exitForeground();//Leave our foreground state as we don't have a connection
-
-						}
-					}
-				};
-			} else {
-				//This instance likely means there is a callback in the queue so we should remove it
-				foregroundTimeoutHandler.removeCallbacks(foregroundTimeoutRunnable);
-			}
-			foregroundTimeoutHandler.postDelayed(foregroundTimeoutRunnable, delay);
-		}
-	}
-
-	public void cancelForegroundTimeOut(){
-		synchronized (FOREGROUND_NOTIFICATION_LOCK) {
-			if (foregroundTimeoutHandler != null && foregroundTimeoutRunnable != null) {
-				foregroundTimeoutHandler.removeCallbacks(foregroundTimeoutRunnable);
-			}
-		}
-
-	}
-
-	@SuppressLint("NewApi")
-	private void enterForeground(String content, long chronometerLength, boolean ongoing) {
-		DebugTool.logInfo(TAG, "Attempting to enter the foreground - " + System.currentTimeMillis());
-
-		Bitmap icon;
-		int resourcesIncluded = getResources().getIdentifier("ic_sdl", "drawable", getPackageName());
-
-		if ( resourcesIncluded != 0 ) {  //No additional pylons required
-			icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_sdl);
-		}
-		else {  
-			icon = BitmapFactory.decodeResource(getResources(), android.R.drawable.stat_sys_data_bluetooth);
-		}
-       // Bitmap icon = BitmapFactory.decodeByteArray(SdlLogo.SDL_LOGO_STRING, 0, SdlLogo.SDL_LOGO_STRING.length);
+                                }
+                            };
+                            provider.get().getApplicationContext().registerReceiver(usbCableDisconnectBroadcastReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+                        }
+
+
+                    }
+
+                    if (msg.replyTo != null) {
+                        Message message = Message.obtain();
+                        message.what = TransportConstants.ROUTER_USB_ACC_RECEIVED;
+                        try {
+                            msg.replyTo.send(message);
+                        } catch (RemoteException e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    break;
+                case TransportConstants.ALT_TRANSPORT_CONNECTED:
+                    break;
+                default:
+                    DebugTool.logWarning(TAG, "Unsupported request: " + msg.what);
+                    break;
+            }
+        }
+    }
+
+    /* **************************************************************************************************************************************
+     ***********************************************  Life Cycle **************************************************************
+     ****************************************************************************************************************************************/
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        //Check intent to send back the correct binder (client binding vs alt transport)
+        if (intent != null) {
+            if (closing) {
+                DebugTool.logWarning(TAG, "Denying bind request due to service shutting down.");
+                return null;
+            }
+            String requestType = intent.getAction();//intent.getIntExtra(TransportConstants.ROUTER_BIND_REQUEST_TYPE_EXTRA, TransportConstants.BIND_REQUEST_TYPE_CLIENT);
+            if (TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT.equals(requestType)) {
+                if (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)) { //Only allow alt transport in debug mode
+                    return this.altTransportMessenger.getBinder();
+                }
+            } else if (TransportConstants.BIND_REQUEST_TYPE_CLIENT.equals(requestType)) {
+                return this.routerMessenger.getBinder();
+            } else if (TransportConstants.BIND_REQUEST_TYPE_STATUS.equals(requestType)) {
+                return this.routerStatusMessenger.getBinder();
+            } else if (TransportConstants.BIND_REQUEST_TYPE_USB_PROVIDER.equals(requestType)) {
+                return this.usbTransferMessenger.getBinder();
+            } else {
+                DebugTool.logWarning(TAG, "Unknown bind request type");
+            }
+
+        }
+        return null;
+    }
+
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        DebugTool.logInfo(TAG, "Unbind being called.");
+        return super.onUnbind(intent);
+    }
+
+
+    private void notifyClients(final Message message) {
+        if (message == null) {
+            DebugTool.logWarning(TAG, "Can't notify clients, message was null");
+            return;
+        }
+        DebugTool.logInfo(TAG, "Notifying " + registeredApps.size() + " clients");
+        int result;
+        synchronized (REGISTERED_APPS_LOCK) {
+            Collection<RegisteredApp> apps = registeredApps.values();
+            Iterator<RegisteredApp> it = apps.iterator();
+            Message formattedMessage = new Message();
+            while (it.hasNext()) {
+                RegisteredApp app = it.next();
+                formattedMessage.copyFrom(message);
+                //Format the message for the receiving app and appropriate messaging version
+                if (formatMessage(app, formattedMessage)) {
+                    result = app.sendMessage(formattedMessage);
+                    if (result == RegisteredApp.SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT) {
+                        app.close();
+                        it.remove();
+                    }
+                }
+            }
+
+        }
+    }
+
+    /**
+     * Formats the message for the app that is to receive it
+     *
+     * @param app
+     * @param message
+     * @return if the message should be sent or not
+     */
+    protected boolean formatMessage(RegisteredApp app, Message message) {
+        if (app.routerMessagingVersion <= 1) {
+            Bundle bundle = message.getData();
+            if (bundle != null) {
+                if (message.what == TransportConstants.HARDWARE_CONNECTION_EVENT) {
+
+                    switch (message.arg1) {
+                        case TransportConstants.HARDWARE_CONNECTION_EVENT_CONNECTED:
+                            if (app.isRegisteredOnTransport(-1, null)) {
+                                //App is already registered on a transport and does not need this update
+                                return false;
+                            }
+                            break;
+                        case TransportConstants.HARDWARE_CONNECTION_EVENT_DISCONNECTED:
+                            if (bundle.containsKey(TransportConstants.HARDWARE_DISCONNECTED)) {
+                                TransportType transportType = TransportType.valueOf(bundle.getString(TransportConstants.HARDWARE_DISCONNECTED));
+                                if (!app.isRegisteredOnTransport(-1, transportType)) {
+                                    //App is not registered on this transport, not sending
+                                    return false;
+                                }
+                            }
+                            if (bundle.containsKey(TransportConstants.TRANSPORT_DISCONNECTED)) {
+                                //Unable to handle new parcel TransportRecord
+                                bundle.remove(TransportConstants.TRANSPORT_DISCONNECTED);
+                            }
+                            break;
+                    }
+
+                    //All connection event messages should have this as part of the bundle
+                    if (bundle.containsKey(TransportConstants.CURRENT_HARDWARE_CONNECTED)) {
+                        //Unable to handle new parcel TransportRecord
+                        bundle.remove(TransportConstants.CURRENT_HARDWARE_CONNECTED);
+                    }
+
+
+                }
+            }
+        }
+        return true;
+    }
+
+    private void pingClients() {
+        Message message = Message.obtain();
+        DebugTool.logInfo(TAG, "Pinging " + registeredApps.size() + " clients");
+        int result;
+        synchronized (REGISTERED_APPS_LOCK) {
+            Collection<RegisteredApp> apps = registeredApps.values();
+            Iterator<RegisteredApp> it = apps.iterator();
+            while (it.hasNext()) {
+                RegisteredApp app = it.next();
+                result = app.sendMessage(message);
+                if (result == RegisteredApp.SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT) {
+                    app.close();
+                    Vector<Long> sessions = app.getSessionIds();
+                    for (Long session : sessions) {
+                        if (session != null && session != -1) {
+                            List<TransportType> transportTypes = app.getTransportsForSession(session.intValue());
+                            if (transportTypes != null && transportTypes.size() > 0) {
+                                attemptToCleanUpModule(session.intValue(), cachedModuleVersion, transportTypes.get(0));
+                            }
+                        }
+                    }
+                    it.remove();
+                }
+            }
+        }
+    }
+
+    /**
+     * We want to make sure we are in the right process here. If there is some sort of developer error
+     * we want to just close out right away.
+     *
+     * @return if this service is executing in the correct process
+     */
+    private boolean processCheck() {
+        int myPid = android.os.Process.myPid();
+        ActivityManager am = (ActivityManager) this.getSystemService(ACTIVITY_SERVICE);
+        if (am == null || am.getRunningAppProcesses() == null)
+            return false; // No RunningAppProcesses, let's close out
+        for (RunningAppProcessInfo processInfo : am.getRunningAppProcesses()) {
+            if (processInfo != null && processInfo.pid == myPid) {
+                return ROUTER_SERVICE_PROCESS.equals(processInfo.processName);
+            }
+        }
+        return false;
+
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    private boolean permissionCheck(String permissionToCheck) {
+        if (permissionToCheck == null) {
+            throw new IllegalArgumentException("permission is null");
+        }
+        return PackageManager.PERMISSION_GRANTED == getBaseContext().checkPermission(permissionToCheck, android.os.Process.myPid(), android.os.Process.myUid());
+    }
+
+    /**
+     * Runs several checks to ensure this router service has the correct conditions to run properly
+     *
+     * @return true if this service is set up correctly
+     */
+    private boolean initCheck() {
+        if (!processCheck()) {
+            DebugTool.logError(TAG, "Not using correct process. Shutting down");
+            wrongProcess = true;
+            return false;
+        }
+        if (!permissionCheck(Manifest.permission.BLUETOOTH)) {
+            DebugTool.logError(TAG, "Bluetooth Permission is not granted. Shutting down");
+            return false;
+        }
+        if (!AndroidTools.isServiceExported(this, new ComponentName(this, this.getClass()))) { //We want to check to see if our service is actually exported
+            DebugTool.logError(TAG, "Service isn't exported. Shutting down");
+            return false;
+        }
+        return true;
+    }
+
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (AndroidTools.isDebugMode(getApplicationContext())) {
+            IntegrationValidator.ValidationResult result = IntegrationValidator.validate(getApplicationContext(), this.getClass(), 0);
+            if (!result.isSuccessful()) {
+                throw new RuntimeException(result.getResultText());
+            }
+        }
+        //Add this first to avoid the runtime exceptions for the entire lifecycle of the service
+        setRouterServiceExceptionHandler();
+        //This must be done regardless of if this service shuts down or not
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            hasCalledStartForeground = false;
+            enterForeground("Waiting for connection...", FOREGROUND_TIMEOUT / 1000, false);
+            hasCalledStartForeground = true;
+            resetForegroundTimeOut(FOREGROUND_TIMEOUT / 1000);
+        }
+
+
+        if (!initCheck()) { // Run checks on process and permissions
+            deployNextRouterService();
+            closeSelf();
+            return;
+        }
+        initPassed = true;
+
+
+        synchronized (REGISTERED_APPS_LOCK) {
+            registeredApps = new HashMap<String, RegisteredApp>();
+        }
+        closing = false;
+
+        synchronized (SESSION_LOCK) {
+            this.bluetoothSessionMap = new SparseArray<String>();
+            this.sessionHashIdMap = new SparseIntArray();
+            this.cleanedSessionMap = new SparseIntArray();
+        }
+
+        packetExecutor = Executors.newSingleThreadExecutor();
+
+        startUpSequence();
+    }
+
+    /**
+     * The method will attempt to start up the next router service in line based on the sorting criteria of best router service.
+     */
+    protected void deployNextRouterService() {
+        List<SdlAppInfo> sdlAppInfoList = AndroidTools.querySdlAppInfo(getApplicationContext(), new SdlAppInfo.BestRouterComparator());
+        if (sdlAppInfoList != null && !sdlAppInfoList.isEmpty()) {
+            ComponentName name = new ComponentName(this, this.getClass());
+            SdlAppInfo info;
+            int listSize = sdlAppInfoList.size();
+            for (int i = 0; i < listSize; i++) {
+                info = sdlAppInfoList.get(i);
+                if (info.getRouterServiceComponentName().equals(name) && listSize > i + 1) {
+                    SdlAppInfo nextUp = sdlAppInfoList.get(i + 1);
+                    Intent serviceIntent = new Intent();
+                    serviceIntent.setComponent(nextUp.getRouterServiceComponentName());
+                    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                        startService(serviceIntent);
+                    } else {
+                        try {
+                            startForegroundService(serviceIntent);
+                        } catch (Exception e) {
+                            DebugTool.logError(TAG, "Unable to start next SDL router service. " + e.getMessage());
+                        }
+                    }
+                    break;
+
+                }
+            }
+        } else {
+            DebugTool.logInfo(TAG, "No sdl apps found");
+            return;
+        }
+        closing = true;
+        closeBluetoothSerialServer();
+        notifyAltTransportOfClose(TransportConstants.ROUTER_SHUTTING_DOWN_REASON_NEWER_SERVICE);
+    }
+
+    public void startUpSequence() {
+        IntentFilter disconnectFilter = new IntentFilter();
+        disconnectFilter.addAction(BluetoothDevice.ACTION_CLASS_CHANGED);
+        disconnectFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
+        disconnectFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECT_REQUESTED);
+        disconnectFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+        registerReceiver(mListenForDisconnect, disconnectFilter);
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(REGISTER_WITH_ROUTER_ACTION);
+        registerReceiver(mainServiceReceiver, filter);
+
+        if (!connectAsClient) {
+            if (bluetoothAvailable()) {
+                initBluetoothSerialService();
+            }
+        }
+
+        if (altTransportTimerHandler != null) {
+            //There's an alt transport waiting for this service to be started
+            Intent intent = new Intent(TransportConstants.ALT_TRANSPORT_RECEIVER);
+            sendBroadcast(intent);
+        }
+
+        startSequenceComplete = true;
+    }
+
+    /**
+     * This method will set a new UncaughtExceptionHandler for the current thread. The only
+     * purpose of the custom UncaughtExceptionHandler is to catch the rare occurrence that the
+     * a specific mobile device/OS can't properly handle the deletion and creation of the foreground
+     * notification channel that is necessary for foreground services after Android Oreo.
+     * The new UncaughtExceptionHandler will catch that specific exception and tell the
+     * main looper to continue forward. This still leaves the SdlRouterService killed, but prevents
+     * an ANR to the app that makes the startForegroundService call. It will set a flag that will
+     * prevent the channel from being deleted in the future and therefore avoiding this exception.
+     */
+    protected void setRouterServiceExceptionHandler() {
+        final Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
+        if (defaultUncaughtExceptionHandler != routerServiceExceptionHandler) {
+            routerServiceExceptionHandler = new Thread.UncaughtExceptionHandler() {
+                @Override
+                public void uncaughtException(Thread t, Throwable e) {
+                    if (e != null
+                            && e instanceof AndroidRuntimeException
+                            && "android.app.RemoteServiceException".equals(e.getClass().getName())  //android.app.RemoteServiceException is a private class
+                            && e.getMessage() != null
+                            && e.getMessage().contains("invalid channel for service notification")) { //This is the message received in the exception for notification channel issues
+
+                        // Set the flag to not delete the notification channel to avoid this exception in the future
+                        try {
+                            SdlRouterService.this.setSdlRouterServicePrefs(KEY_AVOID_NOTIFICATION_CHANNEL_DELETE, true);
+                        } catch (Exception exception) {
+                            //Unable to save flag for KEY_AVOID_NOTIFICATION_CHANNEL_DELETE
+                        }
+                        Looper.loop();
+                    } else if (defaultUncaughtExceptionHandler != null) { //No other exception should be handled
+                        defaultUncaughtExceptionHandler.uncaughtException(t, e);
+                    }
+                }
+            };
+            Thread.setDefaultUncaughtExceptionHandler(routerServiceExceptionHandler);
+        }
+    }
+
+
+    @SuppressLint({"NewApi", "MissingPermission"})
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (intent != null) {
+            if (intent.getBooleanExtra(FOREGROUND_EXTRA, false)) {
+                hasCalledStartForeground = false;
+
+                if (!this.isPrimaryTransportConnected()) {    //If there is no transport connected we need to ensure the service is moved to the foreground
+                    String address = null;
+                    if (intent.hasExtra(BluetoothDevice.EXTRA_DEVICE)) {
+                        BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                        if (device != null) {
+                            address = device.getAddress();
+                        }
+                    }
+                    boolean confirmedDevice = intent.getBooleanExtra(TransportConstants.CONFIRMED_SDL_DEVICE, false);
+                    int timeout = getNotificationTimeout(address, confirmedDevice);
+
+                    enterForeground("Waiting for connection...", timeout, false);
+                    resetForegroundTimeOut(timeout);
+                } else {
+                    enterForeground(createConnectedNotificationText(), 0, true);
+                }
+
+                hasCalledStartForeground = true;
+            }
+
+            if (intent.hasExtra(TransportConstants.PING_ROUTER_SERVICE_EXTRA)) {
+                //Make sure we are listening on RFCOMM
+                if (startSequenceComplete) { //We only check if we are sure we are already through the start up process
+                    DebugTool.logInfo(TAG, "Received ping, making sure we are listening to bluetooth rfcomm");
+                    initBluetoothSerialService();
+                }
+            }
+        }
+
+        if (!shouldServiceRemainOpen(intent)) {
+            closeSelf();
+        }
+
+        if (registeredApps == null) {
+            synchronized (REGISTERED_APPS_LOCK) {
+                registeredApps = new HashMap<String, RegisteredApp>();
+            }
+        }
+        return START_REDELIVER_INTENT;
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    @Override
+    public void onDestroy() {
+        stopClientPings();
+
+        if (altTransportTimerHandler != null) {
+            altTransportTimerHandler.removeCallbacks(altTransportTimerRunnable);
+            altTransportTimerHandler = null;
+        }
+
+        DebugTool.logWarning(TAG, "Sdl Router Service Destroyed");
+        closing = true;
+        //No need for this Broadcast Receiver anymore
+        unregisterAllReceivers();
+        closeBluetoothSerialServer();
+        if (registeredApps != null) {
+            synchronized (REGISTERED_APPS_LOCK) {
+                registeredApps.clear();
+                registeredApps = null;
+            }
+        }
+        synchronized (SESSION_LOCK) {
+            if (this.bluetoothSessionMap != null) {
+                this.bluetoothSessionMap.clear();
+                this.bluetoothSessionMap = null;
+            }
+            if (this.sessionHashIdMap != null) {
+                this.sessionHashIdMap.clear();
+                this.sessionHashIdMap = null;
+            }
+        }
+
+        //SESSION_LOCK = null;
+
+        startSequenceComplete = false;
+        if (packetExecutor != null) {
+            packetExecutor.shutdownNow();
+            packetExecutor = null;
+        }
+
+        exitForeground();
+        if (packetWriteTaskMasterMap != null && packetWriteTaskMasterMap.values() != null) {
+            Collection<PacketWriteTaskMaster> tasks = packetWriteTaskMasterMap.values();
+            for (PacketWriteTaskMaster packetWriteTaskMaster : tasks) {
+                if (packetWriteTaskMaster != null) {
+                    packetWriteTaskMaster.close();
+                }
+            }
+        }
+        if (packetWriteTaskMasterMap != null) {
+            packetWriteTaskMasterMap.clear();
+        }
+        packetWriteTaskMasterMap = null;
+
+
+        super.onDestroy();
+        System.gc(); //Lower end phones need this hint
+        if (!wrongProcess) {
+            //noinspection EmptyCatchBlock
+            try {
+                android.os.Process.killProcess(android.os.Process.myPid());
+            } catch (Exception e) {
+            }
+        }
+    }
+
+    private void unregisterAllReceivers() {
+        //noinspection EmptyCatchBlock
+        try {
+            unregisterReceiver(mListenForDisconnect);
+            unregisterReceiver(mainServiceReceiver);
+        } catch (Exception e) {
+        }
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    private void notifyAltTransportOfClose(int reason) {
+        if (altTransportService != null) {
+            Message msg = Message.obtain();
+            msg.what = TransportConstants.ROUTER_SHUTTING_DOWN_NOTIFICATION;
+            msg.arg1 = reason;
+            try {
+                altTransportService.send(msg);
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    /**
+     * Gets the correct timeout for the foreground notification.
+     *
+     * @param address the address of the device that is currently connected
+     * @return the amount of time for a timeout handler to remove the notification.
+     */
+    @SuppressLint("MissingPermission")
+    private int getNotificationTimeout(String address, boolean confirmedDevice) {
+        if (address != null) {
+            if (confirmedDevice || hasSDLConnected(address)) {
+                return FOREGROUND_TIMEOUT * 2;
+            } else if (this.isFirstStatusCheck(address)) {
+                // If this is the first time the service has ever connected to this device we want
+                // to ensure we have a record of it
+                setSDLConnectedStatus(address, false);
+                return FOREGROUND_TIMEOUT;
+            }
+        }
+        // If this is a new device or hasn't connected through SDL we want to limit the exposure
+        // of the SDL service in the foreground
+        return FOREGROUND_TIMEOUT / 1000;
+    }
+
+    public void resetForegroundTimeOut(long delay) {
+        synchronized (FOREGROUND_NOTIFICATION_LOCK) {
+            if (foregroundTimeoutHandler == null) {
+                foregroundTimeoutHandler = new Handler();
+            }
+            if (foregroundTimeoutRunnable == null) {
+                foregroundTimeoutRunnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        if (!getConnectedTransports().isEmpty()) {
+                            // Updates notification to one of still connected transport
+                            enterForeground(createConnectedNotificationText(), 0, true);
+                            return;
+                        } else {
+                            exitForeground();//Leave our foreground state as we don't have a connection
+
+                        }
+                    }
+                };
+            } else {
+                //This instance likely means there is a callback in the queue so we should remove it
+                foregroundTimeoutHandler.removeCallbacks(foregroundTimeoutRunnable);
+            }
+            foregroundTimeoutHandler.postDelayed(foregroundTimeoutRunnable, delay);
+        }
+    }
+
+    public void cancelForegroundTimeOut() {
+        synchronized (FOREGROUND_NOTIFICATION_LOCK) {
+            if (foregroundTimeoutHandler != null && foregroundTimeoutRunnable != null) {
+                foregroundTimeoutHandler.removeCallbacks(foregroundTimeoutRunnable);
+            }
+        }
+
+    }
+
+    @SuppressLint("NewApi")
+    private void enterForeground(String content, long chronometerLength, boolean ongoing) {
+        DebugTool.logInfo(TAG, "Attempting to enter the foreground - " + System.currentTimeMillis());
+
+        Bitmap icon;
+        int resourcesIncluded = getResources().getIdentifier("ic_sdl", "drawable", getPackageName());
+
+        if (resourcesIncluded != 0) {  //No additional pylons required
+            icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_sdl);
+        } else {
+            icon = BitmapFactory.decodeResource(getResources(), android.R.drawable.stat_sys_data_bluetooth);
+        }
+        // Bitmap icon = BitmapFactory.decodeByteArray(SdlLogo.SDL_LOGO_STRING, 0, SdlLogo.SDL_LOGO_STRING.length);
 
         Notification.Builder builder;
-		if(android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.O){
-			builder = new Notification.Builder(this);
-		} else {
-			builder = new Notification.Builder(this, SDL_NOTIFICATION_CHANNEL_ID);
-		}
-
-		if(0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)){ //If we are in debug mode, include what app has the router service open
-        	ComponentName name = new ComponentName(this, this.getClass());
-        	builder.setContentTitle("SDL: " + name.getPackageName());
-        }else{
-        	builder.setContentTitle("SmartDeviceLink");
+        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            builder = new Notification.Builder(this);
+        } else {
+            builder = new Notification.Builder(this, SDL_NOTIFICATION_CHANNEL_ID);
+        }
+
+        if (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)) { //If we are in debug mode, include what app has the router service open
+            ComponentName name = new ComponentName(this, this.getClass());
+            builder.setContentTitle("SDL: " + name.getPackageName());
+        } else {
+            builder.setContentTitle("SmartDeviceLink");
         }
         builder.setTicker("SmartDeviceLink");
         builder.setContentText(content);
 
-       //We should use icon from library resources if available
+        //We should use icon from library resources if available
         int trayId = getResources().getIdentifier("sdl_tray_icon", "drawable", getPackageName());
 
-		if ( resourcesIncluded != 0 ) {  //No additional pylons required
-			 builder.setSmallIcon(trayId);
-		}
-		else {  
-			 builder.setSmallIcon(android.R.drawable.stat_sys_data_bluetooth);
-		}
+        if (resourcesIncluded != 0) {  //No additional pylons required
+            builder.setSmallIcon(trayId);
+        } else {
+            builder.setSmallIcon(android.R.drawable.stat_sys_data_bluetooth);
+        }
         builder.setLargeIcon(icon);
         builder.setOngoing(ongoing);
 
-		// Create an intent that will be fired when the user clicks the notification.
-		Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(SDL_NOTIFICATION_FAQS_PAGE));
-		PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
-		builder.setContentIntent(pendingIntent);
+        // Create an intent that will be fired when the user clicks the notification.
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(SDL_NOTIFICATION_FAQS_PAGE));
+        PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
+        builder.setContentIntent(pendingIntent);
+
+        if (chronometerLength > (FOREGROUND_TIMEOUT / 1000) && android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            //The countdown method is only available in SDKs >= 24
+            // Only add countdown if it is over the min timeout
+            builder.setWhen(chronometerLength + System.currentTimeMillis());
+            builder.setUsesChronometer(true);
+            builder.setChronometerCountDown(true);
+        }
+        synchronized (FOREGROUND_NOTIFICATION_LOCK) {
+            Notification notification;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                //Now we need to add a notification channel
+                NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+                if (notificationManager != null) {
+                    NotificationChannel notificationChannel = new NotificationChannel(SDL_NOTIFICATION_CHANNEL_ID, SDL_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW);
+                    notificationChannel.enableLights(false);
+                    notificationChannel.enableVibration(false);
+                    notificationManager.createNotificationChannel(notificationChannel);
+                } else {
+                    DebugTool.logError(TAG, "Unable to retrieve notification Manager service");
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+                        safeStartForeground(FOREGROUND_SERVICE_ID, builder.build());
+                        stopSelf();    //A valid notification channel must be supplied for SDK 27+
+                    }
+                }
+
+            }
+            notification = builder.build();
+            safeStartForeground(FOREGROUND_SERVICE_ID, notification);
+            isForeground = true;
+
+        }
 
-        if(chronometerLength > (FOREGROUND_TIMEOUT/1000) && android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        	//The countdown method is only available in SDKs >= 24
-        	// Only add countdown if it is over the min timeout
-        	builder.setWhen(chronometerLength + System.currentTimeMillis());
-        	builder.setUsesChronometer(true);
-        	builder.setChronometerCountDown(true);
+    }
+
+    /**
+     * This is a simple wrapper around the startForeground method. In the case that the notification
+     * is null, or a notification was unable to be created we will still attempt to call the
+     * startForeground method in hopes that Android will not throw the System Exception.
+     *
+     * @param id           notification channel id
+     * @param notification the notification to display when in the foreground
+     */
+    private void safeStartForeground(int id, Notification notification) {
+        try {
+            if (notification == null) {
+                //Try the NotificationCompat this time in case there was a previous error
+                NotificationCompat.Builder builder =
+                        new NotificationCompat.Builder(this, SDL_NOTIFICATION_CHANNEL_ID)
+                                .setContentTitle("SmartDeviceLink")
+                                .setContentText("Service Running");
+                notification = builder.build();
+            }
+            startForeground(id, notification);
+            DebugTool.logInfo(TAG, "Entered the foreground - " + System.currentTimeMillis());
+        } catch (Exception e) {
+            DebugTool.logError(TAG, "Unable to start service in foreground", e);
         }
+    }
+
+    private void exitForeground() {
         synchronized (FOREGROUND_NOTIFICATION_LOCK) {
-			Notification notification;
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				//Now we need to add a notification channel
-				NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-				if (notificationManager != null) {
-					NotificationChannel notificationChannel = new NotificationChannel(SDL_NOTIFICATION_CHANNEL_ID, SDL_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW);
-					notificationChannel.enableLights(false);
-					notificationChannel.enableVibration(false);
-					notificationManager.createNotificationChannel(notificationChannel);
-				} else {
-					DebugTool.logError(TAG, "Unable to retrieve notification Manager service");
-					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-						safeStartForeground(FOREGROUND_SERVICE_ID, builder.build());
-						stopSelf();	//A valid notification channel must be supplied for SDK 27+
-					}
-				}
-
-			}
-			notification = builder.build();
-			safeStartForeground(FOREGROUND_SERVICE_ID, notification);
-			isForeground = true;
-
-		}
- 
-    }
-
-	/**
-	 * This is a simple wrapper around the startForeground method. In the case that the notification
-	 * is null, or a notification was unable to be created we will still attempt to call the
-	 * startForeground method in hopes that Android will not throw the System Exception.
-	 * @param id notification channel id
-	 * @param notification the notification to display when in the foreground
-	 */
-	private void safeStartForeground(int id, Notification notification){
-		try{
-			if(notification == null){
-				//Try the NotificationCompat this time in case there was a previous error
-				NotificationCompat.Builder builder =
-						new NotificationCompat.Builder(this, SDL_NOTIFICATION_CHANNEL_ID)
-								.setContentTitle("SmartDeviceLink")
-								.setContentText("Service Running");
-				notification = builder.build();
-			}
-			startForeground(id, notification);
-			DebugTool.logInfo(TAG, "Entered the foreground - " + System.currentTimeMillis());
-		}catch (Exception e){
-			DebugTool.logError(TAG, "Unable to start service in foreground", e);
-		}
-	}
-
-	private void exitForeground(){
-		synchronized (FOREGROUND_NOTIFICATION_LOCK) {
-			if (isForeground && !isPrimaryTransportConnected()) {	//Ensure that the service is in the foreground and no longer connected to a transport
-				DebugTool.logInfo(TAG, "SdlRouterService to exit foreground");
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-					this.stopForeground(Service.STOP_FOREGROUND_DETACH);
-				}else{
-					stopForeground(false);
-				}
-				NotificationManager notificationManager = (NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
-				if (notificationManager!= null){
-					try {
-						notificationManager.cancel(FOREGROUND_SERVICE_ID);
-						if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !getBooleanPref(KEY_AVOID_NOTIFICATION_CHANNEL_DELETE,false)) {
-							notificationManager.deleteNotificationChannel(SDL_NOTIFICATION_CHANNEL_ID);
-						}
-					} catch (Exception e) {
-						DebugTool.logError(TAG, "Issue when removing notification and channel", e);
-					}
-				}
-				isForeground = false;
-			}
-		}
-	}
-
-
-	/**
-	 * Creates a notification message to attach to the foreground service notification.
-	 *
-	 * @return string to be used as the message
-	 */
-	private String createConnectedNotificationText(){
-		StringBuilder builder = new StringBuilder();
-		builder.append("Connected to ");
-
-		if(bluetoothTransport!= null && bluetoothTransport.isConnected()){
-			if(bluetoothTransport.getDeviceName() != null){
-				builder.append(bluetoothTransport.getDeviceName());
-				if(0 == (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)) {
-					//If this is production, just the device name is fine
-					return builder.toString();
-				}
-			}else{
-				builder.append(TransportType.BLUETOOTH.name().toLowerCase());
-			}
-		}
-
-		if(usbTransport != null && usbTransport.isConnected()){
-			if(builder.length() > 13){ //13 characters for initial Connected to string
-				builder.append(" & ");
-			}
-			builder.append(TransportType.USB.name());
-		}
-
-		return builder.toString();
-	}
-	
-	
-	/* **************************************************************************************************************************************
-	***********************************************  Helper Methods **************************************************************
-	****************************************************************************************************************************************/
-
-	private ArrayList<TransportRecord> getConnectedTransports(){
-		ArrayList<TransportRecord> connected = new ArrayList<>();
-        if(bluetoothTransport != null && bluetoothTransport.isConnected()){
+            if (isForeground && !isPrimaryTransportConnected()) {    //Ensure that the service is in the foreground and no longer connected to a transport
+                DebugTool.logInfo(TAG, "SdlRouterService to exit foreground");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    this.stopForeground(Service.STOP_FOREGROUND_DETACH);
+                } else {
+                    stopForeground(false);
+                }
+                NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+                if (notificationManager != null) {
+                    try {
+                        notificationManager.cancel(FOREGROUND_SERVICE_ID);
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !getBooleanPref(KEY_AVOID_NOTIFICATION_CHANNEL_DELETE, false)) {
+                            notificationManager.deleteNotificationChannel(SDL_NOTIFICATION_CHANNEL_ID);
+                        }
+                    } catch (Exception e) {
+                        DebugTool.logError(TAG, "Issue when removing notification and channel", e);
+                    }
+                }
+                isForeground = false;
+            }
+        }
+    }
+
+
+    /**
+     * Creates a notification message to attach to the foreground service notification.
+     *
+     * @return string to be used as the message
+     */
+    private String createConnectedNotificationText() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("Connected to ");
+
+        if (bluetoothTransport != null && bluetoothTransport.isConnected()) {
+            if (bluetoothTransport.getDeviceName() != null) {
+                builder.append(bluetoothTransport.getDeviceName());
+                if (0 == (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)) {
+                    //If this is production, just the device name is fine
+                    return builder.toString();
+                }
+            } else {
+                builder.append(TransportType.BLUETOOTH.name().toLowerCase());
+            }
+        }
+
+        if (usbTransport != null && usbTransport.isConnected()) {
+            if (builder.length() > 13) { //13 characters for initial Connected to string
+                builder.append(" & ");
+            }
+            builder.append(TransportType.USB.name());
+        }
+
+        return builder.toString();
+    }
+
+
+    /* **************************************************************************************************************************************
+     ***********************************************  Helper Methods **************************************************************
+     ****************************************************************************************************************************************/
+
+    private ArrayList<TransportRecord> getConnectedTransports() {
+        ArrayList<TransportRecord> connected = new ArrayList<>();
+        if (bluetoothTransport != null && bluetoothTransport.isConnected()) {
             connected.add(bluetoothTransport.getTransportRecord());
         }
 
-        if(tcpTransport != null && tcpTransport.isConnected()){
+        if (tcpTransport != null && tcpTransport.isConnected()) {
             connected.add(tcpTransport.getTransportRecord());
         }
 
-        if(usbTransport != null && usbTransport.isConnected()){
+        if (usbTransport != null && usbTransport.isConnected()) {
             connected.add(usbTransport.getTransportRecord());
         }
 
-		return connected;
-	}
-
-	private boolean isPrimaryTransportConnected(){
-		return isTransportConnected(TransportType.BLUETOOTH) || isTransportConnected(TransportType.USB);
-	}
-
-	private boolean isTransportConnected(TransportType transportType){
-		if(bluetoothTransport != null && transportType.equals(TransportType.BLUETOOTH)){
-			return bluetoothTransport.isConnected();
-		}else if(tcpTransport != null && transportType.equals(TransportType.TCP)){
-			return tcpTransport.isConnected();
-		}else if(usbTransport != null && transportType.equals(TransportType.USB)){
-			return usbTransport.isConnected();
-		}
-		return false;
-	}
-
-	/**
-	 * Checks to make sure bluetooth adapter is available and on
-	 * @return if the bluetooth adapter is available and is enabled
-	 */
-	@SuppressWarnings("MissingPermission")
-	private boolean bluetoothAvailable(){
-		try {
-			return (!(BluetoothAdapter.getDefaultAdapter() == null) && BluetoothAdapter.getDefaultAdapter().isEnabled());
-		}catch(NullPointerException e){ // only for BluetoothAdapter.getDefaultAdapter().isEnabled() call
-			return false;
-		}
-	}
-
-	/**
-	 * 
-	 * 1. If the app has SDL shut off, 												shut down
-	 * 2. if The app has an Alt Transport address or was started by one, 			stay open
-	 * 3. If Bluetooth is off/NA	 												shut down
-	 * 4. Anything else					
-	 */
-	public boolean shouldServiceRemainOpen(Intent intent){
-		ArrayList<TransportRecord> connectedTransports = getConnectedTransports();
-
-		if(connectedTransports != null && !connectedTransports.isEmpty()){ // stay open if we have any transports connected
-			DebugTool.logInfo(TAG, "1 or more transports connected, remaining open");
-			return true;
-		}else if(altTransportService!=null || altTransportTimerHandler !=null){
-			//We have been started by an alt transport, we must remain open. "My life for Auir...."
-			DebugTool.logInfo(TAG, "Alt Transport connected, remaining open");
-			return true;
-			
-		}else if(intent!=null && TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT.equals(intent.getAction())){
-			DebugTool.logInfo(TAG, "Received start intent with alt transport request.");
-			startAltTransportTimer();
-			return true;
-		}else if(!bluetoothAvailable()){//If bluetooth isn't on...there's nothing to see here
-			//Bluetooth is off, we should shut down
-			DebugTool.logInfo(TAG, "Bluetooth not available, shutting down service");
-
-			return connectedTransports != null && connectedTransports.size() > 0; //If a transport is connected the list will be >0
-		}else{
-			DebugTool.logInfo(TAG, "Service to remain open");
-			return true;
-		}
-	}
-	/**
-	 * This method is needed so that apps that choose not to implement this as a service as defined by Android, but rather
-	 * just a simple class we have to know how to shut down.
-	 */
-	public void closeSelf(){
-		closing = true;
-		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !hasCalledStartForeground ){
-			//This must be called before stopping self
-			safeStartForeground(FOREGROUND_SERVICE_ID, null);
-			exitForeground();
-		}
-
-		if(getBaseContext()!= null){
-			stopSelf();
-		}
-
-		//For good measure.
-		onDestroy();
-
-	}
-	private synchronized void initBluetoothSerialService(){
-		if(legacyModeEnabled){
-			DebugTool.logInfo(TAG, "Not starting own bluetooth during legacy mode");
-			return;
-		}
-		//init serial service
-		if(bluetoothTransport == null || bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_ERROR){
-			bluetoothTransport = new MultiplexBluetoothTransport(bluetoothHandler);
-		}
-		if (bluetoothTransport != null) {
+        return connected;
+    }
+
+    private boolean isPrimaryTransportConnected() {
+        return isTransportConnected(TransportType.BLUETOOTH) || isTransportConnected(TransportType.USB);
+    }
+
+    private boolean isTransportConnected(TransportType transportType) {
+        if (bluetoothTransport != null && transportType.equals(TransportType.BLUETOOTH)) {
+            return bluetoothTransport.isConnected();
+        } else if (tcpTransport != null && transportType.equals(TransportType.TCP)) {
+            return tcpTransport.isConnected();
+        } else if (usbTransport != null && transportType.equals(TransportType.USB)) {
+            return usbTransport.isConnected();
+        }
+        return false;
+    }
+
+    /**
+     * Checks to make sure bluetooth adapter is available and on
+     *
+     * @return if the bluetooth adapter is available and is enabled
+     */
+    @SuppressWarnings("MissingPermission")
+    private boolean bluetoothAvailable() {
+        try {
+            return (!(BluetoothAdapter.getDefaultAdapter() == null) && BluetoothAdapter.getDefaultAdapter().isEnabled());
+        } catch (NullPointerException e) { // only for BluetoothAdapter.getDefaultAdapter().isEnabled() call
+            return false;
+        }
+    }
+
+    /**
+     * 1. If the app has SDL shut off, 												shut down
+     * 2. if The app has an Alt Transport address or was started by one, 			stay open
+     * 3. If Bluetooth is off/NA	 												shut down
+     * 4. Anything else
+     */
+    public boolean shouldServiceRemainOpen(Intent intent) {
+        ArrayList<TransportRecord> connectedTransports = getConnectedTransports();
+
+        if (connectedTransports != null && !connectedTransports.isEmpty()) { // stay open if we have any transports connected
+            DebugTool.logInfo(TAG, "1 or more transports connected, remaining open");
+            return true;
+        } else if (altTransportService != null || altTransportTimerHandler != null) {
+            //We have been started by an alt transport, we must remain open. "My life for Auir...."
+            DebugTool.logInfo(TAG, "Alt Transport connected, remaining open");
+            return true;
+
+        } else if (intent != null && TransportConstants.BIND_REQUEST_TYPE_ALT_TRANSPORT.equals(intent.getAction())) {
+            DebugTool.logInfo(TAG, "Received start intent with alt transport request.");
+            startAltTransportTimer();
+            return true;
+        } else if (!bluetoothAvailable()) {//If bluetooth isn't on...there's nothing to see here
+            //Bluetooth is off, we should shut down
+            DebugTool.logInfo(TAG, "Bluetooth not available, shutting down service");
+
+            return connectedTransports != null && connectedTransports.size() > 0; //If a transport is connected the list will be >0
+        } else {
+            DebugTool.logInfo(TAG, "Service to remain open");
+            return true;
+        }
+    }
+
+    /**
+     * This method is needed so that apps that choose not to implement this as a service as defined by Android, but rather
+     * just a simple class we have to know how to shut down.
+     */
+    public void closeSelf() {
+        closing = true;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !hasCalledStartForeground) {
+            //This must be called before stopping self
+            safeStartForeground(FOREGROUND_SERVICE_ID, null);
+            exitForeground();
+        }
+
+        if (getBaseContext() != null) {
+            stopSelf();
+        }
+
+        //For good measure.
+        onDestroy();
+
+    }
+
+    private synchronized void initBluetoothSerialService() {
+        if (legacyModeEnabled) {
+            DebugTool.logInfo(TAG, "Not starting own bluetooth during legacy mode");
+            return;
+        }
+        //init serial service
+        if (bluetoothTransport == null || bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_ERROR) {
+            bluetoothTransport = new MultiplexBluetoothTransport(bluetoothHandler);
+        }
+        if (bluetoothTransport != null) {
             // Only if the state is STATE_NONE, do we know that we haven't started already
             if (bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_NONE) {
-              // Start the Bluetooth services
-				DebugTool.logInfo(TAG, "Starting bluetooth transport");
-            	bluetoothTransport.start();
-            }
-
-		}
-	}
-
-	public void onTransportConnected(final TransportRecord record){
-		cancelForegroundTimeOut();
-		enterForeground(createConnectedNotificationText(),0,true);
-
-		if(packetWriteTaskMasterMap == null){
-			packetWriteTaskMasterMap = new ConcurrentHashMap<>();
-		}
-
-		TransportType type = record.getType();
-		PacketWriteTaskMaster packetWriteTaskMaster = packetWriteTaskMasterMap.get(type);
-
-		if(packetWriteTaskMaster!=null){
-			packetWriteTaskMaster.close();
-			packetWriteTaskMaster.alert();
-		}
-		packetWriteTaskMaster = new PacketWriteTaskMaster();
-		packetWriteTaskMaster.setTransportType(type);
-		packetWriteTaskMaster.start();
-		packetWriteTaskMasterMap.put(type,packetWriteTaskMaster);
-
-		Intent startService = new Intent();  
-		startService.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION);
-
-		startService.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_EXTRA, true);
-		startService.putExtra(TransportConstants.FORCE_TRANSPORT_CONNECTED, true);
-		startService.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_APP_PACKAGE, getBaseContext().getPackageName());
-		startService.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_CMP_NAME, new ComponentName(this, this.getClass()));
-
-		if(record!= null && record.getType() != null){
-			startService.putExtra(TransportConstants.START_ROUTER_SERVICE_TRANSPORT_CONNECTED, record.getType().toString());
-		}
-
-		startService.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-
-		AndroidTools.sendExplicitBroadcast(getApplicationContext(),startService, null);
-
-		//HARDWARE_CONNECTED
-    	if(!(registeredApps== null || registeredApps.isEmpty())){
-    		//If we have clients
-			notifyClients(createHardwareConnectedMessage(record));
-    	}
-	}
-	
-	private Message createHardwareConnectedMessage(final TransportRecord record){
-			Message message = Message.obtain();
-			message.what = TransportConstants.HARDWARE_CONNECTION_EVENT;
-			message.arg1 = TransportConstants.HARDWARE_CONNECTION_EVENT_CONNECTED;
-			Bundle bundle = new Bundle();
-			bundle.putString(TransportConstants.HARDWARE_CONNECTED, record.getType().name());
-			bundle.putParcelableArrayList(TransportConstants.CURRENT_HARDWARE_CONNECTED, getConnectedTransports());
-
-			if(bluetoothTransport != null){
-    			bundle.putString(CONNECTED_DEVICE_STRING_EXTRA_NAME, bluetoothTransport.getDeviceName());
-    		}
-
-			message.setData(bundle);
-			return message;
-		
-	}
-
-	public void onTransportDisconnected(TransportRecord record){
-		cachedModuleVersion = -1; //Reset our cached version
-		//Stop any current pings being sent before the proper state can be determined.
-		stopClientPings();
-
-		if(registeredApps != null && !registeredApps.isEmpty()){
-			Message message = Message.obtain();
-			message.what = TransportConstants.HARDWARE_CONNECTION_EVENT;
-			message.arg1 = TransportConstants.HARDWARE_CONNECTION_EVENT_DISCONNECTED;
-
-			Bundle bundle = new Bundle();
+                // Start the Bluetooth services
+                DebugTool.logInfo(TAG, "Starting bluetooth transport");
+                bluetoothTransport.start();
+            }
+
+        }
+    }
+
+    public void onTransportConnected(final TransportRecord record) {
+        cancelForegroundTimeOut();
+        enterForeground(createConnectedNotificationText(), 0, true);
+
+        if (packetWriteTaskMasterMap == null) {
+            packetWriteTaskMasterMap = new ConcurrentHashMap<>();
+        }
+
+        TransportType type = record.getType();
+        PacketWriteTaskMaster packetWriteTaskMaster = packetWriteTaskMasterMap.get(type);
+
+        if (packetWriteTaskMaster != null) {
+            packetWriteTaskMaster.close();
+            packetWriteTaskMaster.alert();
+        }
+        packetWriteTaskMaster = new PacketWriteTaskMaster();
+        packetWriteTaskMaster.setTransportType(type);
+        packetWriteTaskMaster.start();
+        packetWriteTaskMasterMap.put(type, packetWriteTaskMaster);
+
+        Intent startService = new Intent();
+        startService.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION);
+
+        startService.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_EXTRA, true);
+        startService.putExtra(TransportConstants.FORCE_TRANSPORT_CONNECTED, true);
+        startService.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_APP_PACKAGE, getBaseContext().getPackageName());
+        startService.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_CMP_NAME, new ComponentName(this, this.getClass()));
+
+        if (record != null && record.getType() != null) {
+            startService.putExtra(TransportConstants.START_ROUTER_SERVICE_TRANSPORT_CONNECTED, record.getType().toString());
+        }
+
+        startService.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+
+        AndroidTools.sendExplicitBroadcast(getApplicationContext(), startService, null);
+
+        //HARDWARE_CONNECTED
+        if (!(registeredApps == null || registeredApps.isEmpty())) {
+            //If we have clients
+            notifyClients(createHardwareConnectedMessage(record));
+        }
+    }
+
+    private Message createHardwareConnectedMessage(final TransportRecord record) {
+        Message message = Message.obtain();
+        message.what = TransportConstants.HARDWARE_CONNECTION_EVENT;
+        message.arg1 = TransportConstants.HARDWARE_CONNECTION_EVENT_CONNECTED;
+        Bundle bundle = new Bundle();
+        bundle.putString(TransportConstants.HARDWARE_CONNECTED, record.getType().name());
+        bundle.putParcelableArrayList(TransportConstants.CURRENT_HARDWARE_CONNECTED, getConnectedTransports());
+
+        if (bluetoothTransport != null) {
+            bundle.putString(CONNECTED_DEVICE_STRING_EXTRA_NAME, bluetoothTransport.getDeviceName());
+        }
+
+        message.setData(bundle);
+        return message;
+
+    }
+
+    public void onTransportDisconnected(TransportRecord record) {
+        cachedModuleVersion = -1; //Reset our cached version
+        //Stop any current pings being sent before the proper state can be determined.
+        stopClientPings();
+
+        if (registeredApps != null && !registeredApps.isEmpty()) {
+            Message message = Message.obtain();
+            message.what = TransportConstants.HARDWARE_CONNECTION_EVENT;
+            message.arg1 = TransportConstants.HARDWARE_CONNECTION_EVENT_DISCONNECTED;
+
+            Bundle bundle = new Bundle();
             bundle.putParcelable(TRANSPORT_DISCONNECTED, record);
             //For legacy
             bundle.putString(HARDWARE_DISCONNECTED, record.getType().name());
-			bundle.putBoolean(TransportConstants.ENABLE_LEGACY_MODE_EXTRA, legacyModeEnabled);
-
-			//Still connected transports
-			bundle.putParcelableArrayList(TransportConstants.CURRENT_HARDWARE_CONNECTED,getConnectedTransports());
-
-			message.setData(bundle);
-			notifyClients(message);
-
-			synchronized (REGISTERED_APPS_LOCK) {
-				Collection<RegisteredApp> apps = registeredApps.values();
-				for (RegisteredApp app : apps) {
-					app.unregisterTransport(-1,record.getType());
-
-				}
-			}
-		}
-		//Remove and close the packet task master assigned to this transport
-		if(packetWriteTaskMasterMap != null
-				&& record != null
-				&& packetWriteTaskMasterMap.containsKey(record.getType())){
-			PacketWriteTaskMaster master = packetWriteTaskMasterMap.remove(record.getType());
-			if(master != null){
-				master.close();
-				master.alert();
-			}
-		}
-		if(record != null) {
-			//Ensure the associated transport is dealt with
-			switch (record.getType()) {
-				case BLUETOOTH:
-					synchronized (SESSION_LOCK) {
-						if (bluetoothSessionMap != null) {
-							bluetoothSessionMap.clear();
-						}
-					}
-					if (!connectAsClient) {
-						if (!legacyModeEnabled && !closing) {
-							initBluetoothSerialService();
-						}
-					}
-					break;
-				case USB:
-					if (usbTransport != null) {
-						usbTransport = null;
-					}
-					synchronized (SESSION_LOCK) {
-						if (usbSessionMap != null) {
-							usbSessionMap.clear();
-						}
-					}
-					break;
-				case TCP:
-					if (tcpTransport != null) {
-						tcpTransport = null;
-					}
-					synchronized (SESSION_LOCK) {
-						if (tcpSessionMap != null) {
-							tcpSessionMap.clear();
-						}
-					}
-					break;
-			}
-		}
-
-		if(!getConnectedTransports().isEmpty()){
-			// Updates notification to one of still connected transport
-			enterForeground(createConnectedNotificationText(),0,true);
-			return;
-		}else{
-			exitForeground();//Leave our foreground state as we don't have a connection anymore
-			if(!shouldServiceRemainOpen(null)){
-				closeSelf();
-			}
-		}
-
-		if(altTransportService!=null){  //If we still have an alt transport open, then we don't need to tell the clients to close
-			return;
-		}
-
-		DebugTool.logError(TAG, "Notifying client service of hardware disconnect.");
-
-
-		//We've notified our clients, less clean up the mess now.
-		synchronized(SESSION_LOCK){
-			this.sessionHashIdMap.clear();
-		}
-		synchronized(REGISTERED_APPS_LOCK){
-			if(registeredApps==null){
-				return;
-			}
-			registeredApps.clear();
-		}
-	}
-
-	public void onTransportError(TransportRecord transport, Bundle errorBundle){
-        switch (transport.getType()){
+            bundle.putBoolean(TransportConstants.ENABLE_LEGACY_MODE_EXTRA, legacyModeEnabled);
+
+            //Still connected transports
+            bundle.putParcelableArrayList(TransportConstants.CURRENT_HARDWARE_CONNECTED, getConnectedTransports());
+
+            message.setData(bundle);
+            notifyClients(message);
+
+            synchronized (REGISTERED_APPS_LOCK) {
+                Collection<RegisteredApp> apps = registeredApps.values();
+                for (RegisteredApp app : apps) {
+                    app.unregisterTransport(-1, record.getType());
+
+                }
+            }
+        }
+        //Remove and close the packet task master assigned to this transport
+        if (packetWriteTaskMasterMap != null
+                && record != null
+                && packetWriteTaskMasterMap.containsKey(record.getType())) {
+            PacketWriteTaskMaster master = packetWriteTaskMasterMap.remove(record.getType());
+            if (master != null) {
+                master.close();
+                master.alert();
+            }
+        }
+        if (record != null) {
+            //Ensure the associated transport is dealt with
+            switch (record.getType()) {
+                case BLUETOOTH:
+                    synchronized (SESSION_LOCK) {
+                        if (bluetoothSessionMap != null) {
+                            bluetoothSessionMap.clear();
+                        }
+                    }
+                    if (!connectAsClient) {
+                        if (!legacyModeEnabled && !closing) {
+                            initBluetoothSerialService();
+                        }
+                    }
+                    break;
+                case USB:
+                    if (usbTransport != null) {
+                        usbTransport = null;
+                    }
+                    synchronized (SESSION_LOCK) {
+                        if (usbSessionMap != null) {
+                            usbSessionMap.clear();
+                        }
+                    }
+                    break;
+                case TCP:
+                    if (tcpTransport != null) {
+                        tcpTransport = null;
+                    }
+                    synchronized (SESSION_LOCK) {
+                        if (tcpSessionMap != null) {
+                            tcpSessionMap.clear();
+                        }
+                    }
+                    break;
+            }
+        }
+
+        if (!getConnectedTransports().isEmpty()) {
+            // Updates notification to one of still connected transport
+            enterForeground(createConnectedNotificationText(), 0, true);
+            return;
+        } else {
+            exitForeground();//Leave our foreground state as we don't have a connection anymore
+            if (!shouldServiceRemainOpen(null)) {
+                closeSelf();
+            }
+        }
+
+        if (altTransportService != null) {  //If we still have an alt transport open, then we don't need to tell the clients to close
+            return;
+        }
+
+        DebugTool.logError(TAG, "Notifying client service of hardware disconnect.");
+
+
+        //We've notified our clients, less clean up the mess now.
+        synchronized (SESSION_LOCK) {
+            this.sessionHashIdMap.clear();
+        }
+        synchronized (REGISTERED_APPS_LOCK) {
+            if (registeredApps == null) {
+                return;
+            }
+            registeredApps.clear();
+        }
+    }
+
+    public void onTransportError(TransportRecord transport, Bundle errorBundle) {
+        switch (transport.getType()) {
             case BLUETOOTH:
-                if(bluetoothTransport !=null){
+                if (bluetoothTransport != null) {
                     bluetoothTransport.setStateManually(MultiplexBluetoothTransport.STATE_NONE);
                     bluetoothTransport = null;
                 }
-	            if (errorBundle != null && errorBundle.getByte(MultiplexBaseTransport.ERROR_REASON_KEY) == MultiplexBaseTransport.REASON_SPP_ERROR) {
-		            notifySppError();
-	            }
+                if (errorBundle != null && errorBundle.getByte(MultiplexBaseTransport.ERROR_REASON_KEY) == MultiplexBaseTransport.REASON_SPP_ERROR) {
+                    notifySppError();
+                }
                 break;
             case USB:
                 break;
@@ -1908,1831 +1916,1872 @@ public class SdlRouterService extends Service{
 
     }
 
-	public void onPacketRead(SdlPacket packet){
+    public void onPacketRead(SdlPacket packet) {
         try {
-    		//Log.i(TAG, "******** Read packet with header: " +(packet).toString());
-    		if(packet.getVersion() == 1){
-    				if( packet.getFrameType() == FrameType.Control && packet.getFrameInfo() == SdlPacket.FRAME_INFO_START_SERVICE_ACK){
-    					//We received a v1 packet from the head unit, this means we can't use the router service.
-    					//Enable legacy mode
-    					enableLegacyMode(true);
-    				return;
-    				}
-    		}else if(cachedModuleVersion == -1){
-    			cachedModuleVersion = packet.getVersion();
-    		}
-        	//Send the received packet to the registered app
-        	sendPacketToRegisteredApp(packet);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Handler for all Multiplex Based transports.
-	 * It will ensure messages are properly queued back to the router service.
-	 */
-	private static class TransportHandler extends Handler{
-
-		 final WeakReference<SdlRouterService> provider;
-
-		 public TransportHandler(SdlRouterService provider){
-			 this.provider = new WeakReference<SdlRouterService>(provider);
-		 }
-	        @Override
-	        public void handleMessage(Message msg) {
-				if(this.provider.get() == null){
-					return;
-				}
-				SdlRouterService service = this.provider.get();
-	            switch (msg.what) {
-	            	case MESSAGE_DEVICE_NAME:
-						Bundle bundle = msg.getData();
-						if(bundle !=null) {
-							service.setSDLConnectedStatus(bundle.getString(MultiplexBaseTransport.DEVICE_ADDRESS),true);
-						}
-	            		break;
-	            	case MESSAGE_STATE_CHANGE:
-	            	    TransportRecord transportRecord = (TransportRecord) msg.obj;
-	            		switch (msg.arg1) {
-	            		case MultiplexBaseTransport.STATE_CONNECTED:
-							service.onTransportConnected(transportRecord);
-	            			break;
-	            		case MultiplexBaseTransport.STATE_CONNECTING:
-	            			// Currently attempting to connect - update UI?
-	            			break;
-	            		case MultiplexBaseTransport.STATE_LISTEN:
-	            			break;
-	            		case MultiplexBaseTransport.STATE_NONE:
-	            			// We've just lost the connection
+            //Log.i(TAG, "******** Read packet with header: " +(packet).toString());
+            if (packet.getVersion() == 1) {
+                if (packet.getFrameType() == FrameType.Control && packet.getFrameInfo() == SdlPacket.FRAME_INFO_START_SERVICE_ACK) {
+                    //We received a v1 packet from the head unit, this means we can't use the router service.
+                    //Enable legacy mode
+                    enableLegacyMode(true);
+                    return;
+                }
+            } else if (cachedModuleVersion == -1) {
+                cachedModuleVersion = packet.getVersion();
+            }
+            //Send the received packet to the registered app
+            sendPacketToRegisteredApp(packet);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Handler for all Multiplex Based transports.
+     * It will ensure messages are properly queued back to the router service.
+     */
+    private static class TransportHandler extends Handler {
+
+        final WeakReference<SdlRouterService> provider;
+
+        public TransportHandler(SdlRouterService provider) {
+            this.provider = new WeakReference<SdlRouterService>(provider);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            if (this.provider.get() == null) {
+                return;
+            }
+            SdlRouterService service = this.provider.get();
+            switch (msg.what) {
+                case MESSAGE_DEVICE_NAME:
+                    Bundle bundle = msg.getData();
+                    if (bundle != null) {
+                        service.setSDLConnectedStatus(bundle.getString(MultiplexBaseTransport.DEVICE_ADDRESS), true);
+                    }
+                    break;
+                case MESSAGE_STATE_CHANGE:
+                    TransportRecord transportRecord = (TransportRecord) msg.obj;
+                    switch (msg.arg1) {
+                        case MultiplexBaseTransport.STATE_CONNECTED:
+                            service.onTransportConnected(transportRecord);
+                            break;
+                        case MultiplexBaseTransport.STATE_CONNECTING:
+                            // Currently attempting to connect - update UI?
+                            break;
+                        case MultiplexBaseTransport.STATE_LISTEN:
+                            break;
+                        case MultiplexBaseTransport.STATE_NONE:
+                            // We've just lost the connection
                             service.onTransportDisconnected(transportRecord);
-	            			break;
-				        case MultiplexBaseTransport.STATE_ERROR:
-					        service.onTransportError(transportRecord, msg.getData());
-					        break;
-	            		}
-	                break;
-
-	            	case MESSAGE_READ:
-						service.onPacketRead((SdlPacket) msg.obj);
-	        			break;
-	            }
-	        }
-	    }
-
-		//The return false after the packet null check is not dead code. Read the getByteArray method from bundle
-		public boolean writeBytesToTransport(Bundle bundle){
-			if(bundle == null){
-				return false;
-			}
-			byte[] packet = bundle.getByteArray(TransportConstants.BYTES_TO_SEND_EXTRA_NAME);
-			if(packet==null) {
-				DebugTool.logWarning(TAG, "Ignoring null packet");
-				return false;
-			}
-			int offset = bundle.getInt(TransportConstants.BYTES_TO_SEND_EXTRA_OFFSET, 0); //If nothing, start at the beginning of the array
-			int count = bundle.getInt(TransportConstants.BYTES_TO_SEND_EXTRA_COUNT, packet.length);  //In case there isn't anything just send the whole packet.
-			TransportType transportType = TransportType.valueForString(bundle.getString(TransportConstants.TRANSPORT_TYPE));
-			if(transportType != null) {
-				switch ((transportType)) {
-					case BLUETOOTH:
-						if (bluetoothTransport != null && bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_CONNECTED) {
-							bluetoothTransport.write(packet, offset, count);
-							return true;
-						}
-					case USB:
-						if (usbTransport != null && usbTransport.getState() == MultiplexBaseTransport.STATE_CONNECTED) {
-							usbTransport.write(packet, offset, count);
-							return true;
-						}
-					case TCP:
-						if (tcpTransport != null && tcpTransport.getState() == MultiplexBaseTransport.STATE_CONNECTED) {
-							tcpTransport.write(packet, offset, count);
-							return true;
-						}
-					default:
-						if (sendThroughAltTransport(bundle)) {
-							return true;
-						}
-				}
-			}
-			DebugTool.logError(TAG, "Can't send data, no transport  of specified type connected");
-			return false;
-		}
-		
-		private boolean manuallyWriteBytes(TransportType transportType, byte[] packet, int offset, int count){
-			switch ((transportType)){
-				case BLUETOOTH:
-					if(bluetoothTransport !=null && bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_CONNECTED) {
-						bluetoothTransport.write(packet, offset, count);
-						return true;
-					}
-				case USB:
-					if(usbTransport != null && usbTransport.getState() ==  MultiplexBaseTransport.STATE_CONNECTED) {
-						usbTransport.write(packet, offset, count);
-						return true;
-					}
-				case TCP:
-					if(tcpTransport != null && tcpTransport.getState() ==  MultiplexBaseTransport.STATE_CONNECTED) {
-						tcpTransport.write(packet, offset, count);
-						return true;
-					}
-				default:
-					return sendThroughAltTransport(packet, offset, count);
-			}
-		}
-		
-		
-		/**
-		 * This Method will send the packets through the alt transport that is connected
-		 * @param bundle This bundle will have its what changed and sent off to the alt transport
-		 * @return If it was possible to send the packet off.
-		 * <p><b>NOTE: This is not guaranteed. It is a best attempt at sending the packet, it may fail.</b>
-		 */
-		private boolean sendThroughAltTransport(Bundle bundle){
-			if(altTransportService!=null){
-				Message msg = Message.obtain();
-				msg.what = TransportConstants.ROUTER_SEND_PACKET;
-				msg.setData(bundle);
-				try {
-					altTransportService.send(msg);
-				} catch (RemoteException e) {
-					DebugTool.logError(TAG, "Unable to send through alt transport!");
-					e.printStackTrace();
-				}
-				return true;
-			}else{
-				DebugTool.logWarning(TAG, "Unable to send packet through alt transport, it was null");
-			}
-			return false;		
-		}
-		
-		 /** This Method will send the packets through the alt transport that is connected
-		 * @param bytes The byte array of data to be wrote out
-		 * @return If it was possible to send the packet off.
-		 * <p><b>NOTE: This is not guaranteed. It is a best attempt at sending the packet, it may fail.</b>
-		 */
-		private boolean sendThroughAltTransport(byte[] bytes, int offset, int count){
-			if(altTransportService!=null){
-				Message msg = Message.obtain();
-				msg.what = TransportConstants.ROUTER_SEND_PACKET;
-				Bundle bundle = new Bundle();
-				bundle.putByteArray(TransportConstants.BYTES_TO_SEND_EXTRA_NAME,bytes); 
-				bundle.putInt(TransportConstants.BYTES_TO_SEND_EXTRA_OFFSET, offset); 
-				bundle.putInt(TransportConstants.BYTES_TO_SEND_EXTRA_COUNT, count);  
-				msg.setData(bundle);
-				try {
-					altTransportService.send(msg);
-				} catch (RemoteException e) {
-					DebugTool.logError(TAG, "Unable to send through alt transport!");
-					e.printStackTrace();
-				}
-				return true;
-			}else{
-				DebugTool.logWarning(TAG, "Unable to send packet through alt transport, it was null");
-			}
-			return false;		
-		}
-		/**
-		 * This will send the received packet to the registered service. It will default to the single registered "foreground" app.
-		 * This can be overridden to provide more specific functionality. 
-		 * @param packet the packet that is received
-		 * @return whether or not the sending was successful 
-		 */
-		public boolean sendPacketToRegisteredApp(SdlPacket packet) {
-			if(registeredApps != null && registeredApps.size() > 0 ){
-				final int session = packet.getSessionId();
-				boolean isNewSessionRequest = false, isNewTransportRequest = false;
-
-				final int frameInfo = packet.getFrameInfo();
-				if(packet.getFrameType() == FrameType.Control){
-					isNewSessionRequest = (frameInfo == SdlPacket.FRAME_INFO_START_SERVICE_ACK ||frameInfo == SdlPacket.FRAME_INFO_START_SERVICE_NAK)
-							&& packet.getServiceType() == SdlPacket.SERVICE_TYPE_RPC;
-					isNewTransportRequest = (frameInfo == SdlPacket.FRAME_INFO_REGISTER_SECONDARY_TRANSPORT_ACK
-							|| frameInfo == SdlPacket.FRAME_INFO_REGISTER_SECONDARY_TRANSPORT_NAK); // && packet.getServiceType() != SdlPacket.SERVICE_TYPE_RPC;
-				}
-
-				//Find where this packet should go
-	    		String appid = getAppIDForSession(session, isNewSessionRequest, isNewTransportRequest, packet.getTransportRecord().getType());
-
-				if(appid != null && appid.length() > 0){
-
-	    			RegisteredApp app;
-	    			synchronized(REGISTERED_APPS_LOCK){
-	    				 app = registeredApps.get(appid);
-	    			}
-
-	    			if(app == null){
-						DebugTool.logError(TAG, "No app found for app id " + appid + " Removing session mapping and sending unregisterAI to head unit.");
-
-	    				//We have no app to match the app id tied to this session
-	    				removeSessionFromMap(session, Collections.singletonList(packet.getTransportRecord().getType()));
-
-						final int serviceType = packet.getServiceType();
-	    				if(serviceType == SdlPacket.SERVICE_TYPE_RPC || serviceType == SdlPacket.SERVICE_TYPE_BULK_DATA) {
-	    					//This is a primary transport packet as it is an RPC packet
-							//Create an unregister app interface to remove the app as it doesn't appear to exist anymore
-							byte[] uai = createForceUnregisterApp((byte) session, (byte) packet.getVersion());
-							manuallyWriteBytes(packet.getTransportRecord().getType(),uai, 0, uai.length);
-
-							int hashId = 0;
-							synchronized(this.SESSION_LOCK){
-								if(this.sessionHashIdMap.indexOfKey(session)>=0){
-									hashId = this.sessionHashIdMap.get(session);
-									this.sessionHashIdMap.delete(session);
-								}
-							}
-
-							//TODO stop other services on that transport for the session with no app
-							byte[] stopService = SdlPacketFactory.createEndSession(SessionType.RPC, (byte)session, 0, (byte)packet.getVersion(), hashId).constructPacket();
-							manuallyWriteBytes(packet.getTransportRecord().getType(), stopService,0,stopService.length);
-						}else{
-							DebugTool.logWarning(TAG, "No where to send a packet from what appears to be a non primary transport");
-						}
-
-						return false;
-	    			}
-
-	    			//There is an app id and can continue to normal flow
-	    			byte version = (byte)packet.getVersion();
-	    			
-	    			if(isNewSessionRequest && version > 1 && packet.getFrameInfo() == SdlPacket.FRAME_INFO_START_SERVICE_ACK){ //we know this was a start session response
-						if (version >= 5) {
-							Integer hashId = (Integer) packet.getTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID);
-							if (hashId != null) {
-								synchronized(SESSION_LOCK) {
-									this.sessionHashIdMap.put(session, hashId);
-								}
-							} else {
-								DebugTool.logWarning(TAG, "Hash ID not found in V5 start service ACK frame for session " + session);
-							}
-						} else {
-	    					if (packet.getPayload() != null && packet.getDataSize() == 4){ //hashid will be 4 bytes in length
-	    						synchronized(SESSION_LOCK){
-	    							this.sessionHashIdMap.put(session, (BitConverter.intFromByteArray(packet.getPayload(), 0)));
-								}
-	    					}
-	    				}
-	    			}
-
-				// check and prevent a UAI from being passed to an app that is using a recycled session id
-				if (cleanedSessionMap != null && cleanedSessionMap.size() > 0 ) {
-					if(packet.getFrameType() == FrameType.Single && packet.getServiceType() == SdlPacket.SERVICE_TYPE_RPC) {
-						BinaryFrameHeader binFrameHeader = BinaryFrameHeader.parseBinaryHeader(packet.getPayload());
-						if (binFrameHeader != null && FunctionID.UNREGISTER_APP_INTERFACE.getId() == binFrameHeader.getFunctionID()) {
-							DebugTool.logInfo(TAG, "Received an unregister app interface. Checking session hash before sending");
-							// make sure that we don't try to unregister a recently added app that might have a
-							// session ID of a removed app whose UAI was delayed
-							int hashOfRemoved = this.cleanedSessionMap.get(session, -1);
-							int currentHash = this.sessionHashIdMap.get(session, -1);
-							if (hashOfRemoved != -1) {
-								// Current session contains key that was held before
-								if (hashOfRemoved != currentHash) {
-									// App assigned same session id but is a different app. Keep this from being killed
-									DebugTool.logInfo(TAG, "same session id for different apps found, dropping packet");
-									this.cleanedSessionMap.delete(session);
-									return false;
-								}
-							}
-						}
-					}
-				}
-
-	    			int packetSize = (int) (packet.getDataSize() + SdlPacket.HEADER_SIZE);
-	    			//Log.i(TAG, "Checking packet size: " + packetSize);
-	    			Message message = Message.obtain();
-	    			Bundle bundle = new Bundle();
-	    			
-	    			if(packetSize < ByteArrayMessageSpliter.MAX_BINDER_SIZE){ //This is a small enough packet just send on through
-	    				//Log.w(TAG, " Packet size is just right " + packetSize  + " is smaller than " + ByteArrayMessageSpliter.MAX_BINDER_SIZE + " = " + (packetSize<ByteArrayMessageSpliter.MAX_BINDER_SIZE));
-		    			message.what = TransportConstants.ROUTER_RECEIVED_PACKET;
-
-						// !!!! ADD ADDITIONAL ITEMS TO BUNDLE HERE !!!
-
-						packet.setMessagingVersion(app.routerMessagingVersion);
-		    			bundle.putParcelable(FORMED_PACKET_EXTRA_NAME, packet);
-						/* !!!!!! DO NOT ADD ANY ADDITIONAL ITEMS TO THE BUNDLE AFTER PACKET. ONLY BYTES_TO_SEND_FLAG !!!!!!!*/
-						bundle.putInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_NONE);
-						/* !!!!!! DO NOT ADD ANY ADDITIONAL ITEMS TO THE BUNDLE AFTER PACKET. ONLY BYTES_TO_SEND_FLAG !!!!!!!*/
-
-	    				message.setData(bundle);
-		    			return sendPacketMessageToClient(app,message, version);
-	    			}else{
-	    				//Log.w(TAG, "Packet too big for IPC buffer. Breaking apart and then sending to client.");
-	    				//We need to churn through the packet payload and send it in chunks
-	    				byte[] bytes = packet.getPayload();
-	    				SdlPacket copyPacket = new SdlPacket(packet.getVersion(),packet.isEncrypted(),
-	    										(int)packet.getFrameType().getValue(),
-	    													packet.getServiceType(),packet.getFrameInfo(), session,
-	    													(int)packet.getDataSize(),packet.getMessageId(),null);
-	    				message.what = TransportConstants.ROUTER_RECEIVED_PACKET;
-						// !!!! ADD ADDITIONAL ITEMS TO BUNDLE HERE !!!
-
-						bundle.putParcelable(FORMED_PACKET_EXTRA_NAME, copyPacket);
-						/* !!!!!! DO NOT ADD ANY ADDITIONAL ITEMS TO THE BUNDLE AFTER PACKET. ONLY BYTES_TO_SEND_FLAG !!!!!!!*/
-						bundle.putInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_SDL_PACKET_INCLUDED);
-						/* !!!!!! DO NOT ADD ANY ADDITIONAL ITEMS TO THE BUNDLE AFTER PACKET. ONLY BYTES_TO_SEND_FLAG !!!!!!!*/
-
-						message.setData(bundle);
-		    			//Log.d(TAG, "First packet before sending: " + message.getData().toString());
-		    			if(!sendPacketMessageToClient(app, message, version)){
-							DebugTool.logWarning(TAG, "Error sending first message of split packet to client " + app.appId);
-		    				return false;
-		    			}
-	    				//Log.w(TAG, "Message too big for single IPC transaction. Breaking apart. Size - " +  packet.getDataSize());
-	    				ByteArrayMessageSpliter splitter = new ByteArrayMessageSpliter(appid,TransportConstants.ROUTER_RECEIVED_PACKET,bytes,0);
-	    				while(splitter.isActive()){
-	    					if(!sendPacketMessageToClient(app,splitter.nextMessage(),version)){
-								DebugTool.logWarning(TAG, "Error sending first message of split packet to client " + app.appId);
-	    						splitter.close();
-	    						return false;
-	    					}
-	    				}
-	    				//Log.i(TAG, "Large packet finished being sent");
-	    			} 
-	    			
-    		}else{	//If we can't find a session for this packet we just drop the packet
-					DebugTool.logError(TAG, "App Id was NULL for session! " + session);
-	    			TransportType transportType = packet.getTransportRecord().getType();
-	    			if(removeSessionFromMap(session, Collections.singletonList(transportType))){ //If we found the session id still tied to an app in our map we need to remove it and send the proper shutdown sequence.
-						DebugTool.logInfo(TAG, "Removed session from map.  Sending unregister request to module.");
-	    				attemptToCleanUpModule(session, packet.getVersion(), transportType);
-	    			}else{ //There was no mapping so let's try to resolve this
-	    				
-	    				if(packet.getFrameType() == FrameType.Single && packet.getServiceType() == SdlPacket.SERVICE_TYPE_RPC){
-	    					BinaryFrameHeader binFrameHeader = BinaryFrameHeader.parseBinaryHeader(packet.getPayload());
-    		    			if(binFrameHeader!=null && FunctionID.UNREGISTER_APP_INTERFACE.getId() == binFrameHeader.getFunctionID()){
-								DebugTool.logInfo(TAG, "Received an unregister app interface with no where to send it, dropping the packet.");
-    		    			}else{
-    		    				attemptToCleanUpModule(session, packet.getVersion(),transportType);
-    		    			}
-    					}else if((packet.getFrameType() == FrameType.Control 
-	    						&& (packet.getFrameInfo() == SdlPacket.FRAME_INFO_END_SERVICE_ACK || packet.getFrameInfo() == SdlPacket.FRAME_INFO_END_SERVICE_NAK))){
-    						//We want to ignore this
-							DebugTool.logInfo(TAG, "Received a stop service ack/nak with no where to send it, dropping the packet.");
-    					}else{
-    						attemptToCleanUpModule(session, packet.getVersion(),transportType);
-    					}
-	    			}
-	    		}
-	    	}
-	    	return false;
-		}
-	    
-		/**
-		 * This method is an all else fails situation. If the head unit is out of sync with the apps on the phone
-		 * this method will clear out an unwanted or out of date session.
-		 * @param session the session id that is to be cleaned up
-		 * @param version the last known version that this session was operating with
-		 */
-		private void attemptToCleanUpModule(int session, int version, TransportType primaryTransport){
-			DebugTool.logInfo(TAG, "Attempting to stop session " + session);
-			byte[] uai = createForceUnregisterApp((byte)session, (byte)version);
-			manuallyWriteBytes(primaryTransport,uai,0,uai.length);
-			int hashId = 0;
-			synchronized(this.SESSION_LOCK){
-				if(this.sessionHashIdMap.indexOfKey(session)>=0){
-					hashId = this.sessionHashIdMap.get(session); 
-					this.sessionHashIdMap.delete(session);
-					this.cleanedSessionMap.put(session,hashId);
-				}
-			}
-			byte[] stopService = SdlPacketFactory.createEndSession(SessionType.RPC, (byte)session, 0, (byte)version, hashId).constructPacket();
-			manuallyWriteBytes(primaryTransport,stopService,0,stopService.length);
-		}
-		
-	    private boolean sendPacketMessageToClient(RegisteredApp app, Message message, byte version){
-			int result = app.sendMessage(message);
-			if(result == RegisteredApp.SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT){
-				DebugTool.logInfo(TAG, "Dead object, removing app and sessions");
-				//Get all their sessions and send out unregister info
-				//Use the version in this packet as a best guess
-				app.close();
-				Vector<Long> sessions = app.getSessionIds();
-				byte[]  unregister,stopService;
-				int size = sessions.size(), sessionId;
-				for(int i=0; i<size;i++){
-					sessionId = sessions.get(i).intValue();
-					unregister = createForceUnregisterApp((byte)sessionId,version);
-					List<TransportType> transportTypes = app.getTransportsForSession(sessionId);
-					if(transportTypes != null && !transportTypes.isEmpty()) {
-						manuallyWriteBytes(transportTypes.get(0),unregister, 0, unregister.length);
-						int hashId = 0;
-						synchronized (this.SESSION_LOCK) {
-							if (this.sessionHashIdMap.indexOfKey(sessionId) >= 0) {
-								hashId = this.sessionHashIdMap.get(sessionId);
-							}
-						}
-						stopService = SdlPacketFactory.createEndSession(SessionType.RPC, (byte) sessionId, 0, version, hashId).constructPacket();
-
-						manuallyWriteBytes(transportTypes.get(0),stopService, 0, stopService.length);
-						synchronized (SESSION_LOCK) {
-							this.bluetoothSessionMap.remove(sessionId);
-							this.sessionHashIdMap.delete(sessionId);
-						}
-					}
-				}
-				synchronized(REGISTERED_APPS_LOCK){
-					registeredApps.remove(app.appId);
-				}
-				return false;//We did our best to correct errors
-			}
-			return true;//We should have sent our packet, so we can return true now
-	    }
-
-		private synchronized void closeBluetoothSerialServer(){
-			if(bluetoothTransport != null){
-				bluetoothTransport.stop();
-				bluetoothTransport = null;
-			}
-		}
-		
-		 /**
-	     * This function looks through the phones currently paired bluetooth devices
-	     * If one of the devices' names contain "sync", or livio it will attempt to connect the RFCOMM
-	     * And start SDL
-	     * @return a boolean if a connection was attempted
-	     */
-		 @SuppressWarnings({"MissingPermission"})
-		public synchronized boolean bluetoothQuerryAndConnect(){
-			BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-			if(adapter != null && adapter.isEnabled()){
-				Set<BluetoothDevice> pairedBT= adapter.getBondedDevices();
-				DebugTool.logInfo(TAG, "Query Bluetooth paired devices");
-	        	if (pairedBT.size() > 0) {
-	            	for (BluetoothDevice device : pairedBT) {
-	            		String name = device.getName().toLowerCase(Locale.US);
-	            		if(name.contains("sync") || name.contains("livio")){
-	            			bluetoothConnect(device);
-							return true;
-	                	}
-	            	}
-	       		}
-			}else{
-				DebugTool.logError(TAG, "There was an issue with connecting as client");
-			}
-			 return false;
-		 }
-
-		@SuppressWarnings("MissingPermission")
-		private synchronized boolean bluetoothConnect(BluetoothDevice device){
-			DebugTool.logInfo(TAG,"Connecting to device: " + device.getName());
-			if(bluetoothTransport == null || !bluetoothTransport.isConnected())
-			{	// Set up the Bluetooth serial object				
-				bluetoothTransport = new MultiplexBluetoothTransport(bluetoothHandler);
-			}
-			// We've been given a device - let's connect to it
-			if(bluetoothTransport.getState()!=MultiplexBluetoothTransport.STATE_CONNECTING){
-				bluetoothTransport.connect(device);
-				if(bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_CONNECTING){
-					return true;
-				}
-			}
-
-			DebugTool.logInfo(TAG, "Bluetooth SPP Connect Attempt Completed");
-			return false;
-		}
-
-		
-		//**************************************************************************************************************************************
-		//********************************************************* PREFERENCES ****************************************************************
-		//**************************************************************************************************************************************
-
-	/**
-	 * Set the connection establishment status of the particular device
-	 * @param address address of the device in quesiton
-	 * @param hasSDLConnected true if a connection has been established, false if not
-	 */
-	protected void setSDLConnectedStatus(String address, boolean hasSDLConnected){
-		SharedPreferences preferences = this.getSharedPreferences(SDL_DEVICE_STATUS_SHARED_PREFS, Context.MODE_PRIVATE);
-		SharedPreferences.Editor editor = preferences.edit();
-		editor.putBoolean(address,hasSDLConnected);
-		editor.commit();
-	}
-
-	/**
-	 * Checks to see if a device address has connected to SDL before.
-	 * @param address the mac address of the device in quesiton
-	 * @return if this is the first status check of this device
-	 */
-	protected boolean isFirstStatusCheck(String address){
-		SharedPreferences preferences = this.getSharedPreferences(SDL_DEVICE_STATUS_SHARED_PREFS, Context.MODE_PRIVATE);
-		return !preferences.contains(address) ;
-	}
-	/**
-	 * Checks to see if a device address has connected to SDL before.
-	 * @param address the mac address of the device in quesiton
-	 * @return if an SDL connection has ever been established with this device
-	 */
-	protected boolean hasSDLConnected(String address){
-		SharedPreferences preferences = this.getSharedPreferences(SDL_DEVICE_STATUS_SHARED_PREFS, Context.MODE_PRIVATE);
-		return preferences.contains(address) && preferences.getBoolean(address,false);
-	}
-
-	/**
-	 * Set specific settings through key/value to the SDL_ROUTER_SERVICE_PREFS
-	 * @param key the key of the pair to set in the preferences
-	 * @param value boolean to attach to key in the preferences
-	 */
-	protected void setSdlRouterServicePrefs(String key, boolean value){
-		SharedPreferences preferences = this.getSharedPreferences(SDL_ROUTER_SERVICE_PREFS, Context.MODE_PRIVATE);
-		SharedPreferences.Editor editor = preferences.edit();
-		editor.putBoolean(key,value);
-		editor.commit();
-		DebugTool.logInfo(TAG, "Preference set: " + key + " : " + value);
-	}
-
-	/**
-	 * Retrieves a boolean value for the given key in the SDL_ROUTER_SERVICE_PREFS
-	 * @param key the string key that will be used to retrieve the boolean value
-	 * @param defaultValue if they key does not exist or there is no value to be found, this is the
-	 *                     value that will be returned
-	 * @return the value associated with the supplied key or defaultValue if one does not exist
-	 */
-	protected boolean getBooleanPref(String key, boolean defaultValue){
-		SharedPreferences preferences = this.getSharedPreferences(SDL_ROUTER_SERVICE_PREFS, Context.MODE_PRIVATE);
-		if(preferences != null){
-			return preferences.getBoolean(key, defaultValue);
-		}
-		return false;
-	}
-
-	
-	/* ***********************************************************************************************************************************************************************
-	 * *****************************************************************  CUSTOM ADDITIONS  ************************************************************************************
-	 *************************************************************************************************************************************************************************/
-
-	@SuppressWarnings("DeprecatedIsStillUsed")
-	@Deprecated
-	protected static LocalRouterService getLocalRouterService(Intent launchIntent, ComponentName name){
-			if(launchIntent == null){
-				DebugTool.logWarning(TAG, "Supplied intent was null, local router service will not contain intent");
-			}
-			if(name == null){
-				DebugTool.logError(TAG, "Unable to create local router service object because component name was null");
-				return null;
-			}
-		//noinspection deprecation
-		return new LocalRouterService(launchIntent,ROUTER_SERVICE_VERSION_NUMBER, System.currentTimeMillis(), name);
-	}
-	
-	/**
-	 * This method is used to check for the newest version of this class to make sure the latest and greatest is up and running.
-	 */
-	private void startAltTransportTimer(){
-		altTransportTimerHandler = new Handler(); 
-		altTransportTimerRunnable = new Runnable() {           
+                            break;
+                        case MultiplexBaseTransport.STATE_ERROR:
+                            service.onTransportError(transportRecord, msg.getData());
+                            break;
+                    }
+                    break;
+
+                case MESSAGE_READ:
+                    service.onPacketRead((SdlPacket) msg.obj);
+                    break;
+            }
+        }
+    }
+
+    //The return false after the packet null check is not dead code. Read the getByteArray method from bundle
+    public boolean writeBytesToTransport(Bundle bundle) {
+        if (bundle == null) {
+            return false;
+        }
+        byte[] packet = bundle.getByteArray(TransportConstants.BYTES_TO_SEND_EXTRA_NAME);
+        if (packet == null) {
+            DebugTool.logWarning(TAG, "Ignoring null packet");
+            return false;
+        }
+        int offset = bundle.getInt(TransportConstants.BYTES_TO_SEND_EXTRA_OFFSET, 0); //If nothing, start at the beginning of the array
+        int count = bundle.getInt(TransportConstants.BYTES_TO_SEND_EXTRA_COUNT, packet.length);  //In case there isn't anything just send the whole packet.
+        TransportType transportType = TransportType.valueForString(bundle.getString(TransportConstants.TRANSPORT_TYPE));
+        if (transportType != null) {
+            switch ((transportType)) {
+                case BLUETOOTH:
+                    if (bluetoothTransport != null && bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_CONNECTED) {
+                        bluetoothTransport.write(packet, offset, count);
+                        return true;
+                    }
+                case USB:
+                    if (usbTransport != null && usbTransport.getState() == MultiplexBaseTransport.STATE_CONNECTED) {
+                        usbTransport.write(packet, offset, count);
+                        return true;
+                    }
+                case TCP:
+                    if (tcpTransport != null && tcpTransport.getState() == MultiplexBaseTransport.STATE_CONNECTED) {
+                        tcpTransport.write(packet, offset, count);
+                        return true;
+                    }
+                default:
+                    if (sendThroughAltTransport(bundle)) {
+                        return true;
+                    }
+            }
+        }
+        DebugTool.logError(TAG, "Can't send data, no transport  of specified type connected");
+        return false;
+    }
+
+    private boolean manuallyWriteBytes(TransportType transportType, byte[] packet, int offset, int count) {
+        switch ((transportType)) {
+            case BLUETOOTH:
+                if (bluetoothTransport != null && bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_CONNECTED) {
+                    bluetoothTransport.write(packet, offset, count);
+                    return true;
+                }
+            case USB:
+                if (usbTransport != null && usbTransport.getState() == MultiplexBaseTransport.STATE_CONNECTED) {
+                    usbTransport.write(packet, offset, count);
+                    return true;
+                }
+            case TCP:
+                if (tcpTransport != null && tcpTransport.getState() == MultiplexBaseTransport.STATE_CONNECTED) {
+                    tcpTransport.write(packet, offset, count);
+                    return true;
+                }
+            default:
+                return sendThroughAltTransport(packet, offset, count);
+        }
+    }
+
+
+    /**
+     * This Method will send the packets through the alt transport that is connected
+     *
+     * @param bundle This bundle will have its what changed and sent off to the alt transport
+     * @return If it was possible to send the packet off.
+     * <p><b>NOTE: This is not guaranteed. It is a best attempt at sending the packet, it may fail.</b>
+     */
+    private boolean sendThroughAltTransport(Bundle bundle) {
+        if (altTransportService != null) {
+            Message msg = Message.obtain();
+            msg.what = TransportConstants.ROUTER_SEND_PACKET;
+            msg.setData(bundle);
+            try {
+                altTransportService.send(msg);
+            } catch (RemoteException e) {
+                DebugTool.logError(TAG, "Unable to send through alt transport!");
+                e.printStackTrace();
+            }
+            return true;
+        } else {
+            DebugTool.logWarning(TAG, "Unable to send packet through alt transport, it was null");
+        }
+        return false;
+    }
+
+    /**
+     * This Method will send the packets through the alt transport that is connected
+     *
+     * @param bytes The byte array of data to be wrote out
+     * @return If it was possible to send the packet off.
+     * <p><b>NOTE: This is not guaranteed. It is a best attempt at sending the packet, it may fail.</b>
+     */
+    private boolean sendThroughAltTransport(byte[] bytes, int offset, int count) {
+        if (altTransportService != null) {
+            Message msg = Message.obtain();
+            msg.what = TransportConstants.ROUTER_SEND_PACKET;
+            Bundle bundle = new Bundle();
+            bundle.putByteArray(TransportConstants.BYTES_TO_SEND_EXTRA_NAME, bytes);
+            bundle.putInt(TransportConstants.BYTES_TO_SEND_EXTRA_OFFSET, offset);
+            bundle.putInt(TransportConstants.BYTES_TO_SEND_EXTRA_COUNT, count);
+            msg.setData(bundle);
+            try {
+                altTransportService.send(msg);
+            } catch (RemoteException e) {
+                DebugTool.logError(TAG, "Unable to send through alt transport!");
+                e.printStackTrace();
+            }
+            return true;
+        } else {
+            DebugTool.logWarning(TAG, "Unable to send packet through alt transport, it was null");
+        }
+        return false;
+    }
+
+    /**
+     * This will send the received packet to the registered service. It will default to the single registered "foreground" app.
+     * This can be overridden to provide more specific functionality.
+     *
+     * @param packet the packet that is received
+     * @return whether or not the sending was successful
+     */
+    public boolean sendPacketToRegisteredApp(SdlPacket packet) {
+        if (registeredApps != null && registeredApps.size() > 0) {
+            final int session = packet.getSessionId();
+            boolean isNewSessionRequest = false, isNewTransportRequest = false;
+
+            final int frameInfo = packet.getFrameInfo();
+            if (packet.getFrameType() == FrameType.Control) {
+                isNewSessionRequest = (frameInfo == SdlPacket.FRAME_INFO_START_SERVICE_ACK || frameInfo == SdlPacket.FRAME_INFO_START_SERVICE_NAK)
+                        && packet.getServiceType() == SdlPacket.SERVICE_TYPE_RPC;
+                isNewTransportRequest = (frameInfo == SdlPacket.FRAME_INFO_REGISTER_SECONDARY_TRANSPORT_ACK
+                        || frameInfo == SdlPacket.FRAME_INFO_REGISTER_SECONDARY_TRANSPORT_NAK); // && packet.getServiceType() != SdlPacket.SERVICE_TYPE_RPC;
+            }
+
+            //Find where this packet should go
+            String appid = getAppIDForSession(session, isNewSessionRequest, isNewTransportRequest, packet.getTransportRecord().getType());
+
+            if (appid != null && appid.length() > 0) {
+
+                RegisteredApp app;
+                synchronized (REGISTERED_APPS_LOCK) {
+                    app = registeredApps.get(appid);
+                }
+
+                if (app == null) {
+                    DebugTool.logError(TAG, "No app found for app id " + appid + " Removing session mapping and sending unregisterAI to head unit.");
+
+                    //We have no app to match the app id tied to this session
+                    removeSessionFromMap(session, Collections.singletonList(packet.getTransportRecord().getType()));
+
+                    final int serviceType = packet.getServiceType();
+                    if (serviceType == SdlPacket.SERVICE_TYPE_RPC || serviceType == SdlPacket.SERVICE_TYPE_BULK_DATA) {
+                        //This is a primary transport packet as it is an RPC packet
+                        //Create an unregister app interface to remove the app as it doesn't appear to exist anymore
+                        byte[] uai = createForceUnregisterApp((byte) session, (byte) packet.getVersion());
+                        manuallyWriteBytes(packet.getTransportRecord().getType(), uai, 0, uai.length);
+
+                        int hashId = 0;
+                        synchronized (this.SESSION_LOCK) {
+                            if (this.sessionHashIdMap.indexOfKey(session) >= 0) {
+                                hashId = this.sessionHashIdMap.get(session);
+                                this.sessionHashIdMap.delete(session);
+                            }
+                        }
+
+                        //TODO stop other services on that transport for the session with no app
+                        byte[] stopService = SdlPacketFactory.createEndSession(SessionType.RPC, (byte) session, 0, (byte) packet.getVersion(), hashId).constructPacket();
+                        manuallyWriteBytes(packet.getTransportRecord().getType(), stopService, 0, stopService.length);
+                    } else {
+                        DebugTool.logWarning(TAG, "No where to send a packet from what appears to be a non primary transport");
+                    }
+
+                    return false;
+                }
+
+                //There is an app id and can continue to normal flow
+                byte version = (byte) packet.getVersion();
+
+                if (isNewSessionRequest && version > 1 && packet.getFrameInfo() == SdlPacket.FRAME_INFO_START_SERVICE_ACK) { //we know this was a start session response
+                    if (version >= 5) {
+                        Integer hashId = (Integer) packet.getTag(ControlFrameTags.RPC.StartServiceACK.HASH_ID);
+                        if (hashId != null) {
+                            synchronized (SESSION_LOCK) {
+                                this.sessionHashIdMap.put(session, hashId);
+                            }
+                        } else {
+                            DebugTool.logWarning(TAG, "Hash ID not found in V5 start service ACK frame for session " + session);
+                        }
+                    } else {
+                        if (packet.getPayload() != null && packet.getDataSize() == 4) { //hashid will be 4 bytes in length
+                            synchronized (SESSION_LOCK) {
+                                this.sessionHashIdMap.put(session, (BitConverter.intFromByteArray(packet.getPayload(), 0)));
+                            }
+                        }
+                    }
+                }
+
+                // check and prevent a UAI from being passed to an app that is using a recycled session id
+                if (cleanedSessionMap != null && cleanedSessionMap.size() > 0) {
+                    if (packet.getFrameType() == FrameType.Single && packet.getServiceType() == SdlPacket.SERVICE_TYPE_RPC) {
+                        BinaryFrameHeader binFrameHeader = BinaryFrameHeader.parseBinaryHeader(packet.getPayload());
+                        if (binFrameHeader != null && FunctionID.UNREGISTER_APP_INTERFACE.getId() == binFrameHeader.getFunctionID()) {
+                            DebugTool.logInfo(TAG, "Received an unregister app interface. Checking session hash before sending");
+                            // make sure that we don't try to unregister a recently added app that might have a
+                            // session ID of a removed app whose UAI was delayed
+                            int hashOfRemoved = this.cleanedSessionMap.get(session, -1);
+                            int currentHash = this.sessionHashIdMap.get(session, -1);
+                            if (hashOfRemoved != -1) {
+                                // Current session contains key that was held before
+                                if (hashOfRemoved != currentHash) {
+                                    // App assigned same session id but is a different app. Keep this from being killed
+                                    DebugTool.logInfo(TAG, "same session id for different apps found, dropping packet");
+                                    this.cleanedSessionMap.delete(session);
+                                    return false;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                int packetSize = (int) (packet.getDataSize() + SdlPacket.HEADER_SIZE);
+                //Log.i(TAG, "Checking packet size: " + packetSize);
+                Message message = Message.obtain();
+                Bundle bundle = new Bundle();
+
+                if (packetSize < ByteArrayMessageSpliter.MAX_BINDER_SIZE) { //This is a small enough packet just send on through
+                    //Log.w(TAG, " Packet size is just right " + packetSize  + " is smaller than " + ByteArrayMessageSpliter.MAX_BINDER_SIZE + " = " + (packetSize<ByteArrayMessageSpliter.MAX_BINDER_SIZE));
+                    message.what = TransportConstants.ROUTER_RECEIVED_PACKET;
+
+                    // !!!! ADD ADDITIONAL ITEMS TO BUNDLE HERE !!!
+
+                    packet.setMessagingVersion(app.routerMessagingVersion);
+                    bundle.putParcelable(FORMED_PACKET_EXTRA_NAME, packet);
+                    /* !!!!!! DO NOT ADD ANY ADDITIONAL ITEMS TO THE BUNDLE AFTER PACKET. ONLY BYTES_TO_SEND_FLAG !!!!!!!*/
+                    bundle.putInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_NONE);
+                    /* !!!!!! DO NOT ADD ANY ADDITIONAL ITEMS TO THE BUNDLE AFTER PACKET. ONLY BYTES_TO_SEND_FLAG !!!!!!!*/
+
+                    message.setData(bundle);
+                    return sendPacketMessageToClient(app, message, version);
+                } else {
+                    //Log.w(TAG, "Packet too big for IPC buffer. Breaking apart and then sending to client.");
+                    //We need to churn through the packet payload and send it in chunks
+                    byte[] bytes = packet.getPayload();
+                    SdlPacket copyPacket = new SdlPacket(packet.getVersion(), packet.isEncrypted(),
+                            (int) packet.getFrameType().getValue(),
+                            packet.getServiceType(), packet.getFrameInfo(), session,
+                            (int) packet.getDataSize(), packet.getMessageId(), null);
+                    message.what = TransportConstants.ROUTER_RECEIVED_PACKET;
+                    // !!!! ADD ADDITIONAL ITEMS TO BUNDLE HERE !!!
+
+                    bundle.putParcelable(FORMED_PACKET_EXTRA_NAME, copyPacket);
+                    /* !!!!!! DO NOT ADD ANY ADDITIONAL ITEMS TO THE BUNDLE AFTER PACKET. ONLY BYTES_TO_SEND_FLAG !!!!!!!*/
+                    bundle.putInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_SDL_PACKET_INCLUDED);
+                    /* !!!!!! DO NOT ADD ANY ADDITIONAL ITEMS TO THE BUNDLE AFTER PACKET. ONLY BYTES_TO_SEND_FLAG !!!!!!!*/
+
+                    message.setData(bundle);
+                    //Log.d(TAG, "First packet before sending: " + message.getData().toString());
+                    if (!sendPacketMessageToClient(app, message, version)) {
+                        DebugTool.logWarning(TAG, "Error sending first message of split packet to client " + app.appId);
+                        return false;
+                    }
+                    //Log.w(TAG, "Message too big for single IPC transaction. Breaking apart. Size - " +  packet.getDataSize());
+                    ByteArrayMessageSpliter splitter = new ByteArrayMessageSpliter(appid, TransportConstants.ROUTER_RECEIVED_PACKET, bytes, 0);
+                    while (splitter.isActive()) {
+                        if (!sendPacketMessageToClient(app, splitter.nextMessage(), version)) {
+                            DebugTool.logWarning(TAG, "Error sending first message of split packet to client " + app.appId);
+                            splitter.close();
+                            return false;
+                        }
+                    }
+                    //Log.i(TAG, "Large packet finished being sent");
+                }
+
+            } else {    //If we can't find a session for this packet we just drop the packet
+                DebugTool.logError(TAG, "App Id was NULL for session! " + session);
+                TransportType transportType = packet.getTransportRecord().getType();
+                if (removeSessionFromMap(session, Collections.singletonList(transportType))) { //If we found the session id still tied to an app in our map we need to remove it and send the proper shutdown sequence.
+                    DebugTool.logInfo(TAG, "Removed session from map.  Sending unregister request to module.");
+                    attemptToCleanUpModule(session, packet.getVersion(), transportType);
+                } else { //There was no mapping so let's try to resolve this
+
+                    if (packet.getFrameType() == FrameType.Single && packet.getServiceType() == SdlPacket.SERVICE_TYPE_RPC) {
+                        BinaryFrameHeader binFrameHeader = BinaryFrameHeader.parseBinaryHeader(packet.getPayload());
+                        if (binFrameHeader != null && FunctionID.UNREGISTER_APP_INTERFACE.getId() == binFrameHeader.getFunctionID()) {
+                            DebugTool.logInfo(TAG, "Received an unregister app interface with no where to send it, dropping the packet.");
+                        } else {
+                            attemptToCleanUpModule(session, packet.getVersion(), transportType);
+                        }
+                    } else if ((packet.getFrameType() == FrameType.Control
+                            && (packet.getFrameInfo() == SdlPacket.FRAME_INFO_END_SERVICE_ACK || packet.getFrameInfo() == SdlPacket.FRAME_INFO_END_SERVICE_NAK))) {
+                        //We want to ignore this
+                        DebugTool.logInfo(TAG, "Received a stop service ack/nak with no where to send it, dropping the packet.");
+                    } else {
+                        attemptToCleanUpModule(session, packet.getVersion(), transportType);
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * This method is an all else fails situation. If the head unit is out of sync with the apps on the phone
+     * this method will clear out an unwanted or out of date session.
+     *
+     * @param session the session id that is to be cleaned up
+     * @param version the last known version that this session was operating with
+     */
+    private void attemptToCleanUpModule(int session, int version, TransportType primaryTransport) {
+        DebugTool.logInfo(TAG, "Attempting to stop session " + session);
+        byte[] uai = createForceUnregisterApp((byte) session, (byte) version);
+        manuallyWriteBytes(primaryTransport, uai, 0, uai.length);
+        int hashId = 0;
+        synchronized (this.SESSION_LOCK) {
+            if (this.sessionHashIdMap.indexOfKey(session) >= 0) {
+                hashId = this.sessionHashIdMap.get(session);
+                this.sessionHashIdMap.delete(session);
+                this.cleanedSessionMap.put(session, hashId);
+            }
+        }
+        byte[] stopService = SdlPacketFactory.createEndSession(SessionType.RPC, (byte) session, 0, (byte) version, hashId).constructPacket();
+        manuallyWriteBytes(primaryTransport, stopService, 0, stopService.length);
+    }
+
+    private boolean sendPacketMessageToClient(RegisteredApp app, Message message, byte version) {
+        int result = app.sendMessage(message);
+        if (result == RegisteredApp.SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT) {
+            DebugTool.logInfo(TAG, "Dead object, removing app and sessions");
+            //Get all their sessions and send out unregister info
+            //Use the version in this packet as a best guess
+            app.close();
+            Vector<Long> sessions = app.getSessionIds();
+            byte[] unregister, stopService;
+            int size = sessions.size(), sessionId;
+            for (int i = 0; i < size; i++) {
+                sessionId = sessions.get(i).intValue();
+                unregister = createForceUnregisterApp((byte) sessionId, version);
+                List<TransportType> transportTypes = app.getTransportsForSession(sessionId);
+                if (transportTypes != null && !transportTypes.isEmpty()) {
+                    manuallyWriteBytes(transportTypes.get(0), unregister, 0, unregister.length);
+                    int hashId = 0;
+                    synchronized (this.SESSION_LOCK) {
+                        if (this.sessionHashIdMap.indexOfKey(sessionId) >= 0) {
+                            hashId = this.sessionHashIdMap.get(sessionId);
+                        }
+                    }
+                    stopService = SdlPacketFactory.createEndSession(SessionType.RPC, (byte) sessionId, 0, version, hashId).constructPacket();
+
+                    manuallyWriteBytes(transportTypes.get(0), stopService, 0, stopService.length);
+                    synchronized (SESSION_LOCK) {
+                        this.bluetoothSessionMap.remove(sessionId);
+                        this.sessionHashIdMap.delete(sessionId);
+                    }
+                }
+            }
+            synchronized (REGISTERED_APPS_LOCK) {
+                registeredApps.remove(app.appId);
+            }
+            return false;//We did our best to correct errors
+        }
+        return true;//We should have sent our packet, so we can return true now
+    }
+
+    private synchronized void closeBluetoothSerialServer() {
+        if (bluetoothTransport != null) {
+            bluetoothTransport.stop();
+            bluetoothTransport = null;
+        }
+    }
+
+    /**
+     * This function looks through the phones currently paired bluetooth devices
+     * If one of the devices' names contain "sync", or livio it will attempt to connect the RFCOMM
+     * And start SDL
+     *
+     * @return a boolean if a connection was attempted
+     */
+    @SuppressWarnings({"MissingPermission"})
+    public synchronized boolean bluetoothQuerryAndConnect() {
+        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+        if (adapter != null && adapter.isEnabled()) {
+            Set<BluetoothDevice> pairedBT = adapter.getBondedDevices();
+            DebugTool.logInfo(TAG, "Query Bluetooth paired devices");
+            if (pairedBT.size() > 0) {
+                for (BluetoothDevice device : pairedBT) {
+                    String name = device.getName().toLowerCase(Locale.US);
+                    if (name.contains("sync") || name.contains("livio")) {
+                        bluetoothConnect(device);
+                        return true;
+                    }
+                }
+            }
+        } else {
+            DebugTool.logError(TAG, "There was an issue with connecting as client");
+        }
+        return false;
+    }
+
+    @SuppressWarnings("MissingPermission")
+    private synchronized boolean bluetoothConnect(BluetoothDevice device) {
+        DebugTool.logInfo(TAG, "Connecting to device: " + device.getName());
+        if (bluetoothTransport == null || !bluetoothTransport.isConnected()) {    // Set up the Bluetooth serial object
+            bluetoothTransport = new MultiplexBluetoothTransport(bluetoothHandler);
+        }
+        // We've been given a device - let's connect to it
+        if (bluetoothTransport.getState() != MultiplexBluetoothTransport.STATE_CONNECTING) {
+            bluetoothTransport.connect(device);
+            if (bluetoothTransport.getState() == MultiplexBluetoothTransport.STATE_CONNECTING) {
+                return true;
+            }
+        }
+
+        DebugTool.logInfo(TAG, "Bluetooth SPP Connect Attempt Completed");
+        return false;
+    }
+
+
+    //**************************************************************************************************************************************
+    //********************************************************* PREFERENCES ****************************************************************
+    //**************************************************************************************************************************************
+
+    /**
+     * Set the connection establishment status of the particular device
+     *
+     * @param address         address of the device in quesiton
+     * @param hasSDLConnected true if a connection has been established, false if not
+     */
+    protected void setSDLConnectedStatus(String address, boolean hasSDLConnected) {
+        SharedPreferences preferences = this.getSharedPreferences(SDL_DEVICE_STATUS_SHARED_PREFS, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(address, hasSDLConnected);
+        editor.commit();
+    }
+
+    /**
+     * Checks to see if a device address has connected to SDL before.
+     *
+     * @param address the mac address of the device in quesiton
+     * @return if this is the first status check of this device
+     */
+    protected boolean isFirstStatusCheck(String address) {
+        SharedPreferences preferences = this.getSharedPreferences(SDL_DEVICE_STATUS_SHARED_PREFS, Context.MODE_PRIVATE);
+        return !preferences.contains(address);
+    }
+
+    /**
+     * Checks to see if a device address has connected to SDL before.
+     *
+     * @param address the mac address of the device in quesiton
+     * @return if an SDL connection has ever been established with this device
+     */
+    protected boolean hasSDLConnected(String address) {
+        SharedPreferences preferences = this.getSharedPreferences(SDL_DEVICE_STATUS_SHARED_PREFS, Context.MODE_PRIVATE);
+        return preferences.contains(address) && preferences.getBoolean(address, false);
+    }
+
+    /**
+     * Set specific settings through key/value to the SDL_ROUTER_SERVICE_PREFS
+     *
+     * @param key   the key of the pair to set in the preferences
+     * @param value boolean to attach to key in the preferences
+     */
+    protected void setSdlRouterServicePrefs(String key, boolean value) {
+        SharedPreferences preferences = this.getSharedPreferences(SDL_ROUTER_SERVICE_PREFS, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(key, value);
+        editor.commit();
+        DebugTool.logInfo(TAG, "Preference set: " + key + " : " + value);
+    }
+
+    /**
+     * Retrieves a boolean value for the given key in the SDL_ROUTER_SERVICE_PREFS
+     *
+     * @param key          the string key that will be used to retrieve the boolean value
+     * @param defaultValue if they key does not exist or there is no value to be found, this is the
+     *                     value that will be returned
+     * @return the value associated with the supplied key or defaultValue if one does not exist
+     */
+    protected boolean getBooleanPref(String key, boolean defaultValue) {
+        SharedPreferences preferences = this.getSharedPreferences(SDL_ROUTER_SERVICE_PREFS, Context.MODE_PRIVATE);
+        if (preferences != null) {
+            return preferences.getBoolean(key, defaultValue);
+        }
+        return false;
+    }
+
+
+    /* ***********************************************************************************************************************************************************************
+     * *****************************************************************  CUSTOM ADDITIONS  ************************************************************************************
+     *************************************************************************************************************************************************************************/
+
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    @Deprecated
+    protected static LocalRouterService getLocalRouterService(Intent launchIntent, ComponentName name) {
+        if (launchIntent == null) {
+            DebugTool.logWarning(TAG, "Supplied intent was null, local router service will not contain intent");
+        }
+        if (name == null) {
+            DebugTool.logError(TAG, "Unable to create local router service object because component name was null");
+            return null;
+        }
+        //noinspection deprecation
+        return new LocalRouterService(launchIntent, ROUTER_SERVICE_VERSION_NUMBER, System.currentTimeMillis(), name);
+    }
+
+    /**
+     * This method is used to check for the newest version of this class to make sure the latest and greatest is up and running.
+     */
+    private void startAltTransportTimer() {
+        altTransportTimerHandler = new Handler();
+        altTransportTimerRunnable = new Runnable() {
             public void run() {
-            	altTransportTimerHandler = null;
-            	altTransportTimerRunnable = null;
-				if(!shouldServiceRemainOpen(null)){
-					closeSelf();
-				}
+                altTransportTimerHandler = null;
+                altTransportTimerRunnable = null;
+                if (!shouldServiceRemainOpen(null)) {
+                    closeSelf();
+                }
             }
         };
-        altTransportTimerHandler.postDelayed(altTransportTimerRunnable, ALT_TRANSPORT_TIMEOUT_RUNNABLE); 
-	}
-
-	/**
-	 * Removes session from map if the key is found.
-	 * @param sessionId the session id that is to be removed from our current mapping
-	 * @return if the key was found
-	 */
-	private boolean removeSessionFromMap(int sessionId, List<TransportType> transportTypes){
-		synchronized(SESSION_LOCK){
-			boolean retVal = false;
-			if(transportTypes != null) {	//FIXME I don't believe this should be null
-				if (transportTypes.contains(TransportType.BLUETOOTH) && bluetoothSessionMap != null) {
-					if (bluetoothSessionMap.indexOfKey(sessionId) >= 0) {
-						bluetoothSessionMap.remove(sessionId);
-						retVal = true;
-					}
-				} else if (transportTypes.contains(TransportType.USB) && usbSessionMap != null) {
-					if (usbSessionMap.indexOfKey(sessionId) >= 0) {
-						usbSessionMap.remove(sessionId);
-						retVal = true;
-					}
-				} else if (transportTypes.contains(TransportType.TCP) && tcpSessionMap != null) {
-					if (tcpSessionMap.indexOfKey(sessionId) >= 0) {
-						tcpSessionMap.remove(sessionId);
-						retVal = true;
-					}
-				}
-			}
-			return retVal;
-		}
-	}
-
-
-	private boolean removeAllSessionsWithAppId(String appId){
-		synchronized(SESSION_LOCK){
-			if(bluetoothSessionMap !=null){
-				SparseArray<String> iter = bluetoothSessionMap.clone();
-				int size = iter.size();
-				for(int i = 0; i<size; i++){
-					if(iter.valueAt(i).compareTo(appId) == 0){
-						sessionHashIdMap.delete(iter.keyAt(i));
-						bluetoothSessionMap.removeAt(i);
-					}
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Removes all sessions from the sessions map for this given app id
-	 * @param app the RegisteredApp object that should have all its sessions removed
-	 * @param cleanModule a flag if this service should attempt to clear off the sessions tied to the app off the module
-	 */
-    private void removeAllSessionsForApp(RegisteredApp app, boolean cleanModule){
-    	Vector<Long> sessions = app.getSessionIds();
-		int size = sessions.size(), sessionId;
-		for(int i=0; i<size;i++){
-			//Log.d(TAG, "Investigating session " +sessions.get(i).intValue());
-			//Log.d(TAG, "App id is: " + bluetoothSessionMap.get(sessions.get(i).intValue()));
-			sessionId = sessions.get(i).intValue();
-			List<TransportType> transportTypes = app.getTransportsForSession(sessionId);
-			removeSessionFromMap(sessionId, transportTypes);
-			if(cleanModule){
-				if(transportTypes != null && transportTypes.size() > 0){
-					attemptToCleanUpModule(sessionId, cachedModuleVersion, transportTypes.get(0));
-				}
-			}
-		}
-    }
-    
-	private boolean removeAppFromMap(RegisteredApp app){
-    	synchronized(REGISTERED_APPS_LOCK){
-			//noinspection SuspiciousMethodCalls
-			RegisteredApp old = registeredApps.remove(app);
-    		if(old!=null){
-    			old.close();
-    			return true;
-    		}
-    	}
-    	return false;
-    }
-	
-	private String getAppIDForSession(int sessionId, boolean newSession, boolean newTransport, TransportType transportType){
-		synchronized(SESSION_LOCK){
-			//Log.d(TAG, "Looking for session: " + sessionId);
-			//First get the session map for the correct transport
-			SparseArray<String> sessionMap;
-			switch(transportType){
-				case BLUETOOTH:
-					if(bluetoothSessionMap == null){
-						bluetoothSessionMap = new SparseArray<String>();
-					}
-					sessionMap = bluetoothSessionMap;
-					break;
-				case USB:
-					if(usbSessionMap == null){
-						usbSessionMap = new SparseArray<String>();
-					}
-					sessionMap = usbSessionMap;
-					break;
-				case TCP:
-					if(tcpSessionMap == null){
-						tcpSessionMap = new SparseArray<String>();
-					}
-					sessionMap = tcpSessionMap;
-					break;
-				default:
-					return null;
-			}
-
-			String appId = sessionMap.get(sessionId);
-			if(appId==null){
-				// If service type is RPC then we know we need to just skip ahead and see if there
-				// is a registered app awaiting a session.
-				if(newSession) {
-					int pos;
-					synchronized (REGISTERED_APPS_LOCK) {
-						for (RegisteredApp app : registeredApps.values()) {
-							if(app.getAwaitingSession().contains(transportType)) {
-								pos = app.containsSessionId(-1);
-								if (pos != -1) {
-									app.setSessionId(pos, sessionId);
-									app.registerTransport(sessionId, transportType);
-									app.getAwaitingSession().remove(transportType);
-									appId = app.getAppId();
-									sessionMap.put(sessionId, appId);
-									break;
-								}
-							}
-						}
-					}
-				}else if(newTransport){
-
-					// If this is anything other than RPC with a start service response we can assume
-					// the app wants to use a new transport as secondary.
-
-					// We would only receive a start service response for RPC service when an app is
-					// attempting to register for the first time. Other services can be ran on
-					//secondary transports.
-					switch (transportType){
-						case BLUETOOTH:			//Check for BT as a secondary transport
-							//USB is potential primary
-							appId = usbSessionMap.get(sessionId);
-							// No other suitable transport for primary transport
-							break;
-						case USB:				//Check for USB as a secondary transport
-							//BT potential primary transport
-							appId = bluetoothSessionMap.get(sessionId);
-							// No other suitable transport for primary transport
-							break;
-						case TCP:				//Check for TCP as a secondary transport
-							//BT potential primary transport
-							appId =  bluetoothSessionMap.get(sessionId);
-							if(appId == null){
-								//USB is potential primary transport
-								appId =  usbSessionMap.get(sessionId);
-							}
-							break;
-						default:
-							return null;
-						}
-
-						if(appId != null){
-							//This means that there is a session id of the same id on another transport
-							synchronized(REGISTERED_APPS_LOCK){
-								RegisteredApp app = registeredApps.get(appId);
-								//Ensure a registered app actually exists and is not null
-								if(app != null){
-									//Register this new transport for the app and add the entry to the
-									//session map associated with this transport
-									app.registerTransport(sessionId, transportType);
-									sessionMap.put(sessionId,appId);
-								}else{
-									DebugTool.logWarning(TAG, "No registered app found when register secondary transport");
-								}
-							}
-						}
-				}
-
-			}
-			//Log.d(TAG, sessionId + " session returning App Id: " + appId);
-			return appId;
-		}
-	}
-	
-	/* ****************************************************************************************************************************************
+        altTransportTimerHandler.postDelayed(altTransportTimerRunnable, ALT_TRANSPORT_TIMEOUT_RUNNABLE);
+    }
+
+    /**
+     * Removes session from map if the key is found.
+     *
+     * @param sessionId the session id that is to be removed from our current mapping
+     * @return if the key was found
+     */
+    private boolean removeSessionFromMap(int sessionId, List<TransportType> transportTypes) {
+        synchronized (SESSION_LOCK) {
+            boolean retVal = false;
+            if (transportTypes != null) {    //FIXME I don't believe this should be null
+                if (transportTypes.contains(TransportType.BLUETOOTH) && bluetoothSessionMap != null) {
+                    if (bluetoothSessionMap.indexOfKey(sessionId) >= 0) {
+                        bluetoothSessionMap.remove(sessionId);
+                        retVal = true;
+                    }
+                } else if (transportTypes.contains(TransportType.USB) && usbSessionMap != null) {
+                    if (usbSessionMap.indexOfKey(sessionId) >= 0) {
+                        usbSessionMap.remove(sessionId);
+                        retVal = true;
+                    }
+                } else if (transportTypes.contains(TransportType.TCP) && tcpSessionMap != null) {
+                    if (tcpSessionMap.indexOfKey(sessionId) >= 0) {
+                        tcpSessionMap.remove(sessionId);
+                        retVal = true;
+                    }
+                }
+            }
+            return retVal;
+        }
+    }
+
+
+    private boolean removeAllSessionsWithAppId(String appId) {
+        synchronized (SESSION_LOCK) {
+            if (bluetoothSessionMap != null) {
+                SparseArray<String> iter = bluetoothSessionMap.clone();
+                int size = iter.size();
+                for (int i = 0; i < size; i++) {
+                    if (iter.valueAt(i).compareTo(appId) == 0) {
+                        sessionHashIdMap.delete(iter.keyAt(i));
+                        bluetoothSessionMap.removeAt(i);
+                    }
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Removes all sessions from the sessions map for this given app id
+     *
+     * @param app         the RegisteredApp object that should have all its sessions removed
+     * @param cleanModule a flag if this service should attempt to clear off the sessions tied to the app off the module
+     */
+    private void removeAllSessionsForApp(RegisteredApp app, boolean cleanModule) {
+        Vector<Long> sessions = app.getSessionIds();
+        int size = sessions.size(), sessionId;
+        for (int i = 0; i < size; i++) {
+            //Log.d(TAG, "Investigating session " +sessions.get(i).intValue());
+            //Log.d(TAG, "App id is: " + bluetoothSessionMap.get(sessions.get(i).intValue()));
+            sessionId = sessions.get(i).intValue();
+            List<TransportType> transportTypes = app.getTransportsForSession(sessionId);
+            removeSessionFromMap(sessionId, transportTypes);
+            if (cleanModule) {
+                if (transportTypes != null && transportTypes.size() > 0) {
+                    attemptToCleanUpModule(sessionId, cachedModuleVersion, transportTypes.get(0));
+                }
+            }
+        }
+    }
+
+    private boolean removeAppFromMap(RegisteredApp app) {
+        synchronized (REGISTERED_APPS_LOCK) {
+            //noinspection SuspiciousMethodCalls
+            RegisteredApp old = registeredApps.remove(app);
+            if (old != null) {
+                old.close();
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String getAppIDForSession(int sessionId, boolean newSession, boolean newTransport, TransportType transportType) {
+        synchronized (SESSION_LOCK) {
+            //Log.d(TAG, "Looking for session: " + sessionId);
+            //First get the session map for the correct transport
+            SparseArray<String> sessionMap;
+            switch (transportType) {
+                case BLUETOOTH:
+                    if (bluetoothSessionMap == null) {
+                        bluetoothSessionMap = new SparseArray<String>();
+                    }
+                    sessionMap = bluetoothSessionMap;
+                    break;
+                case USB:
+                    if (usbSessionMap == null) {
+                        usbSessionMap = new SparseArray<String>();
+                    }
+                    sessionMap = usbSessionMap;
+                    break;
+                case TCP:
+                    if (tcpSessionMap == null) {
+                        tcpSessionMap = new SparseArray<String>();
+                    }
+                    sessionMap = tcpSessionMap;
+                    break;
+                default:
+                    return null;
+            }
+
+            String appId = sessionMap.get(sessionId);
+            if (appId == null) {
+                // If service type is RPC then we know we need to just skip ahead and see if there
+                // is a registered app awaiting a session.
+                if (newSession) {
+                    int pos;
+                    synchronized (REGISTERED_APPS_LOCK) {
+                        for (RegisteredApp app : registeredApps.values()) {
+                            if (app.getAwaitingSession().contains(transportType)) {
+                                pos = app.containsSessionId(-1);
+                                if (pos != -1) {
+                                    app.setSessionId(pos, sessionId);
+                                    app.registerTransport(sessionId, transportType);
+                                    app.getAwaitingSession().remove(transportType);
+                                    appId = app.getAppId();
+                                    sessionMap.put(sessionId, appId);
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                } else if (newTransport) {
+
+                    // If this is anything other than RPC with a start service response we can assume
+                    // the app wants to use a new transport as secondary.
+
+                    // We would only receive a start service response for RPC service when an app is
+                    // attempting to register for the first time. Other services can be ran on
+                    //secondary transports.
+                    switch (transportType) {
+                        case BLUETOOTH:            //Check for BT as a secondary transport
+                            //USB is potential primary
+                            appId = usbSessionMap.get(sessionId);
+                            // No other suitable transport for primary transport
+                            break;
+                        case USB:                //Check for USB as a secondary transport
+                            //BT potential primary transport
+                            appId = bluetoothSessionMap.get(sessionId);
+                            // No other suitable transport for primary transport
+                            break;
+                        case TCP:                //Check for TCP as a secondary transport
+                            //BT potential primary transport
+                            appId = bluetoothSessionMap.get(sessionId);
+                            if (appId == null) {
+                                //USB is potential primary transport
+                                appId = usbSessionMap.get(sessionId);
+                            }
+                            break;
+                        default:
+                            return null;
+                    }
+
+                    if (appId != null) {
+                        //This means that there is a session id of the same id on another transport
+                        synchronized (REGISTERED_APPS_LOCK) {
+                            RegisteredApp app = registeredApps.get(appId);
+                            //Ensure a registered app actually exists and is not null
+                            if (app != null) {
+                                //Register this new transport for the app and add the entry to the
+                                //session map associated with this transport
+                                app.registerTransport(sessionId, transportType);
+                                sessionMap.put(sessionId, appId);
+                            } else {
+                                DebugTool.logWarning(TAG, "No registered app found when register secondary transport");
+                            }
+                        }
+                    }
+                }
+
+            }
+            //Log.d(TAG, sessionId + " session returning App Id: " + appId);
+            return appId;
+        }
+    }
+
+    /* ****************************************************************************************************************************************
 	// ***********************************************************   LEGACY   ****************************************************************
 	//*****************************************************************************************************************************************/
-	private boolean legacyModeEnabled = false;
-	
-	private void enableLegacyMode(boolean enable){
-		DebugTool.logInfo(TAG, "Enable legacy mode: " + enable);
-		legacyModeEnabled = enable; //We put this at the end to avoid a race condition between the bluetooth d/c and notify of legacy mode enabled
-
-		if(legacyModeEnabled){
-			//So we need to let the clients know they need to host their own bluetooth sessions because the currently connected head unit only supports a very old version of SDL/Applink
-			//Start by closing our own bluetooth connection. The following calls will handle actually notifying the clients of legacy mode
-			closeBluetoothSerialServer();			
-			//Now wait until we get a d/c, then the apps should shut their bluetooth down and go back to normal
-			
-		}//else{}
-
-	}
-	
+    private boolean legacyModeEnabled = false;
+
+    private void enableLegacyMode(boolean enable) {
+        DebugTool.logInfo(TAG, "Enable legacy mode: " + enable);
+        legacyModeEnabled = enable; //We put this at the end to avoid a race condition between the bluetooth d/c and notify of legacy mode enabled
+
+        if (legacyModeEnabled) {
+            //So we need to let the clients know they need to host their own bluetooth sessions because the currently connected head unit only supports a very old version of SDL/Applink
+            //Start by closing our own bluetooth connection. The following calls will handle actually notifying the clients of legacy mode
+            closeBluetoothSerialServer();
+            //Now wait until we get a d/c, then the apps should shut their bluetooth down and go back to normal
+
+        }//else{}
+
+    }
+
 	/* ****************************************************************************************************************************************
 	// ***********************************************************   UTILITY   ****************************************************************
 	//*****************************************************************************************************************************************/
-	
-	private void debugPacket(byte[] bytes){
-		//DEBUG
-		
-		if(bytes[0] != 0x00){
-			DebugTool.logInfo(TAG, "Writing packet with header: " + BitConverter.bytesToHex(bytes, 12)); //just want the header
-		}else{
-			
-			//Log.d(TAG, "Writing packet with binary header: " + BitConverter.bytesToHex(bytes, 12)); //just want the header
-		//int length = bytes.length-12;
-		if(bytes.length<=8){
-			DebugTool.logWarning(TAG, "No payload to debug or too small");
-			return;
-		}
-		//Check first byte if 0, make to json
-		char[] buffer = new char[bytes.length];
-		for(int i = 12;i<bytes.length;i++){
-			 buffer[i-12] = (char)(bytes[i] & 0xFF);
-		}
-		try {
-			
-			JSONObject object = new JSONObject(new String(buffer));
-			DebugTool.logInfo(TAG, "JSON: " + object.toString());
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-	}
-		
-	}
-	
-	/**
-	 * If an app crashes the only way we can handle it being on the head unit is to send an unregister app interface rpc.
-	 * This method should only be called when the router service recognizes the client is no longer valid
-	 * @param sessionId session id that is currently being cleared from the module. It will be used to form the packet.
-	 * @param version the last known version this session was operating with
-	 * @return a byte array that contains the full packet for an UnregisterAppInterface that can be written out to the transport
-	 */
-	private byte[] createForceUnregisterApp(byte sessionId,byte version){
-		UnregisterAppInterface request = new UnregisterAppInterface();
-		request.setCorrelationID(UNREGISTER_APP_INTERFACE_CORRELATION_ID);
-		request.format(null,true);
-		byte[] msgBytes = JsonRPCMarshaller.marshall(request, version);
-		ProtocolMessage pm = new ProtocolMessage();
-		pm.setData(msgBytes);
-		pm.setSessionID(sessionId);
-		pm.setMessageType(MessageType.RPC);
-		pm.setSessionType(SessionType.RPC);
-		pm.setFunctionID(FunctionID.getFunctionId(request.getFunctionName()));
-		pm.setCorrID(request.getCorrelationID());
-		if (request.getBulkData() != null) 
-			pm.setBulkData(request.getBulkData());
-		byte[] data;
-		if(version > 1) { //If greater than v1 we need to include a binary frame header in the data before all the JSON starts
-			data = new byte[12 + pm.getJsonSize()];
-			BinaryFrameHeader binFrameHeader = SdlPacketFactory.createBinaryFrameHeader(pm.getRPCType(), pm.getFunctionID(), pm.getCorrID(), pm.getJsonSize());
-			System.arraycopy(binFrameHeader.assembleHeaderBytes(), 0, data, 0, 12);
-			System.arraycopy(pm.getData(), 0, data, 12, pm.getJsonSize());
-		}else {
-			data = pm.getData();
-		}
-
-		SdlPacket packet = new SdlPacket(version,false,SdlPacket.FRAME_TYPE_SINGLE,SdlPacket.SERVICE_TYPE_RPC,0,sessionId,data.length,data.length+100,data);
-		return packet.constructPacket();
-	}
-	
-	
+
+    private void debugPacket(byte[] bytes) {
+        //DEBUG
+
+        if (bytes[0] != 0x00) {
+            DebugTool.logInfo(TAG, "Writing packet with header: " + BitConverter.bytesToHex(bytes, 12)); //just want the header
+        } else {
+
+            //Log.d(TAG, "Writing packet with binary header: " + BitConverter.bytesToHex(bytes, 12)); //just want the header
+            //int length = bytes.length-12;
+            if (bytes.length <= 8) {
+                DebugTool.logWarning(TAG, "No payload to debug or too small");
+                return;
+            }
+            //Check first byte if 0, make to json
+            char[] buffer = new char[bytes.length];
+            for (int i = 12; i < bytes.length; i++) {
+                buffer[i - 12] = (char) (bytes[i] & 0xFF);
+            }
+            try {
+
+                JSONObject object = new JSONObject(new String(buffer));
+                DebugTool.logInfo(TAG, "JSON: " + object.toString());
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+    /**
+     * If an app crashes the only way we can handle it being on the head unit is to send an unregister app interface rpc.
+     * This method should only be called when the router service recognizes the client is no longer valid
+     *
+     * @param sessionId session id that is currently being cleared from the module. It will be used to form the packet.
+     * @param version   the last known version this session was operating with
+     * @return a byte array that contains the full packet for an UnregisterAppInterface that can be written out to the transport
+     */
+    private byte[] createForceUnregisterApp(byte sessionId, byte version) {
+        UnregisterAppInterface request = new UnregisterAppInterface();
+        request.setCorrelationID(UNREGISTER_APP_INTERFACE_CORRELATION_ID);
+        request.format(null, true);
+        byte[] msgBytes = JsonRPCMarshaller.marshall(request, version);
+        ProtocolMessage pm = new ProtocolMessage();
+        pm.setData(msgBytes);
+        pm.setSessionID(sessionId);
+        pm.setMessageType(MessageType.RPC);
+        pm.setSessionType(SessionType.RPC);
+        pm.setFunctionID(FunctionID.getFunctionId(request.getFunctionName()));
+        pm.setCorrID(request.getCorrelationID());
+        if (request.getBulkData() != null)
+            pm.setBulkData(request.getBulkData());
+        byte[] data;
+        if (version > 1) { //If greater than v1 we need to include a binary frame header in the data before all the JSON starts
+            data = new byte[12 + pm.getJsonSize()];
+            BinaryFrameHeader binFrameHeader = SdlPacketFactory.createBinaryFrameHeader(pm.getRPCType(), pm.getFunctionID(), pm.getCorrID(), pm.getJsonSize());
+            System.arraycopy(binFrameHeader.assembleHeaderBytes(), 0, data, 0, 12);
+            System.arraycopy(pm.getData(), 0, data, 12, pm.getJsonSize());
+        } else {
+            data = pm.getData();
+        }
+
+        SdlPacket packet = new SdlPacket(version, false, SdlPacket.FRAME_TYPE_SINGLE, SdlPacket.SERVICE_TYPE_RPC, 0, sessionId, data.length, data.length + 100, data);
+        return packet.constructPacket();
+    }
+
+
     /**
      * Method for finding the next, highest priority write task from all connected apps.
+     *
      * @return the next task for writing out packets if one exists
      */
-	protected PacketWriteTask getNextTask(TransportType transportType){
-		final long currentTime = System.currentTimeMillis();
-		RegisteredApp priorityApp = null;
-		long currentPriority = -Long.MAX_VALUE, peekWeight;
-		synchronized(REGISTERED_APPS_LOCK){
-			PacketWriteTask peekTask;
-			for (RegisteredApp app : registeredApps.values()) {
-				peekTask = app.peekNextTask(transportType);
-				if(peekTask!=null){
-					peekWeight = peekTask.getWeight(currentTime);
-					//Log.v(TAG, "App " + app.appId +" has a task with weight "+ peekWeight);
-					if(peekWeight>currentPriority){
-						if(app.queuePaused){
-							app.notIt(transportType);//Reset the timer
-							continue;
-						}
-						if(priorityApp!=null){
-							priorityApp.notIt(transportType);
-						}
-						currentPriority = peekWeight;
-						priorityApp = app;
-					}
-				}
-			}
-			if(priorityApp!=null){
-				return priorityApp.getNextTask(transportType);
-			}
-		}
-		return null;
-	}
-	
-	private void initPingIntent(){
-		pingIntent = new Intent();  
-		pingIntent.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION);
-		pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_EXTRA, true);
-		pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_APP_PACKAGE, getBaseContext().getPackageName());
-		pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_CMP_NAME, new ComponentName(SdlRouterService.this, SdlRouterService.this.getClass()));
-		pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_PING, true);
-	}
-	
-	private void startClientPings(){
-		synchronized(this){
-			if(!isPrimaryTransportConnected()){ //If we aren't connected, bail
-				return;
-			}
-		if(isPingingClients){
-			DebugTool.logWarning(TAG, "Already pinging clients. Resting count");
-			synchronized(PING_COUNT_LOCK){
-				pingCount = 0;
-			}
-			return;
-		}
-		if(clientPingExecutor == null){
-			clientPingExecutor = Executors.newSingleThreadScheduledExecutor();
-		}
-		isPingingClients = true;
-		synchronized(PING_COUNT_LOCK){
-			pingCount = 0;
-		}
-
-		clientPingExecutor.scheduleAtFixedRate(new Runnable(){
-			List<ResolveInfo> sdlApps;
-			@Override
-			public void run() {
-				if(getPingCount()>=10){
-					DebugTool.logInfo(TAG, "Hit ping limit");
-					stopClientPings();
-					return;
-				}
-				if(pingIntent == null){
-					initPingIntent();
-				}
-
-				if(sdlApps == null){
-					sdlApps = getPackageManager().queryBroadcastReceivers(pingIntent, 0);
-				}
-
-				AndroidTools.sendExplicitBroadcast(getApplicationContext(), pingIntent, sdlApps);
-				synchronized(PING_COUNT_LOCK){
-					pingCount++;
-				}
-				
-			}
-		}, CLIENT_PING_DELAY, CLIENT_PING_DELAY, TimeUnit.MILLISECONDS); //Give a little delay for first call
-		}
-	}
-	
-	private int getPingCount(){
-		synchronized(PING_COUNT_LOCK){
-			return pingCount;
-		}
-	}
-	
-	private void stopClientPings(){
-		if(clientPingExecutor!=null && !clientPingExecutor.isShutdown()){
-			clientPingExecutor.shutdownNow();
-			clientPingExecutor = null;
-			isPingingClients = false;
-		}
-		pingIntent = null;
-	}
+    protected PacketWriteTask getNextTask(TransportType transportType) {
+        final long currentTime = System.currentTimeMillis();
+        RegisteredApp priorityApp = null;
+        long currentPriority = -Long.MAX_VALUE, peekWeight;
+        synchronized (REGISTERED_APPS_LOCK) {
+            PacketWriteTask peekTask;
+            for (RegisteredApp app : registeredApps.values()) {
+                peekTask = app.peekNextTask(transportType);
+                if (peekTask != null) {
+                    peekWeight = peekTask.getWeight(currentTime);
+                    //Log.v(TAG, "App " + app.appId +" has a task with weight "+ peekWeight);
+                    if (peekWeight > currentPriority) {
+                        if (app.queuePaused) {
+                            app.notIt(transportType);//Reset the timer
+                            continue;
+                        }
+                        if (priorityApp != null) {
+                            priorityApp.notIt(transportType);
+                        }
+                        currentPriority = peekWeight;
+                        priorityApp = app;
+                    }
+                }
+            }
+            if (priorityApp != null) {
+                return priorityApp.getNextTask(transportType);
+            }
+        }
+        return null;
+    }
+
+    private void initPingIntent() {
+        pingIntent = new Intent();
+        pingIntent.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION);
+        pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_EXTRA, true);
+        pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_APP_PACKAGE, getBaseContext().getPackageName());
+        pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_CMP_NAME, new ComponentName(SdlRouterService.this, SdlRouterService.this.getClass()));
+        pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_PING, true);
+    }
+
+    private void startClientPings() {
+        synchronized (this) {
+            if (!isPrimaryTransportConnected()) { //If we aren't connected, bail
+                return;
+            }
+            if (isPingingClients) {
+                DebugTool.logWarning(TAG, "Already pinging clients. Resting count");
+                synchronized (PING_COUNT_LOCK) {
+                    pingCount = 0;
+                }
+                return;
+            }
+            if (clientPingExecutor == null) {
+                clientPingExecutor = Executors.newSingleThreadScheduledExecutor();
+            }
+            isPingingClients = true;
+            synchronized (PING_COUNT_LOCK) {
+                pingCount = 0;
+            }
+
+            clientPingExecutor.scheduleAtFixedRate(new Runnable() {
+                List<ResolveInfo> sdlApps;
+
+                @Override
+                public void run() {
+                    if (getPingCount() >= 10) {
+                        DebugTool.logInfo(TAG, "Hit ping limit");
+                        stopClientPings();
+                        return;
+                    }
+                    if (pingIntent == null) {
+                        initPingIntent();
+                    }
+
+                    if (sdlApps == null) {
+                        sdlApps = getPackageManager().queryBroadcastReceivers(pingIntent, 0);
+                    }
+
+                    AndroidTools.sendExplicitBroadcast(getApplicationContext(), pingIntent, sdlApps);
+                    synchronized (PING_COUNT_LOCK) {
+                        pingCount++;
+                    }
+
+                }
+            }, CLIENT_PING_DELAY, CLIENT_PING_DELAY, TimeUnit.MILLISECONDS); //Give a little delay for first call
+        }
+    }
+
+    private int getPingCount() {
+        synchronized (PING_COUNT_LOCK) {
+            return pingCount;
+        }
+    }
+
+    private void stopClientPings() {
+        if (clientPingExecutor != null && !clientPingExecutor.isShutdown()) {
+            clientPingExecutor.shutdownNow();
+            clientPingExecutor = null;
+            isPingingClients = false;
+        }
+        pingIntent = null;
+    }
 
 	/* ****************************************************************************************************************************************
 	// **********************************************************   TINY CLASSES   ************************************************************
 	//*****************************************************************************************************************************************/
 
-	/**
-	 *This class enables us to compare two router services
-	 * from different apps and determine which is the newest
-	 * and therefore which one should be the one spun up.
-	 * @author Joey Grover
-	 * @deprecated Move to the new version checking system with meta-data
-	 *
-	 */
-	@SuppressWarnings({"DeprecatedIsStillUsed"})
-	@Deprecated
-	static class LocalRouterService implements Parcelable{
-		Intent launchIntent = null;
-		int version ;
-		final long timestamp;
-		ComponentName name;
-		
-		@SuppressWarnings("SameParameterValue")
-		private LocalRouterService(Intent intent, int version, long timeStamp, ComponentName name ){
-			this.launchIntent = intent;
-			this.version = version;
-			this.timestamp = timeStamp;
-			this.name = name;
-		}
-		/**
-		 * Check if input is newer than this version
-		 * @param service a reference to another possible router service that is in quesiton
-		 * @return if the supplied service is newer than this one
-		 */
-		public boolean isNewer(@SuppressWarnings("deprecation") LocalRouterService service){
-			if(service.version>this.version){
-				return true;
-			}else if(service.version == this.version){ //If we have the same version, we will use a timestamp
-				return service.timestamp<this.timestamp;
-			}
-			return false;
-		}
-		
-		@SuppressWarnings("BooleanMethodIsAlwaysInverted")
-		public boolean isEqual(@SuppressWarnings("deprecation") LocalRouterService service) {
-			return service != null && service.name != null && this.name != null && this.name.equals(service.name);
-		}
-
-		@Override
-		public String toString() {
-			StringBuilder build = new StringBuilder();
-			build.append("Intent action: ");
-			if(launchIntent!=null && launchIntent.getComponent() != null){
-				build.append(launchIntent.getComponent().getClassName());
-			}else if(name!=null){
-				build.append(name.getClassName());
-			}
-
-			build.append(" Version: ");
-			build.append(version);
-			build.append(" Timestamp: ");
-			build.append(timestamp);
-
-			return build.toString();
-		}
-		public LocalRouterService(Parcel p) {
-			this.version = p.readInt();
-			this.timestamp = p.readLong();
-			try {
-				this.launchIntent = p.readParcelable(Intent.class.getClassLoader());
-				this.name = p.readParcelable(ComponentName.class.getClassLoader());
-			}catch (Exception e){
-				// catch DexException
-			}
-		}
-
-		@Override
-		public int describeContents() {
-			return 0;
-		}
-
-		@Override
-		public void writeToParcel(Parcel dest, int flags) {
-			dest.writeInt(version);
-			dest.writeLong(timestamp);
-			dest.writeParcelable(launchIntent, 0);
-			dest.writeParcelable(name, 0);
-
-		}
-
-		@SuppressWarnings("deprecation")
-		public static final Parcelable.Creator<LocalRouterService> CREATOR = new Parcelable.Creator<LocalRouterService>() {
-			@SuppressWarnings("deprecation")
-			public LocalRouterService createFromParcel(Parcel in) {
-				//noinspection deprecation
-				return new LocalRouterService(in);
-			}
-
-			@SuppressWarnings("deprecation")
-			@Override
-			public LocalRouterService[] newArray(int size) {
-				//noinspection deprecation
-				return new LocalRouterService[size];
-			}
-
-		};
-
-	}
-
-
-	/**
-	 * This class helps keep track of all the different sessions established with the head unit
-	 * and to which app they belong to.
-	 * @author Joey Grover
-	 *
-	 */
-	@SuppressWarnings("Convert2Diamond")
-	class RegisteredApp {
-		protected static final int SEND_MESSAGE_SUCCESS 							= 0x00;
-		protected static final int SEND_MESSAGE_ERROR_MESSAGE_NULL 					= 0x01;
-		protected static final int SEND_MESSAGE_ERROR_MESSENGER_NULL 				= 0x02;
-		protected static final int SEND_MESSAGE_ERROR_MESSENGER_GENERIC_EXCEPTION 	= 0x03;
-		protected static final int SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT 		= 0x04;
-		
-		protected static final int PAUSE_TIME_FOR_QUEUE 							= 1500;
-
-		private final Object TRANSPORT_LOCK = new Object();
-
-		final String appId;
-		final Messenger messenger;
-		final Vector<Long> sessionIds;
-		final Vector<TransportType> awaitingSession;
-		final int routerMessagingVersion;
-
-		ByteAraryMessageAssembler buffer;
-		int priorityForBuffingMessage;
-		DeathRecipient deathNote = null;
-		//Packet queue vars
-		final ConcurrentHashMap<TransportType, PacketWriteTaskBlockingQueue> queues;
-		Handler queueWaitHandler;
-		Runnable queueWaitRunnable = null;
-		boolean queuePaused = false;
-
-		//Primary will always be first
-		final SparseArray<ArrayList<TransportType>> registeredTransports;
-		
-		/**
-		 * This is a simple class to hold onto a reference of a registered app.
-		 * @param appId the supplied id for this app that is attempting to register
-		 * @param routerMessagingVersion
-		 * @param messenger the specific messenger that is tied to this app
-		 */
-		public RegisteredApp(String appId, int routerMessagingVersion, Messenger messenger){
-			this.appId = appId;
-			this.messenger = messenger;
-			this.sessionIds = new Vector<Long>();
-			this.queues = new ConcurrentHashMap<>();
-			queueWaitHandler = new Handler();
-			registeredTransports = new SparseArray<ArrayList<TransportType>>();
-			awaitingSession = new Vector<>();
-			setDeathNote(); //messaging Version
-			this.routerMessagingVersion = routerMessagingVersion;
-		}
-
-		
-		/**
-		 * Closes this app properly. 
-		 */
-		public void close(){
-			clearDeathNote();
-			clearBuffer();
-			Collection<PacketWriteTaskBlockingQueue>  queueCollection = queues.values();
-			for(PacketWriteTaskBlockingQueue queue : queueCollection) {
-				if (queue != null) {
-					queue.clear();
-				}
-			}
-			queueCollection.clear();
-
-			if(queueWaitHandler!=null){
-				if(queueWaitRunnable!=null){
-					queueWaitHandler.removeCallbacks(queueWaitRunnable);
-				}
-				queueWaitHandler = null;
-			}
-		}
-		
-		public String getAppId() {
-			return appId;
-		}
+    /**
+     * This class enables us to compare two router services
+     * from different apps and determine which is the newest
+     * and therefore which one should be the one spun up.
+     *
+     * @author Joey Grover
+     * @deprecated Move to the new version checking system with meta-data
+     */
+    @SuppressWarnings({"DeprecatedIsStillUsed"})
+    @Deprecated
+    static class LocalRouterService implements Parcelable {
+        Intent launchIntent = null;
+        int version;
+        final long timestamp;
+        ComponentName name;
+
+        @SuppressWarnings("SameParameterValue")
+        private LocalRouterService(Intent intent, int version, long timeStamp, ComponentName name) {
+            this.launchIntent = intent;
+            this.version = version;
+            this.timestamp = timeStamp;
+            this.name = name;
+        }
+
+        /**
+         * Check if input is newer than this version
+         *
+         * @param service a reference to another possible router service that is in quesiton
+         * @return if the supplied service is newer than this one
+         */
+        public boolean isNewer(@SuppressWarnings("deprecation") LocalRouterService service) {
+            if (service.version > this.version) {
+                return true;
+            } else if (service.version == this.version) { //If we have the same version, we will use a timestamp
+                return service.timestamp < this.timestamp;
+            }
+            return false;
+        }
+
+        @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+        public boolean isEqual(@SuppressWarnings("deprecation") LocalRouterService service) {
+            return service != null && service.name != null && this.name != null && this.name.equals(service.name);
+        }
+
+        @Override
+        public String toString() {
+            StringBuilder build = new StringBuilder();
+            build.append("Intent action: ");
+            if (launchIntent != null && launchIntent.getComponent() != null) {
+                build.append(launchIntent.getComponent().getClassName());
+            } else if (name != null) {
+                build.append(name.getClassName());
+            }
+
+            build.append(" Version: ");
+            build.append(version);
+            build.append(" Timestamp: ");
+            build.append(timestamp);
+
+            return build.toString();
+        }
+
+        public LocalRouterService(Parcel p) {
+            this.version = p.readInt();
+            this.timestamp = p.readLong();
+            try {
+                this.launchIntent = p.readParcelable(Intent.class.getClassLoader());
+                this.name = p.readParcelable(ComponentName.class.getClassLoader());
+            } catch (Exception e) {
+                // catch DexException
+            }
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(version);
+            dest.writeLong(timestamp);
+            dest.writeParcelable(launchIntent, 0);
+            dest.writeParcelable(name, 0);
+
+        }
+
+        @SuppressWarnings("deprecation")
+        public static final Parcelable.Creator<LocalRouterService> CREATOR = new Parcelable.Creator<LocalRouterService>() {
+            @SuppressWarnings("deprecation")
+            public LocalRouterService createFromParcel(Parcel in) {
+                //noinspection deprecation
+                return new LocalRouterService(in);
+            }
+
+            @SuppressWarnings("deprecation")
+            @Override
+            public LocalRouterService[] newArray(int size) {
+                //noinspection deprecation
+                return new LocalRouterService[size];
+            }
+
+        };
+
+    }
+
+
+    /**
+     * This class helps keep track of all the different sessions established with the head unit
+     * and to which app they belong to.
+     *
+     * @author Joey Grover
+     */
+    @SuppressWarnings("Convert2Diamond")
+    class RegisteredApp {
+        protected static final int SEND_MESSAGE_SUCCESS = 0x00;
+        protected static final int SEND_MESSAGE_ERROR_MESSAGE_NULL = 0x01;
+        protected static final int SEND_MESSAGE_ERROR_MESSENGER_NULL = 0x02;
+        protected static final int SEND_MESSAGE_ERROR_MESSENGER_GENERIC_EXCEPTION = 0x03;
+        protected static final int SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT = 0x04;
+
+        protected static final int PAUSE_TIME_FOR_QUEUE = 1500;
+
+        private final Object TRANSPORT_LOCK = new Object();
+
+        final String appId;
+        final Messenger messenger;
+        final Vector<Long> sessionIds;
+        final Vector<TransportType> awaitingSession;
+        final int routerMessagingVersion;
+
+        ByteAraryMessageAssembler buffer;
+        int priorityForBuffingMessage;
+        DeathRecipient deathNote = null;
+        //Packet queue vars
+        final ConcurrentHashMap<TransportType, PacketWriteTaskBlockingQueue> queues;
+        Handler queueWaitHandler;
+        Runnable queueWaitRunnable = null;
+        boolean queuePaused = false;
+
+        //Primary will always be first
+        final SparseArray<ArrayList<TransportType>> registeredTransports;
+
+        /**
+         * This is a simple class to hold onto a reference of a registered app.
+         *
+         * @param appId                  the supplied id for this app that is attempting to register
+         * @param routerMessagingVersion
+         * @param messenger              the specific messenger that is tied to this app
+         */
+        public RegisteredApp(String appId, int routerMessagingVersion, Messenger messenger) {
+            this.appId = appId;
+            this.messenger = messenger;
+            this.sessionIds = new Vector<Long>();
+            this.queues = new ConcurrentHashMap<>();
+            queueWaitHandler = new Handler();
+            registeredTransports = new SparseArray<ArrayList<TransportType>>();
+            awaitingSession = new Vector<>();
+            setDeathNote(); //messaging Version
+            this.routerMessagingVersion = routerMessagingVersion;
+        }
+
+
+        /**
+         * Closes this app properly.
+         */
+        public void close() {
+            clearDeathNote();
+            clearBuffer();
+            Collection<PacketWriteTaskBlockingQueue> queueCollection = queues.values();
+            for (PacketWriteTaskBlockingQueue queue : queueCollection) {
+                if (queue != null) {
+                    queue.clear();
+                }
+            }
+            queueCollection.clear();
+
+            if (queueWaitHandler != null) {
+                if (queueWaitRunnable != null) {
+                    queueWaitHandler.removeCallbacks(queueWaitRunnable);
+                }
+                queueWaitHandler = null;
+            }
+        }
+
+        public String getAppId() {
+            return appId;
+        }
 
 		/*public long getAppId() {
 			return appId;
 		}*/
-		/**
-		 * This is a convenience variable and may not be used or useful in different protocols
-		 * @return a vector of all the session ids associated with this app
-		 */
-		public Vector<Long> getSessionIds() {
-			return sessionIds;
-		}
-		
-		/**
-		 * Returns the position of the desired object if it is contained in the vector. If not it will return -1.
-		 * @param id a session id value that is in question to be associated with this app
-		 * @return the index of the supplied session id or -1 if it is not associated with this app
-		 */
-		public int containsSessionId(long id){
-			return sessionIds.indexOf(id);
-		}
-		/**
-		 * This will remove a session from the session id list
-		 * @param sessionId the id of the session that should be removed
-		 * @return if the session was successfully removed, or false if the session id wasn't associated with this app.
-		 */
-		public boolean removeSession(Long sessionId){
-			int location = sessionIds.indexOf(sessionId);
-			if(location>=0){
-				Long removedSessionId = sessionIds.remove(location);
-				registeredTransports.remove(sessionId.intValue());
-				return removedSessionId != null;
-			}else{
-				return false;
-			}
-		}
-
-		/**
-		 * This method is to manually put a session id into the mapping. This method should be used with extreme caution and
-		 * only in certain cases when the sesion id needs to exist at a specific position in the mapping (overwriting a value)
-		 * @param position the position at which the session id should be placed
-		 * @param sessionId the session id that will be put into the specific position in the mapping
-		 * @throws ArrayIndexOutOfBoundsException if the position is outside of the current size of the sessionIds vector
-		 */
-		public void setSessionId(int position,long sessionId) throws ArrayIndexOutOfBoundsException {
-			this.sessionIds.set(position, sessionId);
-			synchronized (TRANSPORT_LOCK){
-				this.registeredTransports.put((int)sessionId, new ArrayList<TransportType>());
-			}
-		}
-		
-		public void clearSessionIds(){
-			this.sessionIds.clear();
-		}
-
-		public Vector<TransportType> getAwaitingSession() {
-			return awaitingSession;
-		}
-
-		protected void registerTransport(int sessionId, TransportType transportType){
-			synchronized (TRANSPORT_LOCK){
-				ArrayList<TransportType> transportTypes = this.registeredTransports.get(sessionId);
-				if(transportTypes!= null){
-					if(queues.get(transportType) == null){
-						queues.put(transportType, new PacketWriteTaskBlockingQueue());
-					}
-					transportTypes.add(transportType);
-					this.registeredTransports.put(sessionId,transportTypes);
-				}
-
-			}
-		}
-
-		/**
-		 *
-		 * @param sessionId the session id to find if a transport is registered. -1 for sessionId will
-		 *                  trigger a search through all sessions.
-		 * @param transportType the transport type to find if a transport is registered. If null is
-		 *                      passed, will return true for any transport being registered on
-		 * @return
-		 */
-		protected boolean isRegisteredOnTransport(int sessionId, TransportType transportType){
-			synchronized (TRANSPORT_LOCK){
-				if(this.registeredTransports.indexOfKey(sessionId) >= 0){
-					if(transportType == null){
-						return this.registeredTransports.get(sessionId).size() > 0;
-					}
-					return this.registeredTransports.get(sessionId).indexOf(transportType) >= 0;
-				}else if(sessionId < 0 ){
-
-					//Check if any session is registered on this transport
-					int numberOfSessions = registeredTransports.size();
-					ArrayList<TransportType> transportTypes;
-					for(int i = 0; i < numberOfSessions; i++){
-						transportTypes = registeredTransports.valueAt(i);
-						if(transportTypes != null) {
-							if(transportType == null && transportTypes.size() > 0){
-								return true;
-							}
-							for (TransportType type : transportTypes) {
-								if (type.equals(transportType)) {
-									return true;
-								}
-							}
-						}
-					}
-					return false;
-
-				}else{
-					return false;
-				}
-			}
-		}
-
-		protected List<TransportType> getTransportsForSession(int sessionId){
-			synchronized (TRANSPORT_LOCK){
-				if(this.registeredTransports.indexOfKey(sessionId) >= 0){
-					return this.registeredTransports.get(sessionId);
-				}else{
-					return null;
-				}
-			}
-		}
-
-		protected boolean unregisterTransport(int sessionId, @NonNull TransportType transportType){
-			if(queues != null && queues.containsKey(transportType)){
-				PacketWriteTaskBlockingQueue queue = queues.remove(transportType);
-				if(queue != null){
-					queue.clear();
-				}
-			}
-			synchronized (TRANSPORT_LOCK){
-				if(sessionId == -1){
-					int size = this.registeredTransports.size();
-					for(int i = 0; i <size; i++){
-						this.registeredTransports.valueAt(i).remove(transportType);
-					}
-					return true;
-				}else if(this.registeredTransports.indexOfKey(sessionId) >= 0){
-					return this.registeredTransports.get(sessionId).remove(transportType);
-				}else{
-					return false;
-				}
-			}
-
-		}
-
-		protected void unregisterAllTransports(int sessionId){
-			synchronized (TRANSPORT_LOCK){
-				if(this.registeredTransports.indexOfKey(sessionId) >= 0){
-					this.registeredTransports.get(sessionId).clear();
-				}else if(sessionId == -1){
-					int size = this.registeredTransports.size();
-					for(int i = 0; i <size; i++){
-						this.registeredTransports.valueAt(i).clear();
-					}
-				}
-			}
-		}
-
-
-		/**
-		 * This method will attempt to return a transport type that can be associated to this
-		 * registered app
-		 * @return
-		 */
-		private TransportType getCompatPrimaryTransport(){
-			if(this.registeredTransports != null && this.registeredTransports.size() > 0) {
-				List<TransportType> transportTypes = this.registeredTransports.valueAt(0);
-				if (transportTypes != null) {
-					if (transportTypes.get(0) != null) {
-						return transportTypes.get(0);
-					}
-				}
-			}
-
-			//No transport stored
-			if(bluetoothTransport != null && bluetoothTransport.isConnected()){
-				return TransportType.BLUETOOTH;
-			} else if(usbTransport!= null && usbTransport.isConnected()){
-				return TransportType.USB;
-			} else if(tcpTransport != null && tcpTransport.isConnected()){
-				return  TransportType.TCP;
-			}
-
-			return TransportType.BLUETOOTH;
-		}
-
-		@SuppressWarnings("SameReturnValue")
-		public boolean handleIncommingClientMessage(final Bundle receivedBundle){
-			int flags = receivedBundle.getInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_NONE);
-			TransportType transportType = TransportType.valueForString(receivedBundle.getString(TransportConstants.TRANSPORT_TYPE));
-			if(transportType == null){
-				synchronized (TRANSPORT_LOCK){
-					transportType = getCompatPrimaryTransport();
-				}
-				receivedBundle.putString(TransportConstants.TRANSPORT_TYPE, transportType.name());
-			}
-
-			if(flags!=TransportConstants.BYTES_TO_SEND_FLAG_NONE){
-				byte[] packet = receivedBundle.getByteArray(TransportConstants.BYTES_TO_SEND_EXTRA_NAME); 
-				if(flags == TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START){
-					this.priorityForBuffingMessage = receivedBundle.getInt(TransportConstants.PACKET_PRIORITY_COEFFICIENT,0);
-				}
-				handleMessage(flags, packet, transportType);
-			}else{
-				//Add the write task on the stack
-				PacketWriteTaskBlockingQueue queue = queues.get(transportType);
-				if(queue == null){	//TODO check to see if there is any better place to put this
-					queue = new PacketWriteTaskBlockingQueue();
-					queues.put(transportType,queue);
-				}
-				queue.add(new PacketWriteTask(receivedBundle));
-				if(packetWriteTaskMasterMap != null) {
-					PacketWriteTaskMaster packetWriteTaskMaster = packetWriteTaskMasterMap.get(transportType);
-					if (packetWriteTaskMaster != null) {
-						packetWriteTaskMaster.alert();
-					}
-				} //If this is null, it is likely the service is closing
-			}
-			return true;
-		}
-
-		public int sendMessage(Message message){
-			if(this.messenger == null){return SEND_MESSAGE_ERROR_MESSENGER_NULL;}
-			if(message == null){return SEND_MESSAGE_ERROR_MESSAGE_NULL;}
-			try {
-				this.messenger.send(message);
-				return SEND_MESSAGE_SUCCESS;
-			} catch (RemoteException e) {
-				e.printStackTrace();
-				if(e instanceof DeadObjectException){
-					return SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT;
-				}else{
-					return SEND_MESSAGE_ERROR_MESSENGER_GENERIC_EXCEPTION;
-				}
-			}
-		}
-
-		public void handleMessage(int flags, byte[] packet, TransportType transportType){
-			if(flags == TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START){
-				clearBuffer();
-				buffer = new ByteAraryMessageAssembler();
-				buffer.init();
-				buffer.setTransportType(transportType);
-			}
-			if(buffer != null){
-				if (!buffer.handleMessage(flags, packet)) { //If this returns false
-					DebugTool.logError(TAG, "Error handling bytes");
-				}
-				if (buffer.isFinished()) { //We are finished building the buffer so we should write the bytes out
-					byte[] bytes = buffer.getBytes();
-					PacketWriteTaskBlockingQueue queue = queues.get(transportType);
-					if (queue != null) {
-						queue.add(new PacketWriteTask(bytes, 0, bytes.length, this.priorityForBuffingMessage,transportType));
-						if(packetWriteTaskMasterMap != null) {
-							PacketWriteTaskMaster packetWriteTaskMaster = packetWriteTaskMasterMap.get(transportType);
-							if (packetWriteTaskMaster != null) {
-								packetWriteTaskMaster.alert();
-							}
-						}
-					}
-					buffer.close();
-				}
-			}
-		}
-		
-		protected PacketWriteTask peekNextTask(TransportType transportType){
-			PacketWriteTaskBlockingQueue queue = queues.get(transportType);
-			if(queue !=null){
-				return queue.peek();
-			}
-			return null;
-		}
-		
-		protected PacketWriteTask getNextTask(TransportType transportType){
-			PacketWriteTaskBlockingQueue queue = queues.get(transportType);
-			if(queue !=null){
-				return queue.poll();
-			}
-			return null;
-		}
-
-		/**
-		 * This will inform the local app object that it was not picked to have the highest priority. This will allow the user to continue to perform interactions
-		 * with the module and not be bogged down by large packet requests. 
-		 */
-		protected void notIt(final TransportType transportType){
-			PacketWriteTaskBlockingQueue queue = queues.get(transportType);
-			if(queue!=null && queue.peek().priorityCoefficient>0){ //If this has any sort of priority coefficient we want to make it wait. 
-				//Flag to wait
-				if(queueWaitHandler == null){
-					DebugTool.logError(TAG, "Unable to pause queue, handler was null");
-				}
-				if(queueWaitRunnable == null){
-					queueWaitRunnable = new Runnable(){
-
-						@Override
-						public void run() {
-							pauseQueue(false);
-							PacketWriteTaskMaster packetWriteTaskMaster = packetWriteTaskMasterMap.get(transportType);
-							if(packetWriteTaskMaster!=null){
-								packetWriteTaskMaster.alert();
-							}
-						}
-					};
-				}
-				if(queuePaused){
-					queueWaitHandler.removeCallbacks(queueWaitRunnable);
-				}
-				pauseQueue(queueWaitHandler.postDelayed(queueWaitRunnable, PAUSE_TIME_FOR_QUEUE));
-			}
-		}
-		private void pauseQueue(boolean paused){
-			this.queuePaused = paused;
-		}
-		protected void clearBuffer(){
-			if(buffer!=null){
-				buffer.close();
-				buffer = null;
-			}
-		}
-		
-		protected boolean setDeathNote(){
-			if(messenger!=null){
-				if(deathNote == null){
-					deathNote = new DeathRecipient(){
-						final Object deathLock = new Object();
-						@Override
-						public void binderDied() {
-							synchronized(deathLock){
-								DebugTool.logWarning(TAG, "Binder died for app " + RegisteredApp.this.appId);
-								if(messenger.getBinder()!=null){
-									messenger.getBinder().unlinkToDeath(this, 0);
-								}
-								removeAllSessionsForApp(RegisteredApp.this,true);
-								removeAppFromMap(RegisteredApp.this);
-								startClientPings();
-							}
-						}
-					};
-				}
-				try {
-					messenger.getBinder().linkToDeath(deathNote, 0);
-					return true;
-				} catch (RemoteException e) {
-					e.printStackTrace();
-					return false;
-				}
-			}
-			return false;
-		}
-		
-		protected boolean clearDeathNote() {
-			return messenger != null && messenger.getBinder() != null && deathNote != null && messenger.getBinder().unlinkToDeath(deathNote, 0);
-		}
-	}
-	
-	/**
-	 * A runnable task for writing out packets.
-	 * @author Joey Grover
-	 *
-	 */
-	public class PacketWriteTask implements Runnable{
-		private static final long DELAY_CONSTANT = 500; //250ms
-		private static final long SIZE_CONSTANT = 1000; //1kb
-		private static final long PRIORITY_COEF_CONSTANT = 500;
-		private static final int DELAY_COEF = 1;
-		private static final int SIZE_COEF = 1;
-		
-		private byte[] bytesToWrite;
-		private final int offset, size, priorityCoefficient;
-		private final long timestamp;
-		final Bundle receivedBundle;
-		TransportType transportType;
-
-		public PacketWriteTask(byte[] bytes, int offset, int size, int priorityCoefficient, TransportType transportType){
-			timestamp = System.currentTimeMillis();
-			bytesToWrite = bytes;
-			this.offset = offset;
-			this.size = size;
-			this.priorityCoefficient = priorityCoefficient;
-			receivedBundle = null;
-			this.transportType = transportType;
-		}
-		
-		public PacketWriteTask(Bundle bundle){
-			this.receivedBundle = bundle;
-			timestamp = System.currentTimeMillis();
-			bytesToWrite = bundle.getByteArray(TransportConstants.BYTES_TO_SEND_EXTRA_NAME); 
-			offset = bundle.getInt(TransportConstants.BYTES_TO_SEND_EXTRA_OFFSET, 0); //If nothing, start at the beginning of the array
-			size = bundle.getInt(TransportConstants.BYTES_TO_SEND_EXTRA_COUNT, bytesToWrite.length);  //In case there isn't anything just send the whole packet.
-			this.priorityCoefficient = bundle.getInt(TransportConstants.PACKET_PRIORITY_COEFFICIENT,0);
-			this.transportType = TransportType.valueForString(receivedBundle.getString(TransportConstants.TRANSPORT_TYPE));
-
-		}
-
-		protected void setTransportType(TransportType transportType){
-			this.transportType = transportType;
-		}
-
-		@Override
-		public void run() {
-			if(receivedBundle != null){
-				writeBytesToTransport(receivedBundle);
-			}else if(bytesToWrite !=null){
-				manuallyWriteBytes(this.transportType, bytesToWrite, offset, size);
-			}
-		}
-		
-		private long getWeight(long currentTime){ //Time waiting - size - priority_coef
-			return ((((currentTime-timestamp) + DELAY_CONSTANT) * DELAY_COEF ) - ((size -SIZE_CONSTANT) * SIZE_COEF) - (priorityCoefficient * PRIORITY_COEF_CONSTANT));
-		}
-	}
-	
-	/**
-	 * Extends thread to consume PacketWriteTasks in a priority queue fashion. It will attempt to look
-	 * at all apps serial queue of tasks and compare them
-	 * @author Joey Grover
-	 *
-	 */
-	private class PacketWriteTaskMaster extends Thread{
-		protected final  Object QUEUE_LOCK = new Object();
-		private boolean isHalted = false, isWaiting = false;
-		private TransportType transportType;
-
-		public PacketWriteTaskMaster(){
-			this.setName("PacketWriteTaskMaster");
-			this.setDaemon(true);
-		}
-		protected void setTransportType(TransportType transportType){
-			this.transportType = transportType;
-		}
-
-		@Override
-		public void run() {
-			while(!isHalted){
-				try{
-					PacketWriteTask task;
-					synchronized(QUEUE_LOCK){
-						task = getNextTask(transportType);
-						if(task != null){
-							task.run();
-						}else{
-							isWaiting = true;
-							QUEUE_LOCK.wait();
-							isWaiting = false;
-						}
-					}
-				}catch(InterruptedException e){
-					break;
-				}
-			}
-		}
-
-		private void alert(){
-			if(isWaiting){
-				synchronized(QUEUE_LOCK){
-					QUEUE_LOCK.notify();
-				}
-			}
-		}
-
-		private void close(){
-			this.isHalted = true;
-		}
-	}
-	
-	/**
-	 * Custom queue to prioritize packet write tasks based on their priority coefficient.<br> The queue is a doubly linked list.<br><br>
-	 * When a tasks is added to the queue, it will be evaluated using it's priority coefficient. If the coefficient is greater than 0, it will simply
-	 * be placed at the end of the queue. If the coefficient is equal to 0, the queue will begin to iterate at the head and work it's way back. Once it is found that the current 
-	 * tasks has a priority coefficient greater than 0, it will be placed right before that task. The idea is to keep a semi-serial queue but creates a priority that allows urgent
-	 * tasks such as UI related to skip near the front. However, it is assumed those tasks of higher priority should also be handled in a serial fashion.
-	 * 
-	 * @author Joey Grover
-	 *
-	 */
-	@SuppressWarnings("Convert2Diamond")
-	private class PacketWriteTaskBlockingQueue{
-		final class Node<E> {
-			final E item;
-			Node<E> prev;
-			Node<E> next;
-			Node(E item, Node<E> previous, Node<E> next) {
-				this.item = item;
-				this.prev = previous;
-				this.next = next;
-			}
-		}
-
-		private Node<PacketWriteTask> head;
-		private Node<PacketWriteTask> tail;
-
-		/**
-		 * This will take the given task and insert it at the tail of the queue
-		 * @param task the task to be inserted at the tail of the queue
-		 */
-		private void insertAtTail(PacketWriteTask task){
-			if (task == null){
-				throw new NullPointerException();
-			}
-			Node<PacketWriteTask> oldTail = tail;
-			Node<PacketWriteTask> newTail = new Node<PacketWriteTask>(task, oldTail, null);
-			tail = newTail;
-			if (head == null){
-				head = newTail;
-			}else{
-				oldTail.next = newTail;
-			}
-
-		}
-
-		/**
-		 * This will take the given task and insert it at the head of the queue
-		 * @param task the task to be inserted at the head of the queue
-		 */
-		private void insertAtHead(PacketWriteTask task){
-			if (task == null){
-				throw new NullPointerException();
-			}
-			Node<PacketWriteTask> oldHead = head;
-			Node<PacketWriteTask> newHead = new Node<PacketWriteTask>(task, null, oldHead);
-			head = newHead;
-			if (tail == null){
-				tail = newHead;
-			}else{
-				if(oldHead!=null){
-					oldHead.prev = newHead;
-				}
-			}
-		}
-
-		/**
-		 * Insert the task in the queue where it belongs
-		 * @param task the new PacketWriteTask that needs to be added to the queue to be handled
-		 */
-		 public void add(PacketWriteTask task){
-			synchronized(this){
-				if (task == null){
-					throw new NullPointerException();
-				}
-
-				//If we currently don't have anything in our queue
-				if(head == null || tail == null){
-					Node<PacketWriteTask> taskNode = new Node<PacketWriteTask>(task, head, tail);
-					head = taskNode;
-					tail = taskNode;
-				}else if(task.priorityCoefficient>0){ //If the  task is already a not high priority task, we just need to insert it at the tail
-					insertAtTail(task);
-				}else if(head.item.priorityCoefficient>0){ //If the head task is already a not high priority task, we just need to insert at head
-					insertAtHead(task);
-				}else{
-					if(tail.item.priorityCoefficient==0){ //Saves us from going through the entire list if all of these tasks are priority coef == 0
-						insertAtTail(task);
-						return;
-					}
-					Node<PacketWriteTask> currentPlace = head;
-					while(true){
-						if(currentPlace.item.priorityCoefficient==0){
-							if(currentPlace.next==null){
-								//We've reached the end of the list
-								insertAtTail(task);
-								return;
-							}else{
-								currentPlace = currentPlace.next;
-							}
-						}else{
-							//We've found where this task should be inserted
-							Node<PacketWriteTask> previous = currentPlace.prev;
-							Node<PacketWriteTask> taskNode = new Node<PacketWriteTask>(task, previous, currentPlace);
-							previous.next = taskNode;
-							currentPlace.prev = taskNode;
-							return;
-
-						}
-					}
-				}
-			}
-		 }
-
-		 /**
-		  * Peek at the current head of the queue
-		  * @return the task at the head of the queue but does not remove it from the queue
-		  */
-		 public PacketWriteTask peek(){
-			 synchronized(this){
-				 if(head == null){
-					 return null;
-				 }else{
-					 return head.item;
-				 }
-			 }
-		 }
-
-		 /**
-		  * Remove the head of the queue
-		  * @return the old head of the queue
-		  */
-		 public PacketWriteTask poll(){
-			 synchronized(this){
-				 if(head == null){
-					 return null;
-				 }else{
-					 Node<PacketWriteTask> retValNode = head;
-					 Node<PacketWriteTask> newHead = head.next;
-					 if(newHead == null){
-						 tail = null;
-					 }
-					 head = newHead;
-
-					 return retValNode.item;
-				 }
-			 }
-		 }
-
-		 /**
-		  * Currently only clears the head and the tail of the queue.
-		  */
-		 public void clear(){
-			 //Should probably go through the linked list and clear elements, but gc should clear them out automatically. 
-			 head = null;
-			 tail = null;
-		 }
-	}
-
-	/**
-	 * notifySppError: utilize notification channel to notify the SPP out-of-resource error.
-	 */
-	@TargetApi(11)
-	@SuppressLint("NewApi")
-	private void notifySppError() {
-		Notification.Builder builder;
-		if(android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.O){
-			builder = new Notification.Builder(getApplicationContext());
-		} else {
-			builder = new Notification.Builder(getApplicationContext(), TransportConstants.SDL_ERROR_NOTIFICATION_CHANNEL_ID);
-		}
-		ComponentName name = new ComponentName(this, this.getClass());
-		if(0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)) { //If we are in debug mode, include what app has the router service open
-			builder.setContentTitle("SDL: " + name.getPackageName());
-		} else {
-			builder.setContentTitle(getString(R.string.notification_title));
-		}
-		builder.setTicker(getString(R.string.sdl_error_notification_channel_name));
-		builder.setContentText(getString(R.string.spp_out_of_resource));
-
-		//We should use icon from library resources if available
-		int trayId = getResources().getIdentifier("sdl_tray_icon", "drawable", getPackageName());
-
-		builder.setSmallIcon(trayId);
-		Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.spp_error);
-		builder.setLargeIcon(icon);
-
-		builder.setOngoing(false);
-
-		DebugTool.logError(TAG, "Notification: notifySppError entering");
-		final String tag = "SDL";
-		//Now we need to add a notification channel
-		final NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-		if (notificationManager != null) {
-			notificationManager.cancel(tag, TransportConstants.SDL_ERROR_NOTIFICATION_CHANNEL_ID_INT);
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				NotificationChannel notificationChannel = new NotificationChannel(TransportConstants.SDL_ERROR_NOTIFICATION_CHANNEL_ID, getString(R.string.sdl_error_notification_channel_name), NotificationManager.IMPORTANCE_HIGH);
-				notificationChannel.enableLights(true);
-				notificationChannel.enableVibration(true);
-				notificationChannel.setShowBadge(false);
-				notificationManager.createNotificationChannel(notificationChannel);
-				builder.setChannelId(notificationChannel.getId());
-			}
-			Notification notification = builder.build();
-			notificationManager.notify(tag, TransportConstants.SDL_ERROR_NOTIFICATION_CHANNEL_ID_INT, notification);
-		} else {
-			DebugTool.logError(TAG, "notifySppError: Unable to retrieve notification Manager service");
-		}
-	}
+
+        /**
+         * This is a convenience variable and may not be used or useful in different protocols
+         *
+         * @return a vector of all the session ids associated with this app
+         */
+        public Vector<Long> getSessionIds() {
+            return sessionIds;
+        }
+
+        /**
+         * Returns the position of the desired object if it is contained in the vector. If not it will return -1.
+         *
+         * @param id a session id value that is in question to be associated with this app
+         * @return the index of the supplied session id or -1 if it is not associated with this app
+         */
+        public int containsSessionId(long id) {
+            return sessionIds.indexOf(id);
+        }
+
+        /**
+         * This will remove a session from the session id list
+         *
+         * @param sessionId the id of the session that should be removed
+         * @return if the session was successfully removed, or false if the session id wasn't associated with this app.
+         */
+        public boolean removeSession(Long sessionId) {
+            int location = sessionIds.indexOf(sessionId);
+            if (location >= 0) {
+                Long removedSessionId = sessionIds.remove(location);
+                registeredTransports.remove(sessionId.intValue());
+                return removedSessionId != null;
+            } else {
+                return false;
+            }
+        }
+
+        /**
+         * This method is to manually put a session id into the mapping. This method should be used with extreme caution and
+         * only in certain cases when the sesion id needs to exist at a specific position in the mapping (overwriting a value)
+         *
+         * @param position  the position at which the session id should be placed
+         * @param sessionId the session id that will be put into the specific position in the mapping
+         * @throws ArrayIndexOutOfBoundsException if the position is outside of the current size of the sessionIds vector
+         */
+        public void setSessionId(int position, long sessionId) throws ArrayIndexOutOfBoundsException {
+            this.sessionIds.set(position, sessionId);
+            synchronized (TRANSPORT_LOCK) {
+                this.registeredTransports.put((int) sessionId, new ArrayList<TransportType>());
+            }
+        }
+
+        public void clearSessionIds() {
+            this.sessionIds.clear();
+        }
+
+        public Vector<TransportType> getAwaitingSession() {
+            return awaitingSession;
+        }
+
+        protected void registerTransport(int sessionId, TransportType transportType) {
+            synchronized (TRANSPORT_LOCK) {
+                ArrayList<TransportType> transportTypes = this.registeredTransports.get(sessionId);
+                if (transportTypes != null) {
+                    if (queues.get(transportType) == null) {
+                        queues.put(transportType, new PacketWriteTaskBlockingQueue());
+                    }
+                    transportTypes.add(transportType);
+                    this.registeredTransports.put(sessionId, transportTypes);
+                }
+
+            }
+        }
+
+        /**
+         * @param sessionId     the session id to find if a transport is registered. -1 for sessionId will
+         *                      trigger a search through all sessions.
+         * @param transportType the transport type to find if a transport is registered. If null is
+         *                      passed, will return true for any transport being registered on
+         * @return
+         */
+        protected boolean isRegisteredOnTransport(int sessionId, TransportType transportType) {
+            synchronized (TRANSPORT_LOCK) {
+                if (this.registeredTransports.indexOfKey(sessionId) >= 0) {
+                    if (transportType == null) {
+                        return this.registeredTransports.get(sessionId).size() > 0;
+                    }
+                    return this.registeredTransports.get(sessionId).indexOf(transportType) >= 0;
+                } else if (sessionId < 0) {
+
+                    //Check if any session is registered on this transport
+                    int numberOfSessions = registeredTransports.size();
+                    ArrayList<TransportType> transportTypes;
+                    for (int i = 0; i < numberOfSessions; i++) {
+                        transportTypes = registeredTransports.valueAt(i);
+                        if (transportTypes != null) {
+                            if (transportType == null && transportTypes.size() > 0) {
+                                return true;
+                            }
+                            for (TransportType type : transportTypes) {
+                                if (type.equals(transportType)) {
+                                    return true;
+                                }
+                            }
+                        }
+                    }
+                    return false;
+
+                } else {
+                    return false;
+                }
+            }
+        }
+
+        protected List<TransportType> getTransportsForSession(int sessionId) {
+            synchronized (TRANSPORT_LOCK) {
+                if (this.registeredTransports.indexOfKey(sessionId) >= 0) {
+                    return this.registeredTransports.get(sessionId);
+                } else {
+                    return null;
+                }
+            }
+        }
+
+        protected boolean unregisterTransport(int sessionId, @NonNull TransportType transportType) {
+            if (queues != null && queues.containsKey(transportType)) {
+                PacketWriteTaskBlockingQueue queue = queues.remove(transportType);
+                if (queue != null) {
+                    queue.clear();
+                }
+            }
+            synchronized (TRANSPORT_LOCK) {
+                if (sessionId == -1) {
+                    int size = this.registeredTransports.size();
+                    for (int i = 0; i < size; i++) {
+                        this.registeredTransports.valueAt(i).remove(transportType);
+                    }
+                    return true;
+                } else if (this.registeredTransports.indexOfKey(sessionId) >= 0) {
+                    return this.registeredTransports.get(sessionId).remove(transportType);
+                } else {
+                    return false;
+                }
+            }
+
+        }
+
+        protected void unregisterAllTransports(int sessionId) {
+            synchronized (TRANSPORT_LOCK) {
+                if (this.registeredTransports.indexOfKey(sessionId) >= 0) {
+                    this.registeredTransports.get(sessionId).clear();
+                } else if (sessionId == -1) {
+                    int size = this.registeredTransports.size();
+                    for (int i = 0; i < size; i++) {
+                        this.registeredTransports.valueAt(i).clear();
+                    }
+                }
+            }
+        }
+
+
+        /**
+         * This method will attempt to return a transport type that can be associated to this
+         * registered app
+         *
+         * @return
+         */
+        private TransportType getCompatPrimaryTransport() {
+            if (this.registeredTransports != null && this.registeredTransports.size() > 0) {
+                List<TransportType> transportTypes = this.registeredTransports.valueAt(0);
+                if (transportTypes != null) {
+                    if (transportTypes.get(0) != null) {
+                        return transportTypes.get(0);
+                    }
+                }
+            }
+
+            //No transport stored
+            if (bluetoothTransport != null && bluetoothTransport.isConnected()) {
+                return TransportType.BLUETOOTH;
+            } else if (usbTransport != null && usbTransport.isConnected()) {
+                return TransportType.USB;
+            } else if (tcpTransport != null && tcpTransport.isConnected()) {
+                return TransportType.TCP;
+            }
+
+            return TransportType.BLUETOOTH;
+        }
+
+        @SuppressWarnings("SameReturnValue")
+        public boolean handleIncommingClientMessage(final Bundle receivedBundle) {
+            int flags = receivedBundle.getInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_NONE);
+            TransportType transportType = TransportType.valueForString(receivedBundle.getString(TransportConstants.TRANSPORT_TYPE));
+            if (transportType == null) {
+                synchronized (TRANSPORT_LOCK) {
+                    transportType = getCompatPrimaryTransport();
+                }
+                receivedBundle.putString(TransportConstants.TRANSPORT_TYPE, transportType.name());
+            }
+
+            if (flags != TransportConstants.BYTES_TO_SEND_FLAG_NONE) {
+                byte[] packet = receivedBundle.getByteArray(TransportConstants.BYTES_TO_SEND_EXTRA_NAME);
+                if (flags == TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START) {
+                    this.priorityForBuffingMessage = receivedBundle.getInt(TransportConstants.PACKET_PRIORITY_COEFFICIENT, 0);
+                }
+                handleMessage(flags, packet, transportType);
+            } else {
+                //Add the write task on the stack
+                PacketWriteTaskBlockingQueue queue = queues.get(transportType);
+                if (queue == null) {    //TODO check to see if there is any better place to put this
+                    queue = new PacketWriteTaskBlockingQueue();
+                    queues.put(transportType, queue);
+                }
+                queue.add(new PacketWriteTask(receivedBundle));
+                if (packetWriteTaskMasterMap != null) {
+                    PacketWriteTaskMaster packetWriteTaskMaster = packetWriteTaskMasterMap.get(transportType);
+                    if (packetWriteTaskMaster != null) {
+                        packetWriteTaskMaster.alert();
+                    }
+                } //If this is null, it is likely the service is closing
+            }
+            return true;
+        }
+
+        public int sendMessage(Message message) {
+            if (this.messenger == null) {
+                return SEND_MESSAGE_ERROR_MESSENGER_NULL;
+            }
+            if (message == null) {
+                return SEND_MESSAGE_ERROR_MESSAGE_NULL;
+            }
+            try {
+                this.messenger.send(message);
+                return SEND_MESSAGE_SUCCESS;
+            } catch (RemoteException e) {
+                e.printStackTrace();
+                if (e instanceof DeadObjectException) {
+                    return SEND_MESSAGE_ERROR_MESSENGER_DEAD_OBJECT;
+                } else {
+                    return SEND_MESSAGE_ERROR_MESSENGER_GENERIC_EXCEPTION;
+                }
+            }
+        }
+
+        public void handleMessage(int flags, byte[] packet, TransportType transportType) {
+            if (flags == TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START) {
+                clearBuffer();
+                buffer = new ByteAraryMessageAssembler();
+                buffer.init();
+                buffer.setTransportType(transportType);
+            }
+            if (buffer != null) {
+                if (!buffer.handleMessage(flags, packet)) { //If this returns false
+                    DebugTool.logError(TAG, "Error handling bytes");
+                }
+                if (buffer.isFinished()) { //We are finished building the buffer so we should write the bytes out
+                    byte[] bytes = buffer.getBytes();
+                    PacketWriteTaskBlockingQueue queue = queues.get(transportType);
+                    if (queue != null) {
+                        queue.add(new PacketWriteTask(bytes, 0, bytes.length, this.priorityForBuffingMessage, transportType));
+                        if (packetWriteTaskMasterMap != null) {
+                            PacketWriteTaskMaster packetWriteTaskMaster = packetWriteTaskMasterMap.get(transportType);
+                            if (packetWriteTaskMaster != null) {
+                                packetWriteTaskMaster.alert();
+                            }
+                        }
+                    }
+                    buffer.close();
+                }
+            }
+        }
+
+        protected PacketWriteTask peekNextTask(TransportType transportType) {
+            PacketWriteTaskBlockingQueue queue = queues.get(transportType);
+            if (queue != null) {
+                return queue.peek();
+            }
+            return null;
+        }
+
+        protected PacketWriteTask getNextTask(TransportType transportType) {
+            PacketWriteTaskBlockingQueue queue = queues.get(transportType);
+            if (queue != null) {
+                return queue.poll();
+            }
+            return null;
+        }
+
+        /**
+         * This will inform the local app object that it was not picked to have the highest priority. This will allow the user to continue to perform interactions
+         * with the module and not be bogged down by large packet requests.
+         */
+        protected void notIt(final TransportType transportType) {
+            PacketWriteTaskBlockingQueue queue = queues.get(transportType);
+            if (queue != null && queue.peek().priorityCoefficient > 0) { //If this has any sort of priority coefficient we want to make it wait.
+                //Flag to wait
+                if (queueWaitHandler == null) {
+                    DebugTool.logError(TAG, "Unable to pause queue, handler was null");
+                }
+                if (queueWaitRunnable == null) {
+                    queueWaitRunnable = new Runnable() {
+
+                        @Override
+                        public void run() {
+                            pauseQueue(false);
+                            PacketWriteTaskMaster packetWriteTaskMaster = packetWriteTaskMasterMap.get(transportType);
+                            if (packetWriteTaskMaster != null) {
+                                packetWriteTaskMaster.alert();
+                            }
+                        }
+                    };
+                }
+                if (queuePaused) {
+                    queueWaitHandler.removeCallbacks(queueWaitRunnable);
+                }
+                pauseQueue(queueWaitHandler.postDelayed(queueWaitRunnable, PAUSE_TIME_FOR_QUEUE));
+            }
+        }
+
+        private void pauseQueue(boolean paused) {
+            this.queuePaused = paused;
+        }
+
+        protected void clearBuffer() {
+            if (buffer != null) {
+                buffer.close();
+                buffer = null;
+            }
+        }
+
+        protected boolean setDeathNote() {
+            if (messenger != null) {
+                if (deathNote == null) {
+                    deathNote = new DeathRecipient() {
+                        final Object deathLock = new Object();
+
+                        @Override
+                        public void binderDied() {
+                            synchronized (deathLock) {
+                                DebugTool.logWarning(TAG, "Binder died for app " + RegisteredApp.this.appId);
+                                if (messenger.getBinder() != null) {
+                                    messenger.getBinder().unlinkToDeath(this, 0);
+                                }
+                                removeAllSessionsForApp(RegisteredApp.this, true);
+                                removeAppFromMap(RegisteredApp.this);
+                                startClientPings();
+                            }
+                        }
+                    };
+                }
+                try {
+                    messenger.getBinder().linkToDeath(deathNote, 0);
+                    return true;
+                } catch (RemoteException e) {
+                    e.printStackTrace();
+                    return false;
+                }
+            }
+            return false;
+        }
+
+        protected boolean clearDeathNote() {
+            return messenger != null && messenger.getBinder() != null && deathNote != null && messenger.getBinder().unlinkToDeath(deathNote, 0);
+        }
+    }
+
+    /**
+     * A runnable task for writing out packets.
+     *
+     * @author Joey Grover
+     */
+    public class PacketWriteTask implements Runnable {
+        private static final long DELAY_CONSTANT = 500; //250ms
+        private static final long SIZE_CONSTANT = 1000; //1kb
+        private static final long PRIORITY_COEF_CONSTANT = 500;
+        private static final int DELAY_COEF = 1;
+        private static final int SIZE_COEF = 1;
+
+        private byte[] bytesToWrite;
+        private final int offset, size, priorityCoefficient;
+        private final long timestamp;
+        final Bundle receivedBundle;
+        TransportType transportType;
+
+        public PacketWriteTask(byte[] bytes, int offset, int size, int priorityCoefficient, TransportType transportType) {
+            timestamp = System.currentTimeMillis();
+            bytesToWrite = bytes;
+            this.offset = offset;
+            this.size = size;
+            this.priorityCoefficient = priorityCoefficient;
+            receivedBundle = null;
+            this.transportType = transportType;
+        }
+
+        public PacketWriteTask(Bundle bundle) {
+            this.receivedBundle = bundle;
+            timestamp = System.currentTimeMillis();
+            bytesToWrite = bundle.getByteArray(TransportConstants.BYTES_TO_SEND_EXTRA_NAME);
+            offset = bundle.getInt(TransportConstants.BYTES_TO_SEND_EXTRA_OFFSET, 0); //If nothing, start at the beginning of the array
+            size = bundle.getInt(TransportConstants.BYTES_TO_SEND_EXTRA_COUNT, bytesToWrite.length);  //In case there isn't anything just send the whole packet.
+            this.priorityCoefficient = bundle.getInt(TransportConstants.PACKET_PRIORITY_COEFFICIENT, 0);
+            this.transportType = TransportType.valueForString(receivedBundle.getString(TransportConstants.TRANSPORT_TYPE));
+
+        }
+
+        protected void setTransportType(TransportType transportType) {
+            this.transportType = transportType;
+        }
+
+        @Override
+        public void run() {
+            if (receivedBundle != null) {
+                writeBytesToTransport(receivedBundle);
+            } else if (bytesToWrite != null) {
+                manuallyWriteBytes(this.transportType, bytesToWrite, offset, size);
+            }
+        }
+
+        private long getWeight(long currentTime) { //Time waiting - size - priority_coef
+            return ((((currentTime - timestamp) + DELAY_CONSTANT) * DELAY_COEF) - ((size - SIZE_CONSTANT) * SIZE_COEF) - (priorityCoefficient * PRIORITY_COEF_CONSTANT));
+        }
+    }
+
+    /**
+     * Extends thread to consume PacketWriteTasks in a priority queue fashion. It will attempt to look
+     * at all apps serial queue of tasks and compare them
+     *
+     * @author Joey Grover
+     */
+    private class PacketWriteTaskMaster extends Thread {
+        protected final Object QUEUE_LOCK = new Object();
+        private boolean isHalted = false, isWaiting = false;
+        private TransportType transportType;
+
+        public PacketWriteTaskMaster() {
+            this.setName("PacketWriteTaskMaster");
+            this.setDaemon(true);
+        }
+
+        protected void setTransportType(TransportType transportType) {
+            this.transportType = transportType;
+        }
+
+        @Override
+        public void run() {
+            while (!isHalted) {
+                try {
+                    PacketWriteTask task;
+                    synchronized (QUEUE_LOCK) {
+                        task = getNextTask(transportType);
+                        if (task != null) {
+                            task.run();
+                        } else {
+                            isWaiting = true;
+                            QUEUE_LOCK.wait();
+                            isWaiting = false;
+                        }
+                    }
+                } catch (InterruptedException e) {
+                    break;
+                }
+            }
+        }
+
+        private void alert() {
+            if (isWaiting) {
+                synchronized (QUEUE_LOCK) {
+                    QUEUE_LOCK.notify();
+                }
+            }
+        }
+
+        private void close() {
+            this.isHalted = true;
+        }
+    }
+
+    /**
+     * Custom queue to prioritize packet write tasks based on their priority coefficient.<br> The queue is a doubly linked list.<br><br>
+     * When a tasks is added to the queue, it will be evaluated using it's priority coefficient. If the coefficient is greater than 0, it will simply
+     * be placed at the end of the queue. If the coefficient is equal to 0, the queue will begin to iterate at the head and work it's way back. Once it is found that the current
+     * tasks has a priority coefficient greater than 0, it will be placed right before that task. The idea is to keep a semi-serial queue but creates a priority that allows urgent
+     * tasks such as UI related to skip near the front. However, it is assumed those tasks of higher priority should also be handled in a serial fashion.
+     *
+     * @author Joey Grover
+     */
+    @SuppressWarnings("Convert2Diamond")
+    private class PacketWriteTaskBlockingQueue {
+        final class Node<E> {
+            final E item;
+            Node<E> prev;
+            Node<E> next;
+
+            Node(E item, Node<E> previous, Node<E> next) {
+                this.item = item;
+                this.prev = previous;
+                this.next = next;
+            }
+        }
+
+        private Node<PacketWriteTask> head;
+        private Node<PacketWriteTask> tail;
+
+        /**
+         * This will take the given task and insert it at the tail of the queue
+         *
+         * @param task the task to be inserted at the tail of the queue
+         */
+        private void insertAtTail(PacketWriteTask task) {
+            if (task == null) {
+                throw new NullPointerException();
+            }
+            Node<PacketWriteTask> oldTail = tail;
+            Node<PacketWriteTask> newTail = new Node<PacketWriteTask>(task, oldTail, null);
+            tail = newTail;
+            if (head == null) {
+                head = newTail;
+            } else {
+                oldTail.next = newTail;
+            }
+
+        }
+
+        /**
+         * This will take the given task and insert it at the head of the queue
+         *
+         * @param task the task to be inserted at the head of the queue
+         */
+        private void insertAtHead(PacketWriteTask task) {
+            if (task == null) {
+                throw new NullPointerException();
+            }
+            Node<PacketWriteTask> oldHead = head;
+            Node<PacketWriteTask> newHead = new Node<PacketWriteTask>(task, null, oldHead);
+            head = newHead;
+            if (tail == null) {
+                tail = newHead;
+            } else {
+                if (oldHead != null) {
+                    oldHead.prev = newHead;
+                }
+            }
+        }
+
+        /**
+         * Insert the task in the queue where it belongs
+         *
+         * @param task the new PacketWriteTask that needs to be added to the queue to be handled
+         */
+        public void add(PacketWriteTask task) {
+            synchronized (this) {
+                if (task == null) {
+                    throw new NullPointerException();
+                }
+
+                //If we currently don't have anything in our queue
+                if (head == null || tail == null) {
+                    Node<PacketWriteTask> taskNode = new Node<PacketWriteTask>(task, head, tail);
+                    head = taskNode;
+                    tail = taskNode;
+                } else if (task.priorityCoefficient > 0) { //If the  task is already a not high priority task, we just need to insert it at the tail
+                    insertAtTail(task);
+                } else if (head.item.priorityCoefficient > 0) { //If the head task is already a not high priority task, we just need to insert at head
+                    insertAtHead(task);
+                } else {
+                    if (tail.item.priorityCoefficient == 0) { //Saves us from going through the entire list if all of these tasks are priority coef == 0
+                        insertAtTail(task);
+                        return;
+                    }
+                    Node<PacketWriteTask> currentPlace = head;
+                    while (true) {
+                        if (currentPlace.item.priorityCoefficient == 0) {
+                            if (currentPlace.next == null) {
+                                //We've reached the end of the list
+                                insertAtTail(task);
+                                return;
+                            } else {
+                                currentPlace = currentPlace.next;
+                            }
+                        } else {
+                            //We've found where this task should be inserted
+                            Node<PacketWriteTask> previous = currentPlace.prev;
+                            Node<PacketWriteTask> taskNode = new Node<PacketWriteTask>(task, previous, currentPlace);
+                            previous.next = taskNode;
+                            currentPlace.prev = taskNode;
+                            return;
+
+                        }
+                    }
+                }
+            }
+        }
+
+        /**
+         * Peek at the current head of the queue
+         *
+         * @return the task at the head of the queue but does not remove it from the queue
+         */
+        public PacketWriteTask peek() {
+            synchronized (this) {
+                if (head == null) {
+                    return null;
+                } else {
+                    return head.item;
+                }
+            }
+        }
+
+        /**
+         * Remove the head of the queue
+         *
+         * @return the old head of the queue
+         */
+        public PacketWriteTask poll() {
+            synchronized (this) {
+                if (head == null) {
+                    return null;
+                } else {
+                    Node<PacketWriteTask> retValNode = head;
+                    Node<PacketWriteTask> newHead = head.next;
+                    if (newHead == null) {
+                        tail = null;
+                    }
+                    head = newHead;
+
+                    return retValNode.item;
+                }
+            }
+        }
+
+        /**
+         * Currently only clears the head and the tail of the queue.
+         */
+        public void clear() {
+            //Should probably go through the linked list and clear elements, but gc should clear them out automatically.
+            head = null;
+            tail = null;
+        }
+    }
+
+    /**
+     * notifySppError: utilize notification channel to notify the SPP out-of-resource error.
+     */
+    @TargetApi(11)
+    @SuppressLint("NewApi")
+    private void notifySppError() {
+        Notification.Builder builder;
+        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            builder = new Notification.Builder(getApplicationContext());
+        } else {
+            builder = new Notification.Builder(getApplicationContext(), TransportConstants.SDL_ERROR_NOTIFICATION_CHANNEL_ID);
+        }
+        ComponentName name = new ComponentName(this, this.getClass());
+        if (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)) { //If we are in debug mode, include what app has the router service open
+            builder.setContentTitle("SDL: " + name.getPackageName());
+        } else {
+            builder.setContentTitle(getString(R.string.notification_title));
+        }
+        builder.setTicker(getString(R.string.sdl_error_notification_channel_name));
+        builder.setContentText(getString(R.string.spp_out_of_resource));
+
+        //We should use icon from library resources if available
+        int trayId = getResources().getIdentifier("sdl_tray_icon", "drawable", getPackageName());
+
+        builder.setSmallIcon(trayId);
+        Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.spp_error);
+        builder.setLargeIcon(icon);
+
+        builder.setOngoing(false);
+
+        DebugTool.logError(TAG, "Notification: notifySppError entering");
+        final String tag = "SDL";
+        //Now we need to add a notification channel
+        final NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        if (notificationManager != null) {
+            notificationManager.cancel(tag, TransportConstants.SDL_ERROR_NOTIFICATION_CHANNEL_ID_INT);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                NotificationChannel notificationChannel = new NotificationChannel(TransportConstants.SDL_ERROR_NOTIFICATION_CHANNEL_ID, getString(R.string.sdl_error_notification_channel_name), NotificationManager.IMPORTANCE_HIGH);
+                notificationChannel.enableLights(true);
+                notificationChannel.enableVibration(true);
+                notificationChannel.setShowBadge(false);
+                notificationManager.createNotificationChannel(notificationChannel);
+                builder.setChannelId(notificationChannel.getId());
+            }
+            Notification notification = builder.build();
+            notificationManager.notify(tag, TransportConstants.SDL_ERROR_NOTIFICATION_CHANNEL_ID_INT, notification);
+        } else {
+            DebugTool.logError(TAG, "notifySppError: Unable to retrieve notification Manager service");
+        }
+    }
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
index 0640017d5..b90a55684 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
@@ -52,141 +52,143 @@ import static com.smartdevicelink.transport.TransportConstants.FOREGROUND_EXTRA;
 
 public class SdlRouterStatusProvider {
 
-	private static final String TAG = "SdlRouterStateProvider";
-		
-	private Context context;
-	private boolean isBound = false;
-	ConnectedStatusCallback cb;
-	Messenger routerServiceMessenger = null;
-	private ComponentName routerService;
-	private int flags = 0;
-
-	final Messenger clientMessenger; 
-	
-	private final ServiceConnection routerConnection= new ServiceConnection() {
-
-		public void onServiceConnected(ComponentName className, IBinder service) {
-			DebugTool.logInfo(TAG, "Bound to service " + className.toString());
-			routerServiceMessenger = new Messenger(service);
-			isBound = true;
-			//So we just established our connection
-			//Register with router service
-			Message msg = Message.obtain();
-			msg.what = TransportConstants.ROUTER_STATUS_CONNECTED_STATE_REQUEST;
-			msg.arg1 = flags;
-			msg.replyTo = clientMessenger;
-			try {
-				routerServiceMessenger.send(msg);
-			} catch (RemoteException e) {
-				e.printStackTrace();
-				if(cb!=null){
-					cb.onConnectionStatusUpdate(false, routerService, context);
-				}
-			}			
-		}
-
-		public void onServiceDisconnected(ComponentName className) {
-			DebugTool.logInfo(TAG, "UN-Bound from service " + className.getClassName());
-			routerServiceMessenger = null;
-			isBound = false;
-		}
-	};
-
-	public SdlRouterStatusProvider(Context context, ComponentName service, ConnectedStatusCallback callback){
-		if(context == null || service == null || callback == null){
-			throw new IllegalStateException("Supplied params are not correct. Context == null? "+ (context==null) + " ComponentName == null? " + (service == null) + " ConnectedStatusListener == null? " + callback);
-		}
-		this.context = context;
-		this.routerService = service;
-		this.cb = callback;
-		this.clientMessenger = new Messenger(new ClientHandler(this));
-
-	}
-	public void setFlags(int flags){
-		this.flags = flags;
-	}
-	public void checkIsConnected(){
-		if(!AndroidTools.isServiceExported(context,routerService) || !bindToService()){
-			//We are unable to bind to service
-			cb.onConnectionStatusUpdate(false, routerService, context);
-			unBindFromService();
-		}
-	}
-	
-	public void cancel(){
-		if(isBound){
-			unBindFromService();
-		}
-	}
-
-	private boolean bindToService(){
-		if(isBound){
-			return true;
-		}
-		if(clientMessenger == null){
-			return false;
-		}
-		Intent bindingIntent = new Intent();
-		bindingIntent.setClassName(this.routerService.getPackageName(), this.routerService.getClassName());//This sets an explicit intent
-		//Quickly make sure it's just up and running
-		if(Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-			context.startService(bindingIntent);
-		}else {
-			bindingIntent.putExtra(FOREGROUND_EXTRA, true);
-			SdlBroadcastReceiver.setForegroundExceptionHandler(); //Prevent ANR in case the OS takes too long to start the service
-			context.startForegroundService(bindingIntent);
-
-		}
-		bindingIntent.setAction( TransportConstants.BIND_REQUEST_TYPE_STATUS);
-		return context.bindService(bindingIntent, routerConnection, Context.BIND_AUTO_CREATE);
-	}
-
-	private void unBindFromService(){
-		try{
-			if(context!=null && routerConnection!=null){
-				context.unbindService(routerConnection);
-			}else{
-				DebugTool.logWarning(TAG, "Unable to unbind from router service, context was null");
-			}
-			
-		}catch(IllegalArgumentException e){
-			//This is ok
-		}
-	}
-	
-	private void handleRouterStatusConnectedResponse(int connectedStatus){
-		if(cb!=null){
-			  cb.onConnectionStatusUpdate(connectedStatus == 1, routerService,context);
-		  }
-		  unBindFromService();
-		  routerServiceMessenger =null;
-	}
-	
-	static class ClientHandler extends Handler {
-		final WeakReference<SdlRouterStatusProvider> provider;
-
-		 public ClientHandler(SdlRouterStatusProvider provider){
-			 super(Looper.getMainLooper());
-			 this.provider = new WeakReference<>(provider);
-		 }
-		 
-    	@Override
+    private static final String TAG = "SdlRouterStateProvider";
+
+    private Context context;
+    private boolean isBound = false;
+    ConnectedStatusCallback cb;
+    Messenger routerServiceMessenger = null;
+    private ComponentName routerService;
+    private int flags = 0;
+
+    final Messenger clientMessenger;
+
+    private final ServiceConnection routerConnection = new ServiceConnection() {
+
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            DebugTool.logInfo(TAG, "Bound to service " + className.toString());
+            routerServiceMessenger = new Messenger(service);
+            isBound = true;
+            //So we just established our connection
+            //Register with router service
+            Message msg = Message.obtain();
+            msg.what = TransportConstants.ROUTER_STATUS_CONNECTED_STATE_REQUEST;
+            msg.arg1 = flags;
+            msg.replyTo = clientMessenger;
+            try {
+                routerServiceMessenger.send(msg);
+            } catch (RemoteException e) {
+                e.printStackTrace();
+                if (cb != null) {
+                    cb.onConnectionStatusUpdate(false, routerService, context);
+                }
+            }
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            DebugTool.logInfo(TAG, "UN-Bound from service " + className.getClassName());
+            routerServiceMessenger = null;
+            isBound = false;
+        }
+    };
+
+    public SdlRouterStatusProvider(Context context, ComponentName service, ConnectedStatusCallback callback) {
+        if (context == null || service == null || callback == null) {
+            throw new IllegalStateException("Supplied params are not correct. Context == null? " + (context == null) + " ComponentName == null? " + (service == null) + " ConnectedStatusListener == null? " + callback);
+        }
+        this.context = context;
+        this.routerService = service;
+        this.cb = callback;
+        this.clientMessenger = new Messenger(new ClientHandler(this));
+
+    }
+
+    public void setFlags(int flags) {
+        this.flags = flags;
+    }
+
+    public void checkIsConnected() {
+        if (!AndroidTools.isServiceExported(context, routerService) || !bindToService()) {
+            //We are unable to bind to service
+            cb.onConnectionStatusUpdate(false, routerService, context);
+            unBindFromService();
+        }
+    }
+
+    public void cancel() {
+        if (isBound) {
+            unBindFromService();
+        }
+    }
+
+    private boolean bindToService() {
+        if (isBound) {
+            return true;
+        }
+        if (clientMessenger == null) {
+            return false;
+        }
+        Intent bindingIntent = new Intent();
+        bindingIntent.setClassName(this.routerService.getPackageName(), this.routerService.getClassName());//This sets an explicit intent
+        //Quickly make sure it's just up and running
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            context.startService(bindingIntent);
+        } else {
+            bindingIntent.putExtra(FOREGROUND_EXTRA, true);
+            SdlBroadcastReceiver.setForegroundExceptionHandler(); //Prevent ANR in case the OS takes too long to start the service
+            context.startForegroundService(bindingIntent);
+
+        }
+        bindingIntent.setAction(TransportConstants.BIND_REQUEST_TYPE_STATUS);
+        return context.bindService(bindingIntent, routerConnection, Context.BIND_AUTO_CREATE);
+    }
+
+    private void unBindFromService() {
+        try {
+            if (context != null && routerConnection != null) {
+                context.unbindService(routerConnection);
+            } else {
+                DebugTool.logWarning(TAG, "Unable to unbind from router service, context was null");
+            }
+
+        } catch (IllegalArgumentException e) {
+            //This is ok
+        }
+    }
+
+    private void handleRouterStatusConnectedResponse(int connectedStatus) {
+        if (cb != null) {
+            cb.onConnectionStatusUpdate(connectedStatus == 1, routerService, context);
+        }
+        unBindFromService();
+        routerServiceMessenger = null;
+    }
+
+    static class ClientHandler extends Handler {
+        final WeakReference<SdlRouterStatusProvider> provider;
+
+        public ClientHandler(SdlRouterStatusProvider provider) {
+            super(Looper.getMainLooper());
+            this.provider = new WeakReference<>(provider);
+        }
+
+        @Override
         public void handleMessage(Message msg) {
-    		if(provider.get()==null){
-    			return; 
-    		}
-    		  switch (msg.what) {
-    		  case TransportConstants.ROUTER_STATUS_CONNECTED_STATE_RESPONSE:
-    			  provider.get().handleRouterStatusConnectedResponse(msg.arg1);
-    			  break;
-    		  default:
-    			  break;
-    		  }
-    	}
-	}
-	
-	public interface ConnectedStatusCallback{
-		void onConnectionStatusUpdate(boolean connected, ComponentName service, Context context);
-	}
-	
+            if (provider.get() == null) {
+                return;
+            }
+            switch (msg.what) {
+                case TransportConstants.ROUTER_STATUS_CONNECTED_STATE_RESPONSE:
+                    provider.get().handleRouterStatusConnectedResponse(msg.arg1);
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
+    public interface ConnectedStatusCallback {
+        void onConnectionStatusUpdate(boolean connected, ComponentName service, Context context);
+    }
+
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java
index 790aa0935..9043bfa22 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportConfig.java
@@ -1,52 +1,52 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.transport;

 

 import com.smartdevicelink.transport.enums.TransportType;

 

 /**

- * Container of TCP transport specific configuration. 

+ * Container of TCP transport specific configuration.

  */

 public final class TCPTransportConfig extends BaseTransportConfig {

-	

-	/**

-	 * Value of port to use in TCP connection.

-	 */

-	private final int mPort;

-	

-	/**

-	 * Value of IP address to use in TCP connection.

-	 */

-	private final String mIpAddress;

+

+    /**

+     * Value of port to use in TCP connection.

+     */

+    private final int mPort;

+

+    /**

+     * Value of IP address to use in TCP connection.

+     */

+    private final String mIpAddress;

 

     /**

      * Value of flag which is set to true if tcp connection must be automatically reestablished in case of disconnection

@@ -54,39 +54,40 @@ public final class TCPTransportConfig extends BaseTransportConfig {
     private final boolean mAutoReconnect;

 

     /**

-	 * Constructor. Objects of this class must be created for known port and IP address value.

-	 * 

-	 * @param port Port for TCP connection.

-	 * @param ipAddress IP address for TCP connection.

+     * Constructor. Objects of this class must be created for known port and IP address value.

+     *

+     * @param port          Port for TCP connection.

+     * @param ipAddress     IP address for TCP connection.

      * @param autoReconnect Flag which must be set to true if tcp connection must be automatically reestablished in

      *                      case of disconnection

-	 */

+     */

     public TCPTransportConfig(int port, String ipAddress, boolean autoReconnect) {

-		mPort = port;

-		mIpAddress = ipAddress;

+        mPort = port;

+        mIpAddress = ipAddress;

         mAutoReconnect = autoReconnect;

     }

-	

-	/**

-	 * Gets value of Port.

-	 * 

-	 * @return Port for TCP connection.

-	 */

-	public int getPort() {

-		return mPort;

-	}

-		

-	/**

-	 * Gets value of IP address.

-	 * 

-	 * @return IP address for TCP connection.

-	 */

-	public String getIPAddress() {

-		return mIpAddress;

-	}

+

+    /**

+     * Gets value of Port.

+     *

+     * @return Port for TCP connection.

+     */

+    public int getPort() {

+        return mPort;

+    }

+

+    /**

+     * Gets value of IP address.

+     *

+     * @return IP address for TCP connection.

+     */

+    public String getIPAddress() {

+        return mIpAddress;

+    }

 

     /**

      * Gets value of AutoReconnect

+     *

      * @return Flag that determines automatic reconnection

      */

     public boolean getAutoReconnect() {

@@ -94,15 +95,14 @@ public final class TCPTransportConfig extends BaseTransportConfig {
     }

 

     /**

-	 * Overridden abstract method which returns specific type of this transport configuration.

-	 * 

-	 * @return Constant value TransportType.TCP. 

-	 * 

-	 * @see TransportType

-	 */

-	public TransportType getTransportType() {

-		return TransportType.TCP;

-	}

+     * Overridden abstract method which returns specific type of this transport configuration.

+     *

+     * @return Constant value TransportType.TCP.

+     * @see TransportType

+     */

+    public TransportType getTransportType() {

+        return TransportType.TCP;

+    }

 

     @Override

     public String toString() {

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportManager.java
index 4381b97c6..bad7392eb 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransportManager.java
@@ -10,7 +10,7 @@ import com.smartdevicelink.util.DebugTool;
 
 import java.lang.ref.WeakReference;
 
-public class TCPTransportManager extends TransportManagerBase{
+public class TCPTransportManager extends TransportManagerBase {
 
     private static final String TAG = "TCPTransportManager";
 
@@ -18,12 +18,12 @@ public class TCPTransportManager extends TransportManagerBase{
     private MultiplexTcpTransport transport;
     private final TCPTransportConfig config;
 
-    public TCPTransportManager(TCPTransportConfig config, TransportEventListener transportEventListener){
-        super(config,transportEventListener);
+    public TCPTransportManager(TCPTransportConfig config, TransportEventListener transportEventListener) {
+        super(config, transportEventListener);
         DebugTool.logInfo(TAG, "USING THE TCP TRANSPORT MANAGER");
         this.config = config;
         tcpHandler = new TCPHandler(this);
-        transport = new MultiplexTcpTransport(config.getPort(), config.getIPAddress(),config.getAutoReconnect(),tcpHandler, null);
+        transport = new MultiplexTcpTransport(config.getPort(), config.getIPAddress(), config.getAutoReconnect(), tcpHandler, null);
     }
 
     @Override
@@ -39,11 +39,11 @@ public class TCPTransportManager extends TransportManagerBase{
 
     @Deprecated
     public void resetSession() {
-        if(transport != null){
+        if (transport != null) {
             transport.stop();
         }
         //TODO make sure this makes sense
-        transport = new MultiplexTcpTransport(config.getPort(), config.getIPAddress(),config.getAutoReconnect(), tcpHandler, null);
+        transport = new MultiplexTcpTransport(config.getPort(), config.getIPAddress(), config.getAutoReconnect(), tcpHandler, null);
 
     }
 
@@ -54,18 +54,18 @@ public class TCPTransportManager extends TransportManagerBase{
 
     @Override
     public TransportRecord getTransportRecord(TransportType transportType, String address) {
-        if(transport != null){
+        if (transport != null) {
             return transport.getTransportRecord();
-        }else{
+        } else {
             return null;
         }
     }
 
     @Override
     public void sendPacket(SdlPacket packet) {
-        if(packet != null){
+        if (packet != null) {
             byte[] rawBytes = packet.constructPacket();
-            if(rawBytes != null && rawBytes.length >0){
+            if (rawBytes != null && rawBytes.length > 0) {
                 transport.write(rawBytes, 0, rawBytes.length);
             }
         }
@@ -77,23 +77,24 @@ public class TCPTransportManager extends TransportManagerBase{
 
         final WeakReference<TCPTransportManager> provider;
 
-        public TCPHandler(TCPTransportManager provider){
+        public TCPHandler(TCPTransportManager provider) {
             this.provider = new WeakReference<>(provider);
         }
+
         @Override
         public void handleMessage(Message msg) {
-            if(this.provider.get() == null){
+            if (this.provider.get() == null) {
                 return;
             }
             TCPTransportManager service = this.provider.get();
-            if(service.transportListener == null){
+            if (service.transportListener == null) {
                 return;
             }
             switch (msg.what) {
                 case SdlRouterService.MESSAGE_STATE_CHANGE:
                     switch (msg.arg1) {
                         case MultiplexBaseTransport.STATE_CONNECTED:
-                            synchronized (service.TRANSPORT_STATUS_LOCK){
+                            synchronized (service.TRANSPORT_STATUS_LOCK) {
                                 service.transportStatus.clear();
                                 service.transportStatus.add(service.transport.getTransportRecord());
                             }
@@ -104,23 +105,23 @@ public class TCPTransportManager extends TransportManagerBase{
                             // Currently attempting to connect - update UI?
                             break;
                         case MultiplexBaseTransport.STATE_LISTEN:
-                            if(service.transport != null){
+                            if (service.transport != null) {
                                 service.transport.stop();
                                 service.transport = null;
                             }
                             break;
                         case MultiplexBaseTransport.STATE_NONE:
                             // We've just lost the connection
-                            if(service.transport != null){
+                            if (service.transport != null) {
                                 service.transportListener.onTransportDisconnected("TCP transport disconnected", service.transport.transportRecord, null);
-                            }else{
+                            } else {
                                 service.transportListener.onTransportDisconnected("TCP transport disconnected", null, null);
 
                             }
                             break;
                         case MultiplexBaseTransport.STATE_ERROR:
                             DebugTool.logInfo(TAG, "TCP transport encountered an error");
-                            service.transportListener.onError("TCP transport encountered an error" );
+                            service.transportListener.onError("TCP transport encountered an error");
                             break;
                     }
                     break;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
index dd887b6d4..52f718230 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
@@ -75,9 +75,11 @@ public class TransportBroker {
     private static final int MAX_MESSAGING_VERSION = 2;
     private static final int MIN_MESSAGING_VERSION = 1;
 
-    /** Version of the router service that supports the new additional transports (USB and TCP) */
+    /**
+     * Version of the router service that supports the new additional transports (USB and TCP)
+     */
     private static final int RS_MULTI_TRANSPORT_SUPPORT = 8;
-    private static final TransportRecord LEGACY_TRANSPORT_RECORD = new TransportRecord(TransportType.BLUETOOTH,null);
+    private static final TransportRecord LEGACY_TRANSPORT_RECORD = new TransportRecord(TransportType.BLUETOOTH, null);
 
     private final String WHERE_TO_REPLY_PREFIX = "com.sdl.android.";
     private final String appId;
@@ -244,7 +246,6 @@ public class TransportBroker {
                     }
 
 
-
                     break;
                 case TransportConstants.ROUTER_UNREGISTER_CLIENT_RESPONSE:
                     if (msg.arg1 == TransportConstants.UNREGISTRATION_RESPONSE_SUCESS) {
@@ -257,7 +258,7 @@ public class TransportBroker {
 
                     break;
                 case TransportConstants.ROUTER_RECEIVED_PACKET:
-                    if(bundle == null){
+                    if (bundle == null) {
                         DebugTool.logWarning(TAG, "Received packet message from router service with no bundle");
                         return;
                     }
@@ -270,7 +271,7 @@ public class TransportBroker {
                         if (flags == TransportConstants.BYTES_TO_SEND_FLAG_NONE) {
                             if (packet != null) { //Log.i(TAG, "received packet to process "+  packet.toString());
 
-                                if(packet.getTransportRecord() == null){
+                                if (packet.getTransportRecord() == null) {
                                     // If the transport record is null, one must be added
                                     // This is likely due to an older router service being used
                                     // in which only a bluetooth transport is available
@@ -313,7 +314,7 @@ public class TransportBroker {
                     }
                     break;
                 case TransportConstants.HARDWARE_CONNECTION_EVENT:
-                    if(bundle == null){
+                    if (bundle == null) {
                         DebugTool.logWarning(TAG, "Received hardware connection message from router service with no bundle");
                         return;
                     }
@@ -341,7 +342,7 @@ public class TransportBroker {
 
                     if (bundle.containsKey(TransportConstants.HARDWARE_CONNECTED) || bundle.containsKey(TransportConstants.CURRENT_HARDWARE_CONNECTED)) {
                         //This is a connection event
-                        handleConnectionEvent(bundle,broker);
+                        handleConnectionEvent(bundle, broker);
                         break;
                     }
                     break;
@@ -354,11 +355,12 @@ public class TransportBroker {
         /**
          * Handle a potential connection event. This will adapt legacy router service implementations
          * into the new multiple transport scheme.
+         *
          * @param bundle the received bundle from the router service
          * @param broker reference to the transport broker that this handler exists
          * @return if a connection event was triggered in the supplied broker
          */
-        private boolean handleConnectionEvent(Bundle bundle, TransportBroker broker){
+        private boolean handleConnectionEvent(Bundle bundle, TransportBroker broker) {
             if (broker.routerServiceVersion < RS_MULTI_TRANSPORT_SUPPORT) {
                 //Previous versions of the router service only supports a single
                 //transport, so this will be the only extra received
@@ -368,7 +370,7 @@ public class TransportBroker {
                     broker.onHardwareConnected(Collections.singletonList(LEGACY_TRANSPORT_RECORD));
                     return true;
                 }
-            } else{
+            } else {
                 //Router service supports multiple transport
 
                 if (bundle.containsKey(TransportConstants.CURRENT_HARDWARE_CONNECTED)) {
@@ -455,8 +457,8 @@ public class TransportBroker {
 
         } catch (Exception e) {
             //This is ok
-            DebugTool.logWarning(TAG, "Unable to unbind from router service. bound? " + isBound + " context? " + (getContext()!=null) + " router connection?" + (routerConnection != null));
-        }finally {
+            DebugTool.logWarning(TAG, "Unable to unbind from router service. bound? " + isBound + " context? " + (getContext() != null) + " router connection?" + (routerConnection != null));
+        } finally {
             isBound = false;
         }
     }
@@ -491,7 +493,7 @@ public class TransportBroker {
 
     }
 
-    protected int getRouterServiceVersion(){
+    protected int getRouterServiceVersion() {
         return routerServiceVersion;
     }
 
@@ -505,7 +507,7 @@ public class TransportBroker {
         if (packet == null
             //|| offset<0
             //|| count<0
-                ) {//|| count>(bytes.length-offset)){
+        ) {//|| count>(bytes.length-offset)){
             DebugTool.logWarning(TAG, whereToReply + "incorrect params supplied");
             return false;
         }
@@ -582,7 +584,7 @@ public class TransportBroker {
 
     @SuppressLint("InlinedApi")
     private boolean sendBindingIntent() {
-        if(this.isBound){
+        if (this.isBound) {
             DebugTool.logError(TAG, "Already bound");
             return false;
         }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
index 13edfb5f1..8dbbe1eef 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
@@ -55,7 +55,7 @@ import com.smartdevicelink.util.DebugTool;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
-public class TransportManager extends TransportManagerBase{
+public class TransportManager extends TransportManagerBase {
     private static final String TAG = "TransportManager";
 
     TransportBrokerImpl transport;
@@ -74,12 +74,12 @@ public class TransportManager extends TransportManagerBase{
      * If transport is not connected. Request Router service connect to it. Get connected message
      */
 
-    public TransportManager(MultiplexTransportConfig config, TransportEventListener listener){
-        super(config,listener);
+    public TransportManager(MultiplexTransportConfig config, TransportEventListener listener) {
+        super(config, listener);
 
         this.mConfig = config;
 
-        if(config.service == null) {
+        if (config.service == null) {
             config.service = SdlBroadcastReceiver.consumeQueuedRouterService();
         }
 
@@ -95,17 +95,17 @@ public class TransportManager extends TransportManagerBase{
         validator.validateAsync(new RouterServiceValidator.ValidationStatusCallback() {
             @Override
             public void onFinishedValidation(boolean valid, ComponentName name) {
-                DebugTool.logInfo(TAG, "onFinishedValidation valid=" + valid + "; name=" + ((name == null)? "null" : name.getPackageName()));
+                DebugTool.logInfo(TAG, "onFinishedValidation valid=" + valid + "; name=" + ((name == null) ? "null" : name.getPackageName()));
                 if (valid && name != null) {
                     mConfig.service = name;
                     transport = new TransportBrokerImpl(contextWeakReference.get(), mConfig.appId, mConfig.service);
                     DebugTool.logInfo(TAG, "TransportManager start was called; transport=" + transport);
-                    if(transport != null){
+                    if (transport != null) {
                         transport.start();
                     }
                 } else {
                     enterLegacyMode("Router service is not trusted. Entering legacy mode");
-                    if(legacyBluetoothTransport != null){
+                    if (legacyBluetoothTransport != null) {
                         legacyBluetoothTransport.start();
                     }
                 }
@@ -114,11 +114,11 @@ public class TransportManager extends TransportManagerBase{
     }
 
     @Override
-    public void close(long sessionId){
-        if(transport != null) {
+    public void close(long sessionId) {
+        if (transport != null) {
             transport.removeSession(sessionId);
             transport.stop();
-        }else if(legacyBluetoothTransport != null){
+        } else if (legacyBluetoothTransport != null) {
             legacyBluetoothTransport.stop();
             legacyBluetoothTransport = null;
         }
@@ -126,15 +126,16 @@ public class TransportManager extends TransportManagerBase{
 
     /**
      * Check to see if a transport is connected.
+     *
      * @param transportType the transport to have its connection status returned. If `null` is
      *                      passed in, all transports will be checked and if any are connected a
      *                      true value will be returned.
-     * @param address the address associated with the transport type. If null, the first transport
-     *                of supplied type will be used to return if connected.
+     * @param address       the address associated with the transport type. If null, the first transport
+     *                      of supplied type will be used to return if connected.
      * @return if a transport is connected based on included variables
      */
     @Override
-    public boolean isConnected(TransportType transportType, String address){
+    public boolean isConnected(TransportType transportType, String address) {
         synchronized (TRANSPORT_STATUS_LOCK) {
             if (transportType == null) {
                 return !transportStatus.isEmpty();
@@ -154,15 +155,17 @@ public class TransportManager extends TransportManagerBase{
             return false;
         }
     }
+
     /**
      * Retrieve a transport record with the supplied params
+     *
      * @param transportType the transport to have its connection status returned.
-     * @param address the address associated with the transport type. If null, the first transport
-     *                of supplied type will be returned.
+     * @param address       the address associated with the transport type. If null, the first transport
+     *                      of supplied type will be returned.
      * @return the transport record for the transport type and address if supplied
      */
     @Override
-    public TransportRecord getTransportRecord(TransportType transportType, String address){
+    public TransportRecord getTransportRecord(TransportType transportType, String address) {
         synchronized (TRANSPORT_STATUS_LOCK) {
             if (transportType == null) {
                 return null;
@@ -185,15 +188,16 @@ public class TransportManager extends TransportManagerBase{
 
     /**
      * Retrieves the currently connected transports
+     *
      * @return the currently connected transports
      */
     @Override
-    public List<TransportRecord> getConnectedTransports(){
+    public List<TransportRecord> getConnectedTransports() {
         return this.transportStatus;
     }
 
     @Override
-    public boolean isHighBandwidthAvailable(){
+    public boolean isHighBandwidthAvailable() {
         synchronized (TRANSPORT_STATUS_LOCK) {
             for (TransportRecord record : transportStatus) {
                 if (record.getType().equals(TransportType.USB)
@@ -206,46 +210,46 @@ public class TransportManager extends TransportManagerBase{
     }
 
     @Override
-    public BaseTransportConfig updateTransportConfig(BaseTransportConfig config){
-        if(transport != null && TransportType.MULTIPLEX.equals(config.getTransportType())){
-            ((MultiplexTransportConfig)config).setService(transport.getRouterService());
+    public BaseTransportConfig updateTransportConfig(BaseTransportConfig config) {
+        if (transport != null && TransportType.MULTIPLEX.equals(config.getTransportType())) {
+            ((MultiplexTransportConfig) config).setService(transport.getRouterService());
         }
         return config;
     }
 
     @Override
-    public void sendPacket(SdlPacket packet){
-        if(transport !=null){
+    public void sendPacket(SdlPacket packet) {
+        if (transport != null) {
             transport.sendPacketToRouterService(packet);
-        }else if(legacyBluetoothTransport != null){
+        } else if (legacyBluetoothTransport != null) {
             byte[] data = packet.constructPacket();
             legacyBluetoothTransport.write(data, 0, data.length);
         }
     }
 
     @Override
-    public void requestNewSession(TransportRecord transportRecord){
-        if(transport != null){
+    public void requestNewSession(TransportRecord transportRecord) {
+        if (transport != null) {
             transport.requestNewSession(transportRecord);
-        }else if(legacyBluetoothTransport != null){
+        } else if (legacyBluetoothTransport != null) {
             DebugTool.logWarning(TAG, "Session requested for non-bluetooth transport while in legacy mode");
         }
     }
 
     @Override
-    public void requestSecondaryTransportConnection(byte sessionId, TransportRecord transportRecord){
-        if(transportRecord != null){
+    public void requestSecondaryTransportConnection(byte sessionId, TransportRecord transportRecord) {
+        if (transportRecord != null) {
             Bundle bundle = new Bundle();
             bundle.putString(TransportConstants.TRANSPORT_TYPE, transportRecord.getType().name());
-            if(transportRecord.getType().equals(TransportType.TCP)) {
-                String address =  transportRecord.getAddress();
-                if(address.contains(":")){
+            if (transportRecord.getType().equals(TransportType.TCP)) {
+                String address = transportRecord.getAddress();
+                if (address.contains(":")) {
                     String[] split = address.split(":");
-                    if(split.length == 2) {
+                    if (split.length == 2) {
                         bundle.putString(ControlFrameTags.RPC.TransportEventUpdate.TCP_IP_ADDRESS, split[0]);
                         bundle.putInt(ControlFrameTags.RPC.TransportEventUpdate.TCP_PORT, Integer.parseInt(split[1]));
                     } //else {something went wrong;}
-                }else{
+                } else {
                     bundle.putString(ControlFrameTags.RPC.TransportEventUpdate.TCP_IP_ADDRESS, address);
                 }
 
@@ -255,30 +259,31 @@ public class TransportManager extends TransportManagerBase{
         }
     }
 
-    protected class TransportBrokerImpl extends TransportBroker{
+    protected class TransportBrokerImpl extends TransportBroker {
 
         boolean shuttingDown = false;
-        public TransportBrokerImpl(Context context, String appId, ComponentName routerService){
-            super(context,appId,routerService);
+
+        public TransportBrokerImpl(Context context, String appId, ComponentName routerService) {
+            super(context, appId, routerService);
         }
 
         @Override
         public synchronized boolean onHardwareConnected(List<TransportRecord> transports) {
             super.onHardwareConnected(transports);
             DebugTool.logInfo(TAG, "OnHardwareConnected");
-            if(shuttingDown){
+            if (shuttingDown) {
                 return false;
             }
-            synchronized (TRANSPORT_STATUS_LOCK){
+            synchronized (TRANSPORT_STATUS_LOCK) {
                 transportStatus.clear();
                 transportStatus.addAll(transports);
             }
             //If a bluetooth device has connected, make sure to save the mac address in the case
             //this app is asked to host the router service, the app knows to do so immediately on connection.
-            if(transports != null && transports.size() > 0) {
+            if (transports != null && transports.size() > 0) {
                 for (TransportRecord record : transports) {
-                    if(record != null && TransportType.BLUETOOTH.equals(record.getType())) {
-                        SdlDeviceListener.setSDLConnectedStatus(contextWeakReference.get(), record.getAddress(),true);
+                    if (record != null && TransportType.BLUETOOTH.equals(record.getType())) {
+                        SdlDeviceListener.setSDLConnectedStatus(contextWeakReference.get(), record.getAddress(), true);
                     }
                 }
             }
@@ -290,21 +295,21 @@ public class TransportManager extends TransportManagerBase{
 
         @Override
         public synchronized void onHardwareDisconnected(TransportRecord record, List<TransportRecord> connectedTransports) {
-            if(record != null){
+            if (record != null) {
                 DebugTool.logInfo(TAG, "Transport disconnected - " + record);
-            }else{
+            } else {
                 DebugTool.logInfo(TAG, "Transport disconnected");
 
             }
-            if(shuttingDown){
+            if (shuttingDown) {
                 return;
             }
-            synchronized (TRANSPORT_STATUS_LOCK){
+            synchronized (TRANSPORT_STATUS_LOCK) {
                 boolean wasRemoved = TransportManager.this.transportStatus.remove(record);
                 //Might check connectedTransports vs transportStatus to ensure they are equal
 
                 //If the transport wasn't removed, check RS version for corner case
-                if(!wasRemoved && record != null &&getRouterServiceVersion() == 8){
+                if (!wasRemoved && record != null && getRouterServiceVersion() == 8) {
                     boolean foundMatch = false;
                     //There is an issue in the first gen of multi transport router services that
                     //will remove certain extras from messages to the TransportBroker if older apps
@@ -312,7 +317,7 @@ public class TransportManager extends TransportManagerBase{
                     //that, we check the records we have and if the transport matches we assume it
                     //was the original transport that was received regardless of the address.
                     TransportType disconnectedTransportType = record.getType();
-                    if(disconnectedTransportType != null) {
+                    if (disconnectedTransportType != null) {
                         for (TransportRecord transportRecord : TransportManager.this.transportStatus) {
                             if (disconnectedTransportType.equals(transportRecord.getType())) {
                                 //The record stored in the TM will contain the actual record the
@@ -331,15 +336,15 @@ public class TransportManager extends TransportManagerBase{
                 }
             }
 
-            if(isLegacyModeEnabled()
+            if (isLegacyModeEnabled()
                     && record != null
-                    && TransportType.BLUETOOTH.equals(record.getType())){ //Make sure it's bluetooth that has be d/c
-                    //&& legacyBluetoothTransport == null){ //Make sure we aren't already in legacy mode
-                if(legacyBluetoothTransport == null) {
+                    && TransportType.BLUETOOTH.equals(record.getType())) { //Make sure it's bluetooth that has be d/c
+                //&& legacyBluetoothTransport == null){ //Make sure we aren't already in legacy mode
+                if (legacyBluetoothTransport == null) {
                     //Legacy mode has been enabled so we need to cycle
                     enterLegacyModeAndStart("Router service has enabled legacy mode");
                 }
-            }else{
+            } else {
                 //Inform the transport listener that a transport has disconnected
                 transportListener.onTransportDisconnected("", record, connectedTransports);
             }
@@ -347,10 +352,10 @@ public class TransportManager extends TransportManagerBase{
 
         @Override
         public synchronized void onLegacyModeEnabled() {
-            if(shuttingDown){
+            if (shuttingDown) {
                 return;
             }
-            if( legacyBluetoothTransport == null){
+            if (legacyBluetoothTransport == null) {
                 //First remove the connected bluetooth transport if one exists
                 TransportRecord toBeRemoved = null;
                 for (TransportRecord transportRecord : TransportManager.this.transportStatus) {
@@ -361,7 +366,7 @@ public class TransportManager extends TransportManagerBase{
                     }
                 }
 
-                if(toBeRemoved != null){ //Remove item after the loop to avoid concurrent modifications
+                if (toBeRemoved != null) { //Remove item after the loop to avoid concurrent modifications
                     TransportManager.this.transportStatus.remove(toBeRemoved);
                 }
 
@@ -371,8 +376,8 @@ public class TransportManager extends TransportManagerBase{
 
         @Override
         public void onPacketReceived(Parcelable packet) {
-            if(packet!=null){
-                transportListener.onPacketReceived((SdlPacket)packet);
+            if (packet != null) {
+                transportListener.onPacketReceived((SdlPacket) packet);
             }
         }
 
@@ -383,75 +388,76 @@ public class TransportManager extends TransportManagerBase{
         }
     }
 
-    void enterLegacyModeAndStart(final String info){
+    void enterLegacyModeAndStart(final String info) {
         enterLegacyMode(info);
-        if(legacyBluetoothTransport != null
-                && legacyBluetoothTransport.getState() == MultiplexBaseTransport.STATE_NONE){
+        if (legacyBluetoothTransport != null
+                && legacyBluetoothTransport.getState() == MultiplexBaseTransport.STATE_NONE) {
             legacyBluetoothTransport.start();
         }
     }
 
 
     @Override
-    synchronized void enterLegacyMode(final String info){
-        if(legacyBluetoothTransport != null && legacyBluetoothHandler != null){
+    synchronized void enterLegacyMode(final String info) {
+        if (legacyBluetoothTransport != null && legacyBluetoothHandler != null) {
             return; //Already in legacy mode
         }
 
-        if(transportListener.onLegacyModeEnabled(info)) {
-            if(Looper.myLooper() == null){
+        if (transportListener.onLegacyModeEnabled(info)) {
+            if (Looper.myLooper() == null) {
                 Looper.prepare();
             }
             legacyBluetoothHandler = new LegacyBluetoothHandler(this);
             legacyBluetoothTransport = new MultiplexBluetoothTransport(legacyBluetoothHandler);
-            if(contextWeakReference.get() != null){
+            if (contextWeakReference.get() != null) {
                 IntentFilter intentFilter = new IntentFilter();
                 intentFilter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
                 intentFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-                contextWeakReference.get().registerReceiver(legacyDisconnectReceiver, intentFilter );
+                contextWeakReference.get().registerReceiver(legacyDisconnectReceiver, intentFilter);
             }
-        }else{
+        } else {
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
                     transportListener.onError(info + " - Legacy mode unacceptable; shutting down.");
 
                 }
-            },500);
+            }, 500);
         }
     }
 
     @Override
-    synchronized void exitLegacyMode(String info ){
+    synchronized void exitLegacyMode(String info) {
         TransportRecord legacyTransportRecord = null;
-        if(legacyBluetoothTransport != null){
+        if (legacyBluetoothTransport != null) {
             legacyTransportRecord = legacyBluetoothTransport.getTransportRecord();
             legacyBluetoothTransport.stop();
             legacyBluetoothTransport = null;
         }
         legacyBluetoothHandler = null;
-        synchronized (TRANSPORT_STATUS_LOCK){
+        synchronized (TRANSPORT_STATUS_LOCK) {
             TransportManager.this.transportStatus.clear();
         }
-        if(contextWeakReference !=null){
-            try{
+        if (contextWeakReference != null) {
+            try {
                 contextWeakReference.get().unregisterReceiver(legacyDisconnectReceiver);
-            }catch (Exception e){}
+            } catch (Exception e) {
+            }
         }
-        transportListener.onTransportDisconnected(info, legacyTransportRecord,null);
+        transportListener.onTransportDisconnected(info, legacyTransportRecord, null);
     }
 
 
     private BroadcastReceiver legacyDisconnectReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if(intent != null){
+            if (intent != null) {
                 String action = intent.getAction();
-                if(BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)){
+                if (BluetoothDevice.ACTION_ACL_DISCONNECTED.equals(action)) {
                     exitLegacyMode("Bluetooth disconnected");
-                }else if(action != null && action.equalsIgnoreCase(BluetoothAdapter.ACTION_STATE_CHANGED)){
+                } else if (action != null && action.equalsIgnoreCase(BluetoothAdapter.ACTION_STATE_CHANGED)) {
                     int bluetoothState = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1);
-                    if(bluetoothState == BluetoothAdapter.STATE_TURNING_OFF || bluetoothState == BluetoothAdapter.STATE_OFF){
+                    if (bluetoothState == BluetoothAdapter.STATE_TURNING_OFF || bluetoothState == BluetoothAdapter.STATE_OFF) {
                         DebugTool.logInfo(TAG, "Bluetooth is shutting off, exiting legacy mode.");
                         exitLegacyMode("Bluetooth adapter shutting off");
                     }
@@ -460,27 +466,28 @@ public class TransportManager extends TransportManagerBase{
         }
     };
 
-    protected static class LegacyBluetoothHandler extends Handler{
+    protected static class LegacyBluetoothHandler extends Handler {
 
         final WeakReference<TransportManager> provider;
 
-        public LegacyBluetoothHandler(TransportManager provider){
+        public LegacyBluetoothHandler(TransportManager provider) {
             this.provider = new WeakReference<>(provider);
         }
+
         @Override
         public void handleMessage(Message msg) {
-            if(this.provider.get() == null){
+            if (this.provider.get() == null) {
                 return;
             }
             TransportManager service = this.provider.get();
-            if(service.transportListener == null){
+            if (service.transportListener == null) {
                 return;
             }
             switch (msg.what) {
                 case SdlRouterService.MESSAGE_STATE_CHANGE:
                     switch (msg.arg1) {
                         case MultiplexBaseTransport.STATE_CONNECTED:
-                            synchronized (service.TRANSPORT_STATUS_LOCK){
+                            synchronized (service.TRANSPORT_STATUS_LOCK) {
                                 service.transportStatus.clear();
                                 service.transportStatus.add(service.legacyBluetoothTransport.getTransportRecord());
                             }
@@ -490,7 +497,7 @@ public class TransportManager extends TransportManagerBase{
                             // Currently attempting to connect - update UI?
                             break;
                         case MultiplexBaseTransport.STATE_LISTEN:
-                            if(service.transport != null){
+                            if (service.transport != null) {
                                 service.transport.stop();
                                 service.transport = null;
                             }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java
index dbe7898ef..604e3b435 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java
@@ -83,10 +83,10 @@ import static com.smartdevicelink.transport.TransportConstants.FOREGROUND_EXTRA;
  * }</pre>

  */

 public class USBAccessoryAttachmentActivity extends Activity {

-    

+

     private static final String TAG = USBAccessoryAttachmentActivity.class.getSimpleName();

     private static final int USB_SUPPORTED_ROUTER_SERVICE_VERSION = 8;

-    

+

     UsbAccessory usbAccessory;

     Parcelable permissionGranted;

 

@@ -108,7 +108,7 @@ public class USBAccessoryAttachmentActivity extends Activity {
     }

 

     private synchronized void checkUsbAccessoryIntent() {

-        if(usbAccessory != null){

+        if (usbAccessory != null) {

             return;

         }

         final Intent intent = getIntent();

@@ -121,7 +121,7 @@ public class USBAccessoryAttachmentActivity extends Activity {
 

             wakeUpRouterService(getApplicationContext());

 

-        }else{

+        } else {

             finish();

         }

     }

@@ -134,7 +134,7 @@ public class USBAccessoryAttachmentActivity extends Activity {
     }

 

     @SuppressWarnings("deprecation")

-    private void wakeUpRouterService(final Context context){

+    private void wakeUpRouterService(final Context context) {

         new ServiceFinder(context, context.getPackageName(), new ServiceFinder.ServiceFinderCallback() {

             @Override

             public void onComplete(Vector<ComponentName> routerServices) {

@@ -147,18 +147,18 @@ public class USBAccessoryAttachmentActivity extends Activity {
 

                     if (sdlAppInfoList != null && !sdlAppInfoList.isEmpty()) {

                         SdlAppInfo optimalRouterService = sdlAppInfoList.get(0);

-                        

-                        if(optimalRouterService.getRouterServiceVersion() < USB_SUPPORTED_ROUTER_SERVICE_VERSION){

+

+                        if (optimalRouterService.getRouterServiceVersion() < USB_SUPPORTED_ROUTER_SERVICE_VERSION) {

                             // The most optimal router service doesn't support the USB connection

                             // At this point to ensure that USB connection is still possible it might be

                             // worth trying to use the legacy USB transport scheme

                             attemptLegacyUsbConnection(usbAccessory);

                             return;

                         }

-                        

+

                         serviceIntent = new Intent();

                         serviceIntent.setComponent(optimalRouterService.getRouterServiceComponentName());

-                    } else{

+                    } else {

                         DebugTool.logInfo(TAG, "No SDL Router Services found");

                         DebugTool.logInfo(TAG, "WARNING: This application has not specified its SdlRouterService correctly in the manifest. THIS WILL THROW AN EXCEPTION IN FUTURE RELEASES!!");

                         // At this point to ensure that USB connection is still possible it might be

@@ -170,14 +170,14 @@ public class USBAccessoryAttachmentActivity extends Activity {
 

                     ComponentName startedService;

                     try {

-                        if(Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {

+                        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {

                             startedService = context.startService(serviceIntent);

-                        }else {

+                        } else {

                             serviceIntent.putExtra(FOREGROUND_EXTRA, true);

                             startedService = context.startForegroundService(serviceIntent);

                         }

 

-                        if(startedService == null){

+                        if (startedService == null) {

                             // A router service was not started or is not running.

                             DebugTool.logError(TAG, " - Error starting router service. Attempting legacy connection ");

                             attemptLegacyUsbConnection(usbAccessory);

@@ -191,7 +191,7 @@ public class USBAccessoryAttachmentActivity extends Activity {
                         restart.putExtra(SdlBroadcastReceiver.LOCAL_ROUTER_SERVICE_DID_START_OWN, true);

                         context.sendBroadcast(restart);

 

-                        if (usbAccessory!=null) {

+                        if (usbAccessory != null) {

                             new UsbTransferProvider(context, serviceIntent.getComponent(), usbAccessory, new UsbTransferProvider.UsbTransferCallback() {

                                 @Override

                                 public void onUsbTransferUpdate(boolean success) {

@@ -205,8 +205,8 @@ public class USBAccessoryAttachmentActivity extends Activity {
                         DebugTool.logError(TAG, "Security exception, process is bad");

                     }

                 } else {

-                    if (usbAccessory!=null) {

-                        new UsbTransferProvider(context,runningBluetoothServicePackage.get(0),usbAccessory, new UsbTransferProvider.UsbTransferCallback(){

+                    if (usbAccessory != null) {

+                        new UsbTransferProvider(context, runningBluetoothServicePackage.get(0), usbAccessory, new UsbTransferProvider.UsbTransferCallback() {

                             @Override

                             public void onUsbTransferUpdate(boolean success) {

                                 finish();

@@ -218,15 +218,15 @@ public class USBAccessoryAttachmentActivity extends Activity {
             }

         });

     }

-    

-    private void attemptLegacyUsbConnection(UsbAccessory usbAccessory){

-        if(usbAccessory != null) {

+

+    private void attemptLegacyUsbConnection(UsbAccessory usbAccessory) {

+        if (usbAccessory != null) {

             DebugTool.logInfo(TAG, "Attempting to send USB connection intent using legacy method");

             Intent usbAccessoryAttachedIntent = new Intent(TransportConstants.ACTION_USB_ACCESSORY_ATTACHED);

             usbAccessoryAttachedIntent.putExtra(UsbManager.EXTRA_ACCESSORY, usbAccessory);

             usbAccessoryAttachedIntent.putExtra(UsbManager.EXTRA_PERMISSION_GRANTED, permissionGranted);

             AndroidTools.sendExplicitBroadcast(getApplicationContext(), usbAccessoryAttachedIntent, null);

-        }else{

+        } else {

             DebugTool.logError(TAG, "Unable to start legacy USB mode as the accessory was null");

         }

         finish();

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java
index 0b0c9b88d..b588f1512 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java
@@ -59,7 +59,7 @@ import java.lang.ref.WeakReference;
 public class UsbTransferProvider {
     private static final String TAG = "UsbTransferProvider";
 
-    private Context context ;
+    private Context context;
     private boolean isBound = false;
     private ComponentName routerService;
     private int flags = 0;
@@ -71,7 +71,7 @@ public class UsbTransferProvider {
     ParcelFileDescriptor usbPfd;
     Bundle usbInfoBundle;
 
-    private final ServiceConnection routerConnection= new ServiceConnection() {
+    private final ServiceConnection routerConnection = new ServiceConnection() {
 
         public void onServiceConnected(ComponentName className, IBinder service) {
             DebugTool.logInfo(TAG, "Bound to service " + className.toString());
@@ -84,7 +84,7 @@ public class UsbTransferProvider {
             msg.arg1 = flags;
             msg.replyTo = clientMessenger;
             msg.obj = usbPfd;
-            if(usbInfoBundle != null){
+            if (usbInfoBundle != null) {
                 msg.setData(usbInfoBundle);
             }
             try {
@@ -101,12 +101,12 @@ public class UsbTransferProvider {
         }
     };
 
-    public UsbTransferProvider(Context context, ComponentName service, UsbAccessory usbAccessory, UsbTransferCallback callback){
-        if(context == null || service == null || usbAccessory == null){
-            throw new IllegalStateException("Supplied params are not correct. Context == null? "+ (context==null) + " ComponentName == null? " + (service == null) + " Usb Accessory == null? " + usbAccessory);
+    public UsbTransferProvider(Context context, ComponentName service, UsbAccessory usbAccessory, UsbTransferCallback callback) {
+        if (context == null || service == null || usbAccessory == null) {
+            throw new IllegalStateException("Supplied params are not correct. Context == null? " + (context == null) + " ComponentName == null? " + (service == null) + " Usb Accessory == null? " + usbAccessory);
         }
         usbPfd = getFileDescriptor(usbAccessory, context);
-        if(usbPfd != null && usbPfd.getFileDescriptor() != null && usbPfd.getFileDescriptor().valid()){
+        if (usbPfd != null && usbPfd.getFileDescriptor() != null && usbPfd.getFileDescriptor().valid()) {
             this.context = context;
             this.routerService = service;
             this.callback = callback;
@@ -120,10 +120,10 @@ public class UsbTransferProvider {
             usbInfoBundle.putString(MultiplexUsbTransport.SERIAL, usbAccessory.getSerial());
             usbInfoBundle.putString(MultiplexUsbTransport.DESCRIPTION, usbAccessory.getDescription());
             checkIsConnected();
-        }else{
+        } else {
             DebugTool.logError(TAG, "Unable to open accessory");
             clientMessenger = null;
-            if(callback != null){
+            if (callback != null) {
                 callback.onUsbTransferUpdate(false);
             }
         }
@@ -142,67 +142,67 @@ public class UsbTransferProvider {
             } catch (Exception e) {
             }
         }
-        return  null;
+        return null;
     }
 
-    public void setFlags(int flags){
+    public void setFlags(int flags) {
         this.flags = flags;
     }
 
-    public void checkIsConnected(){
-        if(!AndroidTools.isServiceExported(context,routerService) || !bindToService()){
+    public void checkIsConnected() {
+        if (!AndroidTools.isServiceExported(context, routerService) || !bindToService()) {
             //We are unable to bind to service
             DebugTool.logError(TAG, "Unable to bind to service");
             unBindFromService();
         }
     }
 
-    public void cancel(){
-        if(isBound){
+    public void cancel() {
+        if (isBound) {
             unBindFromService();
         }
     }
 
-    private boolean bindToService(){
-        if(isBound){
+    private boolean bindToService() {
+        if (isBound) {
             return true;
         }
-        if(clientMessenger == null){
+        if (clientMessenger == null) {
             return false;
         }
         Intent bindingIntent = new Intent();
         bindingIntent.setClassName(this.routerService.getPackageName(), this.routerService.getClassName());//This sets an explicit intent
         //Quickly make sure it's just up and running
         context.startService(bindingIntent);
-        bindingIntent.setAction( TransportConstants.BIND_REQUEST_TYPE_USB_PROVIDER);
+        bindingIntent.setAction(TransportConstants.BIND_REQUEST_TYPE_USB_PROVIDER);
         return context.bindService(bindingIntent, routerConnection, Context.BIND_AUTO_CREATE);
     }
 
-    private void unBindFromService(){
-        try{
-            if(context!=null && routerConnection!=null){
+    private void unBindFromService() {
+        try {
+            if (context != null && routerConnection != null) {
                 context.unbindService(routerConnection);
-            }else{
+            } else {
                 DebugTool.logWarning(TAG, "Unable to unbind from router service, context was null");
             }
 
-        }catch(IllegalArgumentException e){
+        } catch (IllegalArgumentException e) {
             //This is ok
         }
     }
 
-    private void finish(){
-       try {
+    private void finish() {
+        try {
             usbPfd.close();
         } catch (IOException e) {
             e.printStackTrace();
         }
         usbPfd = null;
         unBindFromService();
-        routerServiceMessenger =null;
+        routerServiceMessenger = null;
         context = null;
         System.gc();
-        if(callback != null){
+        if (callback != null) {
             callback.onUsbTransferUpdate(true);
         }
     }
@@ -210,14 +210,14 @@ public class UsbTransferProvider {
     static class ClientHandler extends Handler {
         final WeakReference<UsbTransferProvider> provider;
 
-        public ClientHandler(UsbTransferProvider provider){
+        public ClientHandler(UsbTransferProvider provider) {
             super(Looper.getMainLooper());
             this.provider = new WeakReference<>(provider);
         }
 
         @Override
         public void handleMessage(Message msg) {
-            if(provider.get()==null){
+            if (provider.get() == null) {
                 return;
             }
             switch (msg.what) {
@@ -231,7 +231,7 @@ public class UsbTransferProvider {
         }
     }
 
-    public interface UsbTransferCallback{
+    public interface UsbTransferCallback {
         void onUsbTransferUpdate(boolean success);
     }
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
index 163b2268b..2f2e286f4 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
@@ -39,74 +39,74 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 public class ByteAraryMessageAssembler {
-	private static final String TAG = "ByteAraryMsgAssembler";
-	ByteArrayOutputStream buffer;
-	boolean isFinished;
-	TransportType transportType;
+    private static final String TAG = "ByteAraryMsgAssembler";
+    ByteArrayOutputStream buffer;
+    boolean isFinished;
+    TransportType transportType;
 
 
-	public void init(){
-		close();
-		this.isFinished = false;
-		buffer = new ByteArrayOutputStream();
-	}
+    public void init() {
+        close();
+        this.isFinished = false;
+        buffer = new ByteArrayOutputStream();
+    }
 
-	public void setTransportType(TransportType transportType){
-		this.transportType = transportType;
-	}
+    public void setTransportType(TransportType transportType) {
+        this.transportType = transportType;
+    }
 
-	public TransportType getTransportType() {
-		return transportType;
-	}
+    public TransportType getTransportType() {
+        return transportType;
+    }
 
-	public boolean close(){
-		if(buffer!=null){
-			try {
-				buffer.close();
-				buffer = null;
-				return true;
-			} catch (IOException e) {
-				e.printStackTrace();
-				return false;
-			}
-		}
-		return false;
-	}
-	
-	public void append(byte[] bytes){
-		try {
-			buffer.write(bytes);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public synchronized boolean handleMessage(int flags, byte[] packet){
-			switch(flags){
-			case TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START: //Fall through to write the bytes after they buffer was init'ed
-			case TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_CONT:	
-				append(packet);
-				break;
-			case TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_END:
-				append(packet);
-				this.isFinished = true;
-				break;
-			default:
-				DebugTool.logError(TAG, "Error handling message");
-				return false;
-			}
-			
-			return true;
-	}
+    public boolean close() {
+        if (buffer != null) {
+            try {
+                buffer.close();
+                buffer = null;
+                return true;
+            } catch (IOException e) {
+                e.printStackTrace();
+                return false;
+            }
+        }
+        return false;
+    }
 
-	public byte[] getBytes(){
-		if(buffer == null){
-			return null;
-		}
-		return this.buffer.toByteArray();
-	}
-	
-	public boolean isFinished(){
-		return this.isFinished;
-	}
+    public void append(byte[] bytes) {
+        try {
+            buffer.write(bytes);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public synchronized boolean handleMessage(int flags, byte[] packet) {
+        switch (flags) {
+            case TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START: //Fall through to write the bytes after they buffer was init'ed
+            case TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_CONT:
+                append(packet);
+                break;
+            case TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_END:
+                append(packet);
+                this.isFinished = true;
+                break;
+            default:
+                DebugTool.logError(TAG, "Error handling message");
+                return false;
+        }
+
+        return true;
+    }
+
+    public byte[] getBytes() {
+        if (buffer == null) {
+            return null;
+        }
+        return this.buffer.toByteArray();
+    }
+
+    public boolean isFinished() {
+        return this.isFinished;
+    }
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
index 670711709..8f33c76e6 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
@@ -42,105 +42,105 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
 public class ByteArrayMessageSpliter {
-	private static final String TAG = "ByteArrayMessageSpliter";
-	
-	//To test set this value to something very small (eg, 50)
-	public static final int MAX_BINDER_SIZE = 1000000/4; //~1MB/4 We do this as a safety measure. IPC only allows 1MB for everything. We should never fill more than 25% of the buffer so here we make sure we stay under that
-
-	boolean firstPacket;
-	ByteArrayInputStream stream;
-	int bytesRead; 
-	final int what;
-	final String appId;
-	byte[] buffer;
-	final int orginalSize;
-	final int priorityCoef;
-	int routerServiceVersion = 1;
-	TransportRecord transportRecord;
-	
-	public ByteArrayMessageSpliter(String appId,int what, byte[] bytes, int priorityCoef){
-		this.appId = appId;
-		this.what = what;
-		stream = new ByteArrayInputStream(bytes);
-		orginalSize  = stream.available();
-		bytesRead = 0; 
-		firstPacket = true;
-		this.priorityCoef = priorityCoef;
-	}
-	
-	public void setRouterServiceVersion(int version){
-		this.routerServiceVersion = version;
-	}
-	
-	public void setTransportRecord(TransportRecord transportRecord){
-		this.transportRecord = transportRecord;
-	}
-
-	public boolean isActive(){
-		if(stream!=null){
-			return stream.available()>0;
-		}
-		return false;
-	}
-	
-	public boolean close(){
-		if(stream == null){
-			return false;
-		}
-		try {
-			stream.close();
-			stream = null;
-			return true;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return false;
-		}
-		
-	}
-	
-	public Message nextMessage(){
-		if(stream == null || stream.available()<=0){
-			return null;
-		}
-		
-		Message message = Message.obtain(); //Do we need to always obtain new? or can we just swap bundles?
-		message.what = this.what;// TransportConstants.ROUTER_SEND_PACKET;
-		Bundle bundle = new Bundle();
-
-		
-		if(stream.available()>=MAX_BINDER_SIZE){
-			buffer = new byte[MAX_BINDER_SIZE];
-			bytesRead = stream.read(buffer, 0, MAX_BINDER_SIZE);
-		}else{
-			buffer = new byte[stream.available()];
-			bytesRead = stream.read(buffer, 0, stream.available());
-		}
-		
-		bundle.putByteArray(TransportConstants.BYTES_TO_SEND_EXTRA_NAME, buffer); //Do we just change this to the args and objs
-		bundle.putInt(TransportConstants.BYTES_TO_SEND_EXTRA_OFFSET, 0);
-		bundle.putInt(TransportConstants.BYTES_TO_SEND_EXTRA_COUNT, bytesRead);
-		if(transportRecord != null){
-			bundle.putString(TransportConstants.TRANSPORT_TYPE, transportRecord.getType().name());
-			bundle.putString(TransportConstants.TRANSPORT_ADDRESS, transportRecord.getAddress());
-		}
-
-		//Determine which flag should be sent for this division of the packet
-		if(firstPacket){
-			bundle.putInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START);
-			bundle.putInt(TransportConstants.PACKET_PRIORITY_COEFFICIENT, this.priorityCoef);
-			firstPacket = false;
-		}else if(stream.available()<=0){ //We are at the end of the stream so let the flag reflect that
-			bundle.putInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_END);
-		}else{
-			bundle.putInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_CONT);
-		}
-		
-		if(routerServiceVersion< TransportConstants.RouterServiceVersions.APPID_STRING){
-			bundle.putLong(TransportConstants.APP_ID_EXTRA,TransportBroker.convertAppId(appId));
-		}
-		bundle.putString(TransportConstants.APP_ID_EXTRA_STRING, appId);
-		message.setData(bundle);
-		DebugTool.logInfo(TAG, ((100 - ((stream.available()*100)/orginalSize) ))+ " percent complete.");
-		return message;
-	}
+    private static final String TAG = "ByteArrayMessageSpliter";
+
+    //To test set this value to something very small (eg, 50)
+    public static final int MAX_BINDER_SIZE = 1000000 / 4; //~1MB/4 We do this as a safety measure. IPC only allows 1MB for everything. We should never fill more than 25% of the buffer so here we make sure we stay under that
+
+    boolean firstPacket;
+    ByteArrayInputStream stream;
+    int bytesRead;
+    final int what;
+    final String appId;
+    byte[] buffer;
+    final int orginalSize;
+    final int priorityCoef;
+    int routerServiceVersion = 1;
+    TransportRecord transportRecord;
+
+    public ByteArrayMessageSpliter(String appId, int what, byte[] bytes, int priorityCoef) {
+        this.appId = appId;
+        this.what = what;
+        stream = new ByteArrayInputStream(bytes);
+        orginalSize = stream.available();
+        bytesRead = 0;
+        firstPacket = true;
+        this.priorityCoef = priorityCoef;
+    }
+
+    public void setRouterServiceVersion(int version) {
+        this.routerServiceVersion = version;
+    }
+
+    public void setTransportRecord(TransportRecord transportRecord) {
+        this.transportRecord = transportRecord;
+    }
+
+    public boolean isActive() {
+        if (stream != null) {
+            return stream.available() > 0;
+        }
+        return false;
+    }
+
+    public boolean close() {
+        if (stream == null) {
+            return false;
+        }
+        try {
+            stream.close();
+            stream = null;
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+
+    }
+
+    public Message nextMessage() {
+        if (stream == null || stream.available() <= 0) {
+            return null;
+        }
+
+        Message message = Message.obtain(); //Do we need to always obtain new? or can we just swap bundles?
+        message.what = this.what;// TransportConstants.ROUTER_SEND_PACKET;
+        Bundle bundle = new Bundle();
+
+
+        if (stream.available() >= MAX_BINDER_SIZE) {
+            buffer = new byte[MAX_BINDER_SIZE];
+            bytesRead = stream.read(buffer, 0, MAX_BINDER_SIZE);
+        } else {
+            buffer = new byte[stream.available()];
+            bytesRead = stream.read(buffer, 0, stream.available());
+        }
+
+        bundle.putByteArray(TransportConstants.BYTES_TO_SEND_EXTRA_NAME, buffer); //Do we just change this to the args and objs
+        bundle.putInt(TransportConstants.BYTES_TO_SEND_EXTRA_OFFSET, 0);
+        bundle.putInt(TransportConstants.BYTES_TO_SEND_EXTRA_COUNT, bytesRead);
+        if (transportRecord != null) {
+            bundle.putString(TransportConstants.TRANSPORT_TYPE, transportRecord.getType().name());
+            bundle.putString(TransportConstants.TRANSPORT_ADDRESS, transportRecord.getAddress());
+        }
+
+        //Determine which flag should be sent for this division of the packet
+        if (firstPacket) {
+            bundle.putInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_START);
+            bundle.putInt(TransportConstants.PACKET_PRIORITY_COEFFICIENT, this.priorityCoef);
+            firstPacket = false;
+        } else if (stream.available() <= 0) { //We are at the end of the stream so let the flag reflect that
+            bundle.putInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_END);
+        } else {
+            bundle.putInt(TransportConstants.BYTES_TO_SEND_FLAGS, TransportConstants.BYTES_TO_SEND_FLAG_LARGE_PACKET_CONT);
+        }
+
+        if (routerServiceVersion < TransportConstants.RouterServiceVersions.APPID_STRING) {
+            bundle.putLong(TransportConstants.APP_ID_EXTRA, TransportBroker.convertAppId(appId));
+        }
+        bundle.putString(TransportConstants.APP_ID_EXTRA_STRING, appId);
+        message.setData(bundle);
+        DebugTool.logInfo(TAG, ((100 - ((stream.available() * 100) / orginalSize))) + " percent complete.");
+        return message;
+    }
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java
index 1ca1f8d97..251eb130f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/SdlDeviceListener.java
@@ -85,9 +85,9 @@ public class SdlDeviceListener {
      * will listen for 30 seconds, if it is not, this will listen for 15 seconds instead.
      */
     public void start() {
-        if(connectedDevice == null) {
+        if (connectedDevice == null) {
             DebugTool.logInfo(TAG, ": No supplied bluetooth device");
-            if(callback != null){
+            if (callback != null) {
                 callback.onTransportError(null);
             }
             return;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
index bd31e746e..f8dc2828b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java
@@ -14,7 +14,7 @@ public class TransportRecord extends BaseTransportRecord implements Parcelable {
     public TransportRecord(Parcel p) {
         if (p.readInt() == 1) { //We should have a transport type attached
             String transportName = p.readString();
-            if(transportName != null){
+            if (transportName != null) {
                 this.type = TransportType.valueOf(transportName);
             }
         }
@@ -31,13 +31,13 @@ public class TransportRecord extends BaseTransportRecord implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(type!=null? 1 : 0);
-        if(type != null){
+        dest.writeInt(type != null ? 1 : 0);
+        if (type != null) {
             dest.writeString(type.name());
         }
 
-        dest.writeInt(address !=null? 1 : 0);
-        if(address != null){
+        dest.writeInt(address != null ? 1 : 0);
+        if (address != null) {
             dest.writeString(address);
         }
     }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/WiFiSocketFactory.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/WiFiSocketFactory.java
index d33f4c374..eda694d95 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/WiFiSocketFactory.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/WiFiSocketFactory.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
+ * contributors may be used to endorse or promote products derived from this
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -50,7 +50,7 @@ import static com.smartdevicelink.util.NativeLogTool.logInfo;
 public class WiFiSocketFactory {
     /**
      * Try to create a TCP socket which is bound to Wi-Fi network (for Android 5+)
-     *
+     * <p>
      * On Android 5 and later, this method tries to create a Socket instance which is bound to a
      * Wi-Fi network. If the phone is not connected to a Wi-Fi network, or the app lacks
      * required permission (ACCESS_NETWORK_STATE), then this method simply creates a Socket instance
@@ -72,7 +72,7 @@ public class WiFiSocketFactory {
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     private static Socket createWiFiSocket(Context context) {
-        if(context == null){
+        if (context == null) {
             logInfo("Context supplied was null");
             return null;
         }
@@ -87,7 +87,7 @@ public class WiFiSocketFactory {
             return null;
         }
 
-        ConnectivityManager connMan = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        ConnectivityManager connMan = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         if (connMan == null) {
             logInfo("ConnectivityManager isn't available.");
             return null;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java
index ea2bf709f..9109dc3ad 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTools.java
@@ -59,144 +59,149 @@ import java.util.HashMap;
 import java.util.List;
 
 public class AndroidTools {
-	/**
-	 * Check to see if a component is exported
-	 * @param context object used to retrieve the package manager
-	 * @param name of the component in question
-	 * @return true if this component is tagged as exported
-	 */
-	public static boolean isServiceExported(Context context, ComponentName name) {
-	    try {
-	        ServiceInfo serviceInfo = context.getPackageManager().getServiceInfo(name, PackageManager.GET_META_DATA);
-	        return serviceInfo.exported;
-	    } catch (NameNotFoundException e) {
-	        e.printStackTrace();
-	    }
-	    return false;
-	}
-	/**
-	 * Get all SDL enabled apps. If the package name is null, it will return all apps. However, if the package name is included, the
-	 * resulting hash map will not include the app with that package name.
-	 * @param context a context object used to get an instance of the package manager
-	 * @param myPackageName the package of the requesting app. This should only be included if the app wants to exclude itself from the map
-	 * @return a hash map of SDL apps with the package name as the key, and the ResolveInfo as the value
-	 */
-	public static HashMap<String,ResolveInfo> getSdlEnabledApps(Context context, String myPackageName){
-		Intent intent = new Intent(TransportConstants.START_ROUTER_SERVICE_ACTION);
-		List<ResolveInfo> infos = context.getPackageManager().queryBroadcastReceivers(intent, 0);
-		HashMap<String,ResolveInfo> sdlMultiList = new HashMap<>();
-		for(ResolveInfo info: infos){
-			if(info.activityInfo.applicationInfo.packageName.equals(myPackageName)){
-				continue; //Ignoring my own package
-			}
-			sdlMultiList.put(info.activityInfo.packageName, info);
-		}
-		return sdlMultiList;
-	}
-
-
-	/**
-	 * Finds all SDL apps via their SdlRouterService manifest entry. It will return the metadata associated with that router service.
-	 * @param context a context instance to obtain the package manager
-	 * @param comparator the Comparator to sort the resulting list. If null is supplied, they will be returned as they are from the system
-	 * @return the sorted list of SdlAppInfo objects that represent SDL apps
-	 */
-	public static List<SdlAppInfo> querySdlAppInfo(Context context, Comparator<SdlAppInfo> comparator){
-		List<SdlAppInfo> sdlAppInfoList = new ArrayList<>();
-		Intent intent = new Intent(TransportConstants.ROUTER_SERVICE_ACTION);
-		List<ResolveInfo> resolveInfoList = context.getPackageManager().queryIntentServices(intent, PackageManager.GET_META_DATA);
-
-		if(resolveInfoList != null && resolveInfoList.size() > 0) {
-			PackageManager packageManager = context.getPackageManager();
-			if(packageManager != null) {
-
-				for (ResolveInfo info : resolveInfoList) {
-					PackageInfo packageInfo;
-					try {
-						packageInfo = packageManager.getPackageInfo(info.serviceInfo.packageName, 0);
-						sdlAppInfoList.add(new SdlAppInfo(info, packageInfo));
-					} catch (NameNotFoundException e) {
-						//Package was not found, likely a sign the resolve info can't be trusted.
-					}
-
-				}
-			}
-
-			if (comparator != null) {
-				Collections.sort(sdlAppInfoList, comparator);
-			}
-		}
-
-		return sdlAppInfoList;
-	}
-
-
-	/**
-	 * Sends the provided intent to the specified destinations making it an explicit intent, rather
-	 * than an implicit intent. A direct replacement of sendBroadcast(Intent). As of Android 8.0
-	 * (API 26+) implicit broadcasts are no longer sent to broadcast receivers that are declared via
-	 * the AndroidManifest. If no apps are found to receive the intent, this method will send the
-	 * broadcast implicitly if no list of apps is provided.
-	 *
-	 * @param intent - the intent to send explicitly
-	 * @param apps - the list of apps that this broadcast will be sent to. If null is passed in
-	 *                the intent will be sent to all apps that match the provided intent via a query
-	 *                to the package manager; it will also be sent implicitly to mimic
-	 *                sendBroadcast()'s original functionality.
-	 */
-	public static void sendExplicitBroadcast(Context context, Intent intent, List<ResolveInfo> apps) {
-
-		if(context == null || intent == null){
-			return;
-		}
-
-		if (apps == null) {
-			apps = context.getPackageManager().queryBroadcastReceivers(intent, 0);
-		}
-
-		if (apps != null && apps.size()>0) {
-			for(ResolveInfo app: apps){
-				try {
-					intent.setClassName(app.activityInfo.applicationInfo.packageName, app.activityInfo.name);
-					context.sendBroadcast(intent);
-				}catch(Exception e){
-					//In case there is missing info in the app reference we want to keep moving
-				}
-			}
-		} else {
-			// fallback to implicit broadcast if we cannot resolve apps info.
-			context.sendBroadcast(intent);
-		}
-	}
-
-	/**
-	 * Checks if the usb cable is physically connected or not
-	 * Note: the intent here is a sticky intent so registerReceiver is actually a synchronous call and doesn't register a receiver on each call
-	 * @param context a context instance
-	 * @return boolean value that represents whether the usb cable is physically connected or not
-	 */
-	public static boolean isUSBCableConnected(Context context) {
-		Intent intent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
-		if (intent == null ) {
-			return false;
-		}
-		int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
-		return plugged == BatteryManager.BATTERY_PLUGGED_AC || plugged == BatteryManager.BATTERY_PLUGGED_USB;
-	}
-
-	public static Bitmap downloadImage(String urlStr) throws IOException {
-		URL url = new URL(urlStr);
-		URLConnection connection = url.openConnection();
-		BufferedInputStream bis = new BufferedInputStream(connection.getInputStream());
-		Bitmap result = BitmapFactory.decodeStream(bis);
-		bis.close();
-		return result;
-	}
-
-	public static boolean isDebugMode(Context context){
-		if(context != null  && context.getApplicationInfo() != null){
-			return 0 != ( context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE );
-		}
-		return false;
-	}
+    /**
+     * Check to see if a component is exported
+     *
+     * @param context object used to retrieve the package manager
+     * @param name    of the component in question
+     * @return true if this component is tagged as exported
+     */
+    public static boolean isServiceExported(Context context, ComponentName name) {
+        try {
+            ServiceInfo serviceInfo = context.getPackageManager().getServiceInfo(name, PackageManager.GET_META_DATA);
+            return serviceInfo.exported;
+        } catch (NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * Get all SDL enabled apps. If the package name is null, it will return all apps. However, if the package name is included, the
+     * resulting hash map will not include the app with that package name.
+     *
+     * @param context       a context object used to get an instance of the package manager
+     * @param myPackageName the package of the requesting app. This should only be included if the app wants to exclude itself from the map
+     * @return a hash map of SDL apps with the package name as the key, and the ResolveInfo as the value
+     */
+    public static HashMap<String, ResolveInfo> getSdlEnabledApps(Context context, String myPackageName) {
+        Intent intent = new Intent(TransportConstants.START_ROUTER_SERVICE_ACTION);
+        List<ResolveInfo> infos = context.getPackageManager().queryBroadcastReceivers(intent, 0);
+        HashMap<String, ResolveInfo> sdlMultiList = new HashMap<>();
+        for (ResolveInfo info : infos) {
+            if (info.activityInfo.applicationInfo.packageName.equals(myPackageName)) {
+                continue; //Ignoring my own package
+            }
+            sdlMultiList.put(info.activityInfo.packageName, info);
+        }
+        return sdlMultiList;
+    }
+
+
+    /**
+     * Finds all SDL apps via their SdlRouterService manifest entry. It will return the metadata associated with that router service.
+     *
+     * @param context    a context instance to obtain the package manager
+     * @param comparator the Comparator to sort the resulting list. If null is supplied, they will be returned as they are from the system
+     * @return the sorted list of SdlAppInfo objects that represent SDL apps
+     */
+    public static List<SdlAppInfo> querySdlAppInfo(Context context, Comparator<SdlAppInfo> comparator) {
+        List<SdlAppInfo> sdlAppInfoList = new ArrayList<>();
+        Intent intent = new Intent(TransportConstants.ROUTER_SERVICE_ACTION);
+        List<ResolveInfo> resolveInfoList = context.getPackageManager().queryIntentServices(intent, PackageManager.GET_META_DATA);
+
+        if (resolveInfoList != null && resolveInfoList.size() > 0) {
+            PackageManager packageManager = context.getPackageManager();
+            if (packageManager != null) {
+
+                for (ResolveInfo info : resolveInfoList) {
+                    PackageInfo packageInfo;
+                    try {
+                        packageInfo = packageManager.getPackageInfo(info.serviceInfo.packageName, 0);
+                        sdlAppInfoList.add(new SdlAppInfo(info, packageInfo));
+                    } catch (NameNotFoundException e) {
+                        //Package was not found, likely a sign the resolve info can't be trusted.
+                    }
+
+                }
+            }
+
+            if (comparator != null) {
+                Collections.sort(sdlAppInfoList, comparator);
+            }
+        }
+
+        return sdlAppInfoList;
+    }
+
+
+    /**
+     * Sends the provided intent to the specified destinations making it an explicit intent, rather
+     * than an implicit intent. A direct replacement of sendBroadcast(Intent). As of Android 8.0
+     * (API 26+) implicit broadcasts are no longer sent to broadcast receivers that are declared via
+     * the AndroidManifest. If no apps are found to receive the intent, this method will send the
+     * broadcast implicitly if no list of apps is provided.
+     *
+     * @param intent - the intent to send explicitly
+     * @param apps   - the list of apps that this broadcast will be sent to. If null is passed in
+     *               the intent will be sent to all apps that match the provided intent via a query
+     *               to the package manager; it will also be sent implicitly to mimic
+     *               sendBroadcast()'s original functionality.
+     */
+    public static void sendExplicitBroadcast(Context context, Intent intent, List<ResolveInfo> apps) {
+
+        if (context == null || intent == null) {
+            return;
+        }
+
+        if (apps == null) {
+            apps = context.getPackageManager().queryBroadcastReceivers(intent, 0);
+        }
+
+        if (apps != null && apps.size() > 0) {
+            for (ResolveInfo app : apps) {
+                try {
+                    intent.setClassName(app.activityInfo.applicationInfo.packageName, app.activityInfo.name);
+                    context.sendBroadcast(intent);
+                } catch (Exception e) {
+                    //In case there is missing info in the app reference we want to keep moving
+                }
+            }
+        } else {
+            // fallback to implicit broadcast if we cannot resolve apps info.
+            context.sendBroadcast(intent);
+        }
+    }
+
+    /**
+     * Checks if the usb cable is physically connected or not
+     * Note: the intent here is a sticky intent so registerReceiver is actually a synchronous call and doesn't register a receiver on each call
+     *
+     * @param context a context instance
+     * @return boolean value that represents whether the usb cable is physically connected or not
+     */
+    public static boolean isUSBCableConnected(Context context) {
+        Intent intent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        if (intent == null) {
+            return false;
+        }
+        int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1);
+        return plugged == BatteryManager.BATTERY_PLUGGED_AC || plugged == BatteryManager.BATTERY_PLUGGED_USB;
+    }
+
+    public static Bitmap downloadImage(String urlStr) throws IOException {
+        URL url = new URL(urlStr);
+        URLConnection connection = url.openConnection();
+        BufferedInputStream bis = new BufferedInputStream(connection.getInputStream());
+        Bitmap result = BitmapFactory.decodeStream(bis);
+        bis.close();
+        return result;
+    }
+
+    public static boolean isDebugMode(Context context) {
+        if (context != null && context.getApplicationInfo() != null) {
+            return 0 != (context.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE);
+        }
+        return false;
+    }
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java
index 1cc0b514c..295a06935 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpRequestTask.java
@@ -14,7 +14,7 @@
  * distribution.
  *
  * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
+ * contributors may be used to endorse or promote products derived from this
  * software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
@@ -44,167 +44,168 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 
 public class HttpRequestTask extends AsyncTask<String, String, String> {
-	private static final String TAG = "Http Request Task";
-
-	public static final String REQUEST_TYPE_POST = "POST";
-	public static final String REQUEST_TYPE_GET = "GET";
-	public static final String REQUEST_TYPE_DELETE = "DELETE";
-
-	HttpRequestTaskCallback cb;
-
-	/**
-	 * @param hcb callback for when this task finishes
-	 * <br><br><b> - When calling execute, params as followed: </b><br>
-	 *  1. Url String<br>
-	 *  2. Request type (Defined in this class) REQUEST_TYPE_POST, REQUEST_TYPE_GET, REQUEST_TYPE_DELETE<br>
-	 *  3. (Optional) Data to be sent. <br>
-	 *  4. (Optional) Content Type  Default will be application/json<br>
-	 *  5. (Optional) Accept Type  default will be application/json
-	 * 
-	 */
-	public HttpRequestTask( HttpRequestTaskCallback hcb){
-		this.cb = hcb; 
-	}
-
-	@Override
-	protected String doInBackground(String... params) {
-		int length = params.length;
-		String urlString = params[0];
-		String request_type = params[1];
-
-		//Grab and set data to be written if included
-		String data;
-		if(length>2){
-			data = params[2];
-		}else{
-			data = null;
-		}
-
-		//Grab and set content type for the header if included
-		String contentType;
-		if(length>3){
-			contentType = params[3];
-		}else{
-			contentType = "application/json";
-		}
-		//Grab and set accept type for the header if included
-		String acceptType;
-		if(length>4){
-			acceptType = params[4];
-		}else{
-			acceptType = "application/json";
-		}
-
-		if(urlString == null || request_type == null){
-			DebugTool.logError(TAG, "Can't process request, param error");
-			if(cb!=null){
-				cb.httpFailure(-1);
-				cb = null;
-			}
-			return "Error";
-		}
-
-		HttpURLConnection urlConnection = null;
-		BufferedReader reader = null;
-		try {
-			URL url = new URL(urlString);
-			urlConnection = (HttpURLConnection) url.openConnection();
-			urlConnection.setDoOutput(true);
-			urlConnection.setRequestMethod(request_type);
-			urlConnection.setRequestProperty("Content-Type", contentType);
-			urlConnection.setRequestProperty("Accept", acceptType);
-			//If we have data, we should write it out
-			if(data !=null){
-				Writer writer = new BufferedWriter(new OutputStreamWriter(urlConnection.getOutputStream(), "UTF-8"));
-				writer.write(data);
-				writer.close();
-			}
-			InputStream inputStream = urlConnection.getInputStream();
-
-			int responseCode = urlConnection.getResponseCode();
-			if (responseCode == 200) { //Success
-				//input stream
-				StringBuffer buffer = new StringBuffer();
-				if (inputStream == null) {
-					// Nothing to do.
-					if(cb!=null){
-						cb.httpCallComplete(null);
-						cb = null;
-					}
-					return null;
-				}
-				reader = new BufferedReader(new InputStreamReader(inputStream));
-
-				String inputLine;
-				while ((inputLine = reader.readLine()) != null)
-					buffer.append(inputLine).append("\n");
-				if (buffer.length() == 0) {
-					// Stream was empty. No point in parsing.
-					if(cb!=null){
-						cb.httpCallComplete(null);
-						cb = null;
-					}
-					return null;
-				}
-				String response;
-
-				response = buffer.toString();
-				//send to post execute
-				if(cb!=null){
-					cb.httpCallComplete(response);
-					cb = null;
-				}
-				return response;
-			}else{
-				if(cb!=null){
-					cb.httpFailure(responseCode);
-					cb = null;
-				}
-				DebugTool.logError(TAG, "Failed to download file - " + responseCode);
-				return null;
-			}
-
-			
-		} catch (IOException e) {
-			e.printStackTrace();
-		} catch (NullPointerException e){ // Only to catch error in urlConnection.getOutputStream() - when servers are down
-			e.printStackTrace();
-			urlConnection = null;
-		}
-		finally {
-			if (urlConnection != null) {
-				urlConnection.disconnect();
-			}
-			if (reader != null) {
-				try {
-					reader.close();
-				} catch (final IOException e) {
-					DebugTool.logError(TAG, "Error closing stream", e);
-				}
-			}
-			if(cb!=null){
-				cb.httpFailure(-1);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Callback interface for HTTP requests.
-	 * @author Joey Grover
-	 *
-	 */
-	public interface HttpRequestTaskCallback{
-		/**
-		 * Called when HTTP request is successfully completed.
-		 * @param response The response to the HTTP request.
-		 */
-		void httpCallComplete(String response);
-		/**
-		 * Called when HTTP request failed.
-		 * @param statusCode The HTTP failure code.
-		 */
-		void httpFailure(int statusCode);
-	}
+    private static final String TAG = "Http Request Task";
+
+    public static final String REQUEST_TYPE_POST = "POST";
+    public static final String REQUEST_TYPE_GET = "GET";
+    public static final String REQUEST_TYPE_DELETE = "DELETE";
+
+    HttpRequestTaskCallback cb;
+
+    /**
+     * @param hcb callback for when this task finishes
+     *            <br><br><b> - When calling execute, params as followed: </b><br>
+     *            1. Url String<br>
+     *            2. Request type (Defined in this class) REQUEST_TYPE_POST, REQUEST_TYPE_GET, REQUEST_TYPE_DELETE<br>
+     *            3. (Optional) Data to be sent. <br>
+     *            4. (Optional) Content Type  Default will be application/json<br>
+     *            5. (Optional) Accept Type  default will be application/json
+     */
+    public HttpRequestTask(HttpRequestTaskCallback hcb) {
+        this.cb = hcb;
+    }
+
+    @Override
+    protected String doInBackground(String... params) {
+        int length = params.length;
+        String urlString = params[0];
+        String request_type = params[1];
+
+        //Grab and set data to be written if included
+        String data;
+        if (length > 2) {
+            data = params[2];
+        } else {
+            data = null;
+        }
+
+        //Grab and set content type for the header if included
+        String contentType;
+        if (length > 3) {
+            contentType = params[3];
+        } else {
+            contentType = "application/json";
+        }
+        //Grab and set accept type for the header if included
+        String acceptType;
+        if (length > 4) {
+            acceptType = params[4];
+        } else {
+            acceptType = "application/json";
+        }
+
+        if (urlString == null || request_type == null) {
+            DebugTool.logError(TAG, "Can't process request, param error");
+            if (cb != null) {
+                cb.httpFailure(-1);
+                cb = null;
+            }
+            return "Error";
+        }
+
+        HttpURLConnection urlConnection = null;
+        BufferedReader reader = null;
+        try {
+            URL url = new URL(urlString);
+            urlConnection = (HttpURLConnection) url.openConnection();
+            urlConnection.setDoOutput(true);
+            urlConnection.setRequestMethod(request_type);
+            urlConnection.setRequestProperty("Content-Type", contentType);
+            urlConnection.setRequestProperty("Accept", acceptType);
+            //If we have data, we should write it out
+            if (data != null) {
+                Writer writer = new BufferedWriter(new OutputStreamWriter(urlConnection.getOutputStream(), "UTF-8"));
+                writer.write(data);
+                writer.close();
+            }
+            InputStream inputStream = urlConnection.getInputStream();
+
+            int responseCode = urlConnection.getResponseCode();
+            if (responseCode == 200) { //Success
+                //input stream
+                StringBuffer buffer = new StringBuffer();
+                if (inputStream == null) {
+                    // Nothing to do.
+                    if (cb != null) {
+                        cb.httpCallComplete(null);
+                        cb = null;
+                    }
+                    return null;
+                }
+                reader = new BufferedReader(new InputStreamReader(inputStream));
+
+                String inputLine;
+                while ((inputLine = reader.readLine()) != null)
+                    buffer.append(inputLine).append("\n");
+                if (buffer.length() == 0) {
+                    // Stream was empty. No point in parsing.
+                    if (cb != null) {
+                        cb.httpCallComplete(null);
+                        cb = null;
+                    }
+                    return null;
+                }
+                String response;
+
+                response = buffer.toString();
+                //send to post execute
+                if (cb != null) {
+                    cb.httpCallComplete(response);
+                    cb = null;
+                }
+                return response;
+            } else {
+                if (cb != null) {
+                    cb.httpFailure(responseCode);
+                    cb = null;
+                }
+                DebugTool.logError(TAG, "Failed to download file - " + responseCode);
+                return null;
+            }
+
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (NullPointerException e) { // Only to catch error in urlConnection.getOutputStream() - when servers are down
+            e.printStackTrace();
+            urlConnection = null;
+        } finally {
+            if (urlConnection != null) {
+                urlConnection.disconnect();
+            }
+            if (reader != null) {
+                try {
+                    reader.close();
+                } catch (final IOException e) {
+                    DebugTool.logError(TAG, "Error closing stream", e);
+                }
+            }
+            if (cb != null) {
+                cb.httpFailure(-1);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Callback interface for HTTP requests.
+     *
+     * @author Joey Grover
+     */
+    public interface HttpRequestTaskCallback {
+        /**
+         * Called when HTTP request is successfully completed.
+         *
+         * @param response The response to the HTTP request.
+         */
+        void httpCallComplete(String response);
+
+        /**
+         * Called when HTTP request failed.
+         *
+         * @param statusCode The HTTP failure code.
+         */
+        void httpFailure(int statusCode);
+    }
 
 }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java
index e7a4b69d6..dc0bde5ed 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/MediaStreamingStatus.java
@@ -53,7 +53,7 @@ import java.util.List;
 
 /**
  * Possible improvements
- *
+ * <p>
  * - Narrow down list of acceptable audio devices
  * - Add ability to listen for when audio devices become available, and then connect
  * - Improve redundant calls to create String arrays for action arrays
@@ -68,7 +68,7 @@ public class MediaStreamingStatus {
     private Callback callback;
     private final List<String> intentList;
 
-    public MediaStreamingStatus(@NonNull Context context, @NonNull Callback callback){
+    public MediaStreamingStatus(@NonNull Context context, @NonNull Callback callback) {
         contextWeakReference = new WeakReference<>(context);
         this.callback = callback;
         intentList = new ArrayList<>();
@@ -76,7 +76,7 @@ public class MediaStreamingStatus {
         intentList.add(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
     }
 
-    public void clear(){
+    public void clear() {
         callback = null;
         unregisterBroadcastReceiver();
         contextWeakReference.clear();
@@ -109,13 +109,15 @@ public class MediaStreamingStatus {
     @SuppressLint("MissingPermission")
     public synchronized boolean isAudioOutputAvailable() {
         Context context = contextWeakReference.get();
-        if(context == null){ return false;}
+        if (context == null) {
+            return false;
+        }
 
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
 
         // If API level 23+ audio manager can iterate over all current devices to see if a supported
         // device is present.
-        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (audioManager != null) {
                 AudioDeviceInfo[] deviceInfos = audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS);
                 if (deviceInfos != null) {
@@ -141,23 +143,24 @@ public class MediaStreamingStatus {
      * This method will check to ensure that the device is supported. If possible, it will also
      * check against known variables and flags to ensure that that device is connected. This is
      * required as the AudioManager tends to be untrustworthy.
+     *
      * @param audioDevice
      * @return
      */
-    boolean isSupportedAudioDevice(int audioDevice){
+    boolean isSupportedAudioDevice(int audioDevice) {
         DebugTool.logInfo(TAG, "Audio device connected: " + audioDevice);
-        switch (audioDevice){
+        switch (audioDevice) {
             case AudioDeviceInfo.TYPE_BLUETOOTH_A2DP:
-              if(isBluetoothActuallyAvailable()) {
-                  setupBluetoothBroadcastReceiver();
-                  return true; //Make sure this doesn't fall to any other logic after this point
-              }
-              return false;
+                if (isBluetoothActuallyAvailable()) {
+                    setupBluetoothBroadcastReceiver();
+                    return true; //Make sure this doesn't fall to any other logic after this point
+                }
+                return false;
             case AudioDeviceInfo.TYPE_DOCK:
             case AudioDeviceInfo.TYPE_USB_ACCESSORY:
             case AudioDeviceInfo.TYPE_USB_DEVICE:
             case AudioDeviceInfo.TYPE_USB_HEADSET:
-                if(isUsbActuallyConnected()) {
+                if (isUsbActuallyConnected()) {
                     setupUSBBroadcastReceiver();
                     return true;
                 }
@@ -174,15 +177,15 @@ public class MediaStreamingStatus {
     }
 
     @SuppressLint("MissingPermission")
-    boolean isBluetoothActuallyAvailable(){
+    boolean isBluetoothActuallyAvailable() {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        if(adapter == null || !adapter.isEnabled() ){
+        if (adapter == null || !adapter.isEnabled()) {
             //False positive
             return false;
         }
 
         int state = adapter.getProfileConnectionState(BluetoothProfile.A2DP);
-        if(state != BluetoothAdapter.STATE_CONNECTING && state != BluetoothAdapter.STATE_CONNECTED){
+        if (state != BluetoothAdapter.STATE_CONNECTING && state != BluetoothAdapter.STATE_CONNECTED) {
             //False positive
             return false;
         }
@@ -190,17 +193,17 @@ public class MediaStreamingStatus {
         return true;
     }
 
-    boolean isUsbActuallyConnected(){
+    boolean isUsbActuallyConnected() {
         Context context = contextWeakReference.get();
-        if(context != null){
-           return AndroidTools.isUSBCableConnected(context);
+        if (context != null) {
+            return AndroidTools.isUSBCableConnected(context);
         }
         //default to true
         return true;
     }
 
 
-    private void setupBluetoothBroadcastReceiver(){
+    private void setupBluetoothBroadcastReceiver() {
         String[] actions = new String[4];
         actions[0] = BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED;
         actions[1] = BluetoothAdapter.ACTION_STATE_CHANGED;
@@ -210,37 +213,37 @@ public class MediaStreamingStatus {
         listenForIntents(actions);
     }
 
-    private void setupHeadsetBroadcastReceiver(){
+    private void setupHeadsetBroadcastReceiver() {
         String[] actions = new String[1];
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             actions[0] = AudioManager.ACTION_HEADSET_PLUG;
-        }else{
-            actions[0] =  "android.intent.action.HEADSET_PLUG";
+        } else {
+            actions[0] = "android.intent.action.HEADSET_PLUG";
         }
 
         listenForIntents(actions);
     }
 
-    private void setupUSBBroadcastReceiver(){
+    private void setupUSBBroadcastReceiver() {
         String[] actions = new String[1];
         actions[0] = Intent.ACTION_BATTERY_CHANGED;
 
         listenForIntents(actions);
     }
 
-    private void listenForIntents(@NonNull String[] actions){
-        if(intentList != null){
+    private void listenForIntents(@NonNull String[] actions) {
+        if (intentList != null) {
             //Add each intent
             int preAddSize = intentList.size();
 
-            for(String action : actions){
-                if(action != null && action.length() > 0 && !intentList.contains(action)){
+            for (String action : actions) {
+                if (action != null && action.length() > 0 && !intentList.contains(action)) {
                     intentList.add(action);
                 }
             }
 
-            if(preAddSize != intentList.size()){
-                synchronized (BROADCAST_RECEIVER_LOCK){
+            if (preAddSize != intentList.size()) {
+                synchronized (BROADCAST_RECEIVER_LOCK) {
                     broadcastReceiverValid = true;
                 }
                 updateBroadcastReceiver();
@@ -264,12 +267,12 @@ public class MediaStreamingStatus {
 
     }
 
-    private void unregisterBroadcastReceiver(){
+    private void unregisterBroadcastReceiver() {
         Context context = contextWeakReference.get();
-        if(context != null) {
-            try{
+        if (context != null) {
+            try {
                 context.unregisterReceiver(broadcastReceiver);
-            }catch (Exception e){
+            } catch (Exception e) {
                 //Ignore the exception
             }
         }
@@ -296,7 +299,7 @@ public class MediaStreamingStatus {
     };
 
 
-    public interface Callback{
+    public interface Callback {
         void onAudioNoLongerAvailable();
     }
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
index 35c852c09..d49e63575 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
@@ -58,16 +58,16 @@ public class SdlAppInfo {
     long lastUpdateTime;
 
 
-    public SdlAppInfo(ResolveInfo resolveInfo, PackageInfo packageInfo){
-        if(resolveInfo.serviceInfo != null){
+    public SdlAppInfo(ResolveInfo resolveInfo, PackageInfo packageInfo) {
+        if (resolveInfo.serviceInfo != null) {
 
             this.packageName = resolveInfo.serviceInfo.packageName;
             this.routerServiceComponentName = new ComponentName(resolveInfo.serviceInfo.packageName, resolveInfo.serviceInfo.name);
 
             Bundle metadata = resolveInfo.serviceInfo.metaData;
-            if(metadata != null) {
+            if (metadata != null) {
 
-                if (metadata.containsKey(SDL_ROUTER_VERSION_METADATA)){
+                if (metadata.containsKey(SDL_ROUTER_VERSION_METADATA)) {
                     this.routerServiceVersion = metadata.getInt(SDL_ROUTER_VERSION_METADATA);
                 }
 
@@ -79,12 +79,12 @@ public class SdlAppInfo {
             }
         }
 
-        if(packageInfo != null){
+        if (packageInfo != null) {
             this.lastUpdateTime = packageInfo.lastUpdateTime;
-            if(this.lastUpdateTime <= 0){
+            if (this.lastUpdateTime <= 0) {
                 this.lastUpdateTime = packageInfo.firstInstallTime;
             }
-        }else{
+        } else {
             this.lastUpdateTime = 0;
         }
     }
@@ -129,44 +129,43 @@ public class SdlAppInfo {
 
     /**
      * This comparator will sort a list to find the best router service to start out of the known SDL enabled apps
-     *
      */
-    public static class BestRouterComparator implements Comparator<SdlAppInfo>{
+    public static class BestRouterComparator implements Comparator<SdlAppInfo> {
 
         @Override
         public int compare(SdlAppInfo one, SdlAppInfo two) {
-            if(one != null){
-                if(two != null){
-                    if(one.isCustomRouterService){
-                        if(two.isCustomRouterService){
+            if (one != null) {
+                if (two != null) {
+                    if (one.isCustomRouterService) {
+                        if (two.isCustomRouterService) {
                             return 0;
-                        }else{
+                        } else {
                             return 1;
                         }
-                    }else if(two.isCustomRouterService){
+                    } else if (two.isCustomRouterService) {
                         return -1;
 
                     }//else, do nothing. Move to version check
 
-                    int versionCompare =  two.routerServiceVersion  - one.routerServiceVersion;
+                    int versionCompare = two.routerServiceVersion - one.routerServiceVersion;
 
-                    if(versionCompare == 0){ //Versions are equal so lets use the one that has been updated most recently
-                        long updateTime =  two.lastUpdateTime - one.lastUpdateTime;
-                        if(updateTime == 0){
+                    if (versionCompare == 0) { //Versions are equal so lets use the one that has been updated most recently
+                        long updateTime = two.lastUpdateTime - one.lastUpdateTime;
+                        if (updateTime == 0) {
                             //This is arbitrary, but we want to ensure all lists are sorted in the same order
-                            return  one.routerServiceComponentName.getPackageName().compareTo(two.routerServiceComponentName.getPackageName());
-                        }else{
+                            return one.routerServiceComponentName.getPackageName().compareTo(two.routerServiceComponentName.getPackageName());
+                        } else {
                             return (updateTime < 0 ? -1 : 1);
                         }
-                    }else{
+                    } else {
                         return (versionCompare < 0 ? -1 : 1);
                     }
 
-                }else{
+                } else {
                     return -1;
                 }
-            }else{
-                if(two != null){
+            } else {
+                if (two != null) {
                     return 1;
                 }
             }
diff --git a/android/sdl_android/src/main/res/layout/activity_sdllock_screen.xml b/android/sdl_android/src/main/res/layout/activity_sdllock_screen.xml
index ce287ed04..405558455 100644
--- a/android/sdl_android/src/main/res/layout/activity_sdllock_screen.xml
+++ b/android/sdl_android/src/main/res/layout/activity_sdllock_screen.xml
@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/lockscreen_relative_layout"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
+    android:id="@+id/lockscreen_relative_layout"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
 
     <LinearLayout
         android:id="@+id/lockscreen_linear_layout"
@@ -26,7 +26,7 @@
             android:scaleType="fitXY"
             android:layout_gravity="center_horizontal"
             android:contentDescription="@string/lockscreen_image_description"
-            android:visibility="gone"/>
+            android:visibility="gone" />
 
         <ImageView
             android:id="@+id/device_image"
@@ -35,7 +35,7 @@
             android:layout_marginTop="30dp"
             android:scaleType="fitXY"
             android:layout_gravity="center_horizontal"
-            android:contentDescription="@string/lockscreen_device_image_description"/>
+            android:contentDescription="@string/lockscreen_device_image_description" />
 
     </LinearLayout>
 
@@ -47,6 +47,6 @@
         android:textSize="18sp"
         android:gravity="center|bottom"
         android:textColor="#FFFFFF"
-        android:paddingBottom="10dp"/>
+        android:paddingBottom="10dp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/sdl_android/src/main/res/xml/accessory_filter.xml b/android/sdl_android/src/main/res/xml/accessory_filter.xml
index 4b0ab7c83..6a6e1ea97 100644
--- a/android/sdl_android/src/main/res/xml/accessory_filter.xml
+++ b/android/sdl_android/src/main/res/xml/accessory_filter.xml
@@ -3,5 +3,5 @@
     <usb-accessory
         manufacturer="SDL"
         model="Core"
-        version="1.0"/>
+        version="1.0" />
 </resource>
\ No newline at end of file