Move Andorid Tests

255 files changed, 0 insertions, 0 deletions

diff --git a/sdl_android_tests/src/com/smartdevicelink/SdlConnection/SdlConnectionTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java
index 90122905a..90122905a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/SdlConnection/SdlConnectionTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/SdlConnection/SdlConnectionTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/protocol/WiProProtocolTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
index 5eb04ca81..5eb04ca81 100644
--- a/sdl_android_tests/src/com/smartdevicelink/protocol/WiProProtocolTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/protocol/WiProProtocolTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/BaseRpcTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
index 9670492b0..9670492b0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/BaseRpcTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/BaseRpcTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/Config.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java
index 7f424bda9..7f424bda9 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/Config.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Config.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/JsonUtils.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java
index 35ce94192..35ce94192 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/JsonUtils.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/JsonUtils.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/Logger.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java
index ab922fd7a..ab922fd7a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/Logger.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Logger.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/NullValues.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java
index ce5972887..ce5972887 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/NullValues.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/NullValues.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/SampleRpc.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java
index 67c15706c..67c15706c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/SampleRpc.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/SampleRpc.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/SdlUnitTestContants.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java
index 3b38b94f3..3b38b94f3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/SdlUnitTestContants.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/SdlUnitTestContants.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/Test.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java
index 9acf6e24e..9acf6e24e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/Test.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Test.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/Validator.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
index e20098a60..e20098a60 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/Validator.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/VehicleDataHelper.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
index ef19542fa..ef19542fa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/VehicleDataHelper.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/JsonFileReader.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java
index e60b35d2e..e60b35d2e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/JsonFileReader.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/json/rpc/JsonFileReader.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
index 60a97a35c..60a97a35c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/BinaryFrameHeaderTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
index 89d040c90..89d040c90 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
index 07563248e..07563248e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
index 241872b7a..241872b7a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java
index d0cb7cc30..d0cb7cc30 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/MessageTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
index 8a8634cc4..8a8634cc4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java
index 0b5524786..0b5524786 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/protocol/heartbeat/HeartbeatMonitorTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java
index f5baf5e06..f5baf5e06 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/proxy/LockScreenManagerTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java
index ceba82f36..ceba82f36 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/proxy/LockScreenManagerTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/LockScreenManagerTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java
index b334058ea..b334058ea 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java
index 222ab5bbc..222ab5bbc 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
index d65e68760..d65e68760 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
index 476898685..476898685 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
index 5fb53ef3d..5fb53ef3d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
index 245ee7ec8..245ee7ec8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
index b8001dc2c..b8001dc2c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
index e53ea8c2a..e53ea8c2a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
index 883b456fa..883b456fa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
index b929f2f80..b929f2f80 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DTCTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
index 3079d2003..3079d2003 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
index cbd432cc2..cbd432cc2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
index 4c966f06e..4c966f06e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
index 689c3948f..689c3948f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
index 82a57869a..82a57869a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
index 6d72e440f..6d72e440f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
index 0c6800ea5..0c6800ea5 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
index fd82505f2..fd82505f2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
index 277786344..277786344 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
index 09c69022f..09c69022f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
index 4291621df..4291621df 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
index 83f3126cf..83f3126cf 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
index fdbcc8590..fdbcc8590 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
index 3eaf88e28..3eaf88e28 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
index ea823f619..ea823f619 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
index 48b0f33ab..48b0f33ab 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
index a40f6a1b0..a40f6a1b0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
index 465783ba2..465783ba2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
index f56d2a212..f56d2a212 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
index 4621f8950..4621f8950 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
index c94afc643..c94afc643 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
index aa6d7fadd..aa6d7fadd 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
index 125aa5e41..125aa5e41 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
index b2dfb54fc..b2dfb54fc 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
index f84ca3ec3..f84ca3ec3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
index 598993771..598993771 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
index 6b5d4d3e2..6b5d4d3e2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
index 5552a5c29..5552a5c29 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
index cfa4a4f33..cfa4a4f33 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
index b488d4cb7..b488d4cb7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
index e3207f704..e3207f704 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TurnTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
index 8986fd4a9..8986fd4a9 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
index 8d5d1e861..8d5d1e861 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
index 17f663ae6..17f663ae6 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
index 55f00dd1c..55f00dd1c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
index 859eafba0..859eafba0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AmbientLightStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
index 76d203901..76d203901 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppHmiTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
index 8896d13e7..8896d13e7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AppInterfaceUnregisteredReasonTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
index ab5972218..ab5972218 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioStreamingStateTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
index 6cbecf09a..6cbecf09a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/AudioTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
index 65b4766e8..65b4766e8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/BitsPerSampleTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
index 4145844ee..4145844ee 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonEventModeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
index 1db7c4580..1db7c4580 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonNameTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
index cbfe16a73..cbfe16a73 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ButtonPressModeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
index d66760d9a..d66760d9a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CarModeStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
index 99bc37265..99bc37265 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CharacterSetTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
index 7eb7d31a0..7eb7d31a0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/CompassDirectionTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
index 20946252c..20946252c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ComponentVolumeStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
index 71c15d0fb..71c15d0fb 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DeviceLevelStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DimensionTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java
index 035ac202a..035ac202a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DimensionTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DimensionTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
index 83af2561e..83af2561e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DisplayTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
index 2d85caa21..2d85caa21 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/DriverDistractionStateTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
index 9ce602ee1..9ce602ee1 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ECallConfirmationStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
index 21823e4bd..21823e4bd 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/EmergencyEventTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FileTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
index 4db206cad..4db206cad 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FileTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
index 4900203f2..4900203f2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/FuelCutoffStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
index fd7388a6c..fd7388a6c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
index b64f9e42b..b64f9e42b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiLevelTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
index ebe8227c2..ebe8227c2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/HmiZoneCapabilitiesTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
index fc9a8658a..fc9a8658a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStableStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
index 8fc1992ab..8fc1992ab 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/IgnitionStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
index 13937cd89..13937cd89 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageFieldNameTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
index fb3f609f3..fb3f609f3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ImageTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
index ab6490cea..ab6490cea 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/InteractionModeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/JingleTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java
index da5ea2836..da5ea2836 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/JingleTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/JingleTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
index 71448acf6..71448acf6 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardEventTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
index 14d61aa51..14d61aa51 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeyboardLayoutTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
index 8bd652969..8bd652969 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/KeypressModeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LanguageTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java
index 3679a9ffc..3679a9ffc 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LanguageTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LanguageTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
index 904a39520..904a39520 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LayoutModeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
index ed380d607..ed380d607 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/LockScreenStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
index 1895430e5..1895430e5 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/MediaClockFormatTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
index f3a2a3540..f3a2a3540 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeQualificationStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
index 9154a06f0..9154a06f0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PowerModeStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
index 9ab3c9db8..9ab3c9db8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrerecordedSpeechTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
index 94c2e2b39..94c2e2b39 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrimaryAudioSourceTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrndlTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java
index fabf94177..fabf94177 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/PrndlTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/PrndlTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
index ea50b11b1..ea50b11b1 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/RequestTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ResultTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java
index 3eaae9937..3eaae9937 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/ResultTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/ResultTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
index 062ce7df3..062ce7df3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SamplingRateTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
index a96988af7..a96988af7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SdlDisconnectedReasonTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
index d4ef5c0ff..d4ef5c0ff 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SoftButtonTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
index 2ed1b4a77..2ed1b4a77 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SpeechCapabilitiesTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemActionTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
index 807da0b8a..807da0b8a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemActionTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemContextTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
index 9b325492e..9b325492e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/SystemContextTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TbtStateTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
index 1fbf8055a..1fbf8055a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TbtStateTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
index 1b1130806..1b1130806 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextAlignmentTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
index 7d0050e66..7d0050e66 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TextFieldNameTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
index 06636a045..06636a045 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TouchTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
index 5197dec64..5197dec64 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/TriggerSourceTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
index 2c808ef03..2c808ef03 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/UpdateModeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
index bcee65b19..bcee65b19 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataEventStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
index af2f45714..af2f45714 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataNotificationStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
index e2161474a..e2161474a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataResultCodeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
index d35780ff4..d35780ff4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
index 7490940fa..7490940fa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
index 33da334b8..33da334b8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VrCapabilitiesTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
index 18c6cc046..18c6cc046 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WarningLightStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
index 1ab3370fa..1ab3370fa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/WiperStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java
index e3c1ee32c..e3c1ee32c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAppInterfaceUnregisteredTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
index b2add2f34..b2add2f34 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java
index 5f6e2e8e3..5f6e2e8e3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonEventTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java
index be3c63be2..be3c63be2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnButtonPressTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java
index 46026f007..46026f007 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnCommandTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java
index 090582586..090582586 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnDriverDistractionTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java
index a907c8942..a907c8942 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
index 329018aa2..329018aa2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHMIStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java
index 16e101860..16e101860 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnHashChangeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java
index e950d85fa..e950d85fa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnKeyboardInputTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java
index 382ef074c..382ef074c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLanguageChangeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java
index 8df1cb641..8df1cb641 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnLockScreenStatusTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
index c3d4c4f46..c3d4c4f46 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java
index defede878..defede878 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java
index d186098c3..d186098c3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
index 2725f4eae..2725f4eae 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
index fbe073259..fbe073259 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java
index 47352f6f5..47352f6f5 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTBTClientStateTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
index 613afa55b..613afa55b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
index 5d328813c..5d328813c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddCommandTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
index f4864a52d..f4864a52d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
index e44340216..e44340216 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
index 83d8e1835..83d8e1835 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
index 21a33aac0..21a33aac0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/AlertTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
index 37ae9e6f9..37ae9e6f9 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
index 168666dcb..168666dcb 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
index 43af829e4..43af829e4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
index 8d8300e0c..8d8300e0c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
index b9b1bbc15..b9b1bbc15 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
index db9e06e12..db9e06e12 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
index 4ee758c3d..4ee758c3d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
index 448f592ed..448f592ed 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
index 1d5cbcad1..1d5cbcad1 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
index 658c28257..658c28257 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ListFilesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
index 31d20bacf..31d20bacf 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
index d3ecbdfeb..d3ecbdfeb 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
index 9ea36f43f..9ea36f43f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PerformInteractionTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PutFileTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java
index becca8eee..becca8eee 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PutFileTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/PutFileTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ReadDidTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java
index 477acc1aa..477acc1aa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ReadDidTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ReadDidTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
index 1310890b4..1310890b4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java
index dc4fda730..dc4fda730 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java
index f7bca8e78..f7bca8e78 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ScrollableMessageTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SendLocationTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
index ee9a93750..ee9a93750 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SendLocationTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java
index c9286b763..c9286b763 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetAppIconTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java
index cb48e812f..cb48e812f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java
index 5f791769b..5f791769b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
index 7d52bb75c..7d52bb75c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
index a6be52608..a6be52608 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
index 5899d9015..5899d9015 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/ShowTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SliderTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java
index 7c53681b9..7c53681b9 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SliderTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SliderTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SpeakTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java
index 2051b99f2..2051b99f2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SpeakTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SpeakTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java
index 4cb3e4b53..4cb3e4b53 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeButtonTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
index 83cdf0dcf..83cdf0dcf 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java
index 11f3f42a2..11f3f42a2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SystemRequestTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java
index 84607ee98..84607ee98 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java
index 789c8758a..789c8758a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
index 15cd321af..15cd321af 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
index f600e559b..f600e559b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
index efde2292d..efde2292d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
index 2a3888de7..2a3888de7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
index 64b3ff5f3..64b3ff5f3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
index a479da245..a479da245 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
index 906533bfd..906533bfd 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java
index f492d0458..f492d0458 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/CreateInteractionChoiceSetResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
index f40dbc895..f40dbc895 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
index 9d6886802..9d6886802 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
index e1b6233c0..e1b6233c0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
index 46fea52e0..46fea52e0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
index 2732d79b2..2732d79b2 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
index c50e39569..c50e39569 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java
index f80c6201b..f80c6201b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GenericResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
index 0a82ccd75..0a82ccd75 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
index 314a2f419..314a2f419 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
index 2a060c640..2a060c640 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
index b330fed72..b330fed72 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
index d3f1518af..d3f1518af 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
index bb355a05a..bb355a05a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
index 3ffc857cc..3ffc857cc 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
index a88256596..a88256596 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
index 7e2faa3e4..7e2faa3e4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
index 7c7ad5edf..7c7ad5edf 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
index c15607cec..c15607cec 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
index 977998047..977998047 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
index 2f188ff3b..2f188ff3b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
index ed2c894c8..ed2c894c8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
index 6cf9d2977..6cf9d2977 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
index f51739ee9..f51739ee9 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
index b012d1944..b012d1944 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
index 4f9b5be98..4f9b5be98 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
index 3488aeae6..3488aeae6 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
index 6eaa9f397..6eaa9f397 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
index a73500a94..a73500a94 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
index 80684a04a..80684a04a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
index 7d2fc1645..7d2fc1645 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
index 384c5df57..384c5df57 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
index 489f6bc1c..489f6bc1c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
index 757f3b185..757f3b185 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/security/SdlSecurityBaseTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
index 56a482804..56a482804 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/security/SdlSecurityBaseTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
index 6c5f663ba..6c5f663ba 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/streaming/StreamPacketizerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
index 2f4661aa8..2f4661aa8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamPacketizerTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
index 63fb437f7..63fb437f7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/trace/DiagLevelTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java
index bc1aa6060..bc1aa6060 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/trace/DiagLevelTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/DiagLevelTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/trace/MimeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java
index a39e87393..a39e87393 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/trace/MimeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/MimeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/trace/SdlTraceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java
index 8cec7f332..8cec7f332 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/trace/SdlTraceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/SdlTraceTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/trace/enums/DetailLevelTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java
index 615f0af4c..615f0af4c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/trace/enums/DetailLevelTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/DetailLevelTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java
index 4086788e6..4086788e6 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/InterfaceActivityDirectionTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/trace/enums/ModTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java
index 917960506..917960506 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/trace/enums/ModTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/trace/enums/ModTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/transport/BTTransportConfigTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BTTransportConfigTests.java
index 11b6ab39f..11b6ab39f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/transport/BTTransportConfigTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BTTransportConfigTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/transport/BaseTransportConfigTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
index c23b820eb..c23b820eb 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
index ae4bae4ce..ae4bae4ce 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
index c4bfad6cc..c4bfad6cc 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexTransportConfigTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/transport/SdlPsmTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java
index fe61af6f1..fe61af6f1 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/transport/SdlPsmTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/SdlPsmTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/transport/TCPTransportConfigTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java
index f08deea5a..f08deea5a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/transport/TCPTransportConfigTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TCPTransportConfigTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/transport/TransportTypeTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
index 7e3b894e5..7e3b894e5 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/transport/TransportTypeTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/TransportTypeTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/util/BitConverterTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java
index a3f0964b4..a3f0964b4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/util/BitConverterTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/BitConverterTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/util/ByteEnumerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java
index 7dcb1b3e8..7dcb1b3e8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/util/ByteEnumerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/ByteEnumerTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/util/DebugToolTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java
index e694a6747..e694a6747 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/util/DebugToolTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/DebugToolTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/util/NativeLogToolTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java
index fd09c6d76..fd09c6d76 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/util/NativeLogToolTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/NativeLogToolTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
index a4bdb8ab8..a4bdb8ab8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utl/AndroidToolsTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
index e15c95098..e15c95098 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/utl/AndroidToolsTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/utl/AndroidToolsTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/transport/LocalRouterServiceTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
index c918ffa12..c918ffa12 100644
--- a/sdl_android_tests/src/com/smartdevicelink/transport/LocalRouterServiceTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/LocalRouterServiceTests.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/transport/MultiplexTransportTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
index 9f0822a73..9f0822a73 100644
--- a/sdl_android_tests/src/com/smartdevicelink/transport/MultiplexTransportTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/MultiplexTransportTest.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/transport/RSVTestCase.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
index 03abbc7f4..03abbc7f4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/transport/RSVTestCase.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
diff --git a/sdl_android_tests/src/com/smartdevicelink/transport/TransportBrokerTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java
index bbc682fbc..bbc682fbc 100644
--- a/sdl_android_tests/src/com/smartdevicelink/transport/TransportBrokerTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportBrokerTest.java