Rearranged util classes to avoid confusion with library util tests classes and added documentation and testing to SdlDataTypeConverterTests class.

author: Mikayla Ray <mikayla@livioconnect.com> 2015-05-13 11:34:32 -0400
committer: Mikayla Ray <mikayla@livioconnect.com> 2015-05-13 11:34:32 -0400
commit: af6d11ec8ad8a9d031dca8c8fc0685929f45733d (patch)
tree: 7a55c8fefeb7ebb80c89a6471a1444746379b775
parent: 714c46f769258bbfdf67a77ccc748ee73bfdad0f (diff)
download: sdl_android-af6d11ec8ad8a9d031dca8c8fc0685929f45733d.tar.gz
141 files changed, 229 insertions, 202 deletions
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/BaseRpcTests.java b/sdl_android_tests/src/com/smartdevicelink/test/BaseRpcTests.java
index e40ffe709..7d87130a0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/BaseRpcTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/BaseRpcTests.java
@@ -11,8 +11,6 @@ import org.json.JSONObject;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.RPCResponse;
-import com.smartdevicelink.test.utils.Config;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public abstract class BaseRpcTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utils/Config.java b/sdl_android_tests/src/com/smartdevicelink/test/Config.java
index 7e3839572..7f424bda9 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/utils/Config.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/Config.java
@@ -1,4 +1,4 @@
-package com.smartdevicelink.test.utils;
+package com.smartdevicelink.test;
 
 
 public class Config{
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utils/JsonUtils.java b/sdl_android_tests/src/com/smartdevicelink/test/JsonUtils.java
index 51ee22e6c..e9e24eeca 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/utils/JsonUtils.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/JsonUtils.java
@@ -1,4 +1,4 @@
-package com.smartdevicelink.test.utils;
+package com.smartdevicelink.test;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utils/Logger.java b/sdl_android_tests/src/com/smartdevicelink/test/Logger.java
index c142a702b..ab922fd7a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/utils/Logger.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/Logger.java
@@ -1,4 +1,5 @@
-package com.smartdevicelink.test.utils;
+package com.smartdevicelink.test;
+
 
 
 public class Logger{
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utils/Validator.java b/sdl_android_tests/src/com/smartdevicelink/test/Validator.java
index 9d1fbe113..41f696e34 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/utils/Validator.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/Validator.java
@@ -1,4 +1,4 @@
-package com.smartdevicelink.test.utils;
+package com.smartdevicelink.test;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utils/VehicleDataHelper.java b/sdl_android_tests/src/com/smartdevicelink/test/VehicleDataHelper.java
index 0829a06e8..ebdbb452f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/utils/VehicleDataHelper.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/VehicleDataHelper.java
@@ -1,4 +1,4 @@
-package com.smartdevicelink.test.utils;
+package com.smartdevicelink.test;
 
 import com.smartdevicelink.proxy.rpc.AirbagStatus;
 import com.smartdevicelink.proxy.rpc.BeltStatus;
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/JsonFileReader.java b/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/JsonFileReader.java
index 759d1f7a3..8291f5673 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/JsonFileReader.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/json/rpc/JsonFileReader.java
@@ -9,7 +9,7 @@ import java.io.IOException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class JsonFileReader {
 	private static final String PATH = "src/com/smartdevicelink/test/json/rpc/";
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
index 4ca9205cf..375215cb3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataControlFrameTypeTests.java
@@ -3,7 +3,7 @@ package com.smartdevicelink.test.protocol.enums;
 import java.util.Vector;
 
 import com.smartdevicelink.protocol.enums.FrameDataControlFrameType;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.Validator;
 
 import junit.framework.TestCase;
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataTests.java b/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
index 97aee0fb5..07563248e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameDataTests.java
@@ -5,7 +5,7 @@ import java.util.Vector;
 import junit.framework.TestCase;
 
 import com.smartdevicelink.protocol.enums.FrameData;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.Validator;
 
 public class FrameDataTests extends TestCase {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
index 60fe7bb42..241872b7a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/FrameTypeTests.java
@@ -3,7 +3,7 @@ package com.smartdevicelink.test.protocol.enums;
 import java.util.Vector;
 
 import com.smartdevicelink.protocol.enums.FrameType;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.Validator;
 
 import junit.framework.TestCase;
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
index 3c6ba9b64..a55d1251d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/protocol/enums/SessionTypeTests.java
@@ -5,7 +5,7 @@ import java.util.Vector;
 import junit.framework.TestCase;
 
 import com.smartdevicelink.protocol.enums.SessionType;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.Validator;
 
 public class SessionTypeTests extends TestCase {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java b/sdl_android_tests/src/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java
index 03b8cfd8e..479f36994 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/proxy/RPCRequestFactoryTests.java
@@ -53,7 +53,7 @@ import com.smartdevicelink.proxy.rpc.enums.Language;
 import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
 import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
 import com.smartdevicelink.proxy.rpc.enums.UpdateMode;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.Validator;
 
 public class RPCRequestFactoryTests extends TestCase {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
index 8dc63045d..43765f0b8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AirbagStatusTests.java
@@ -9,7 +9,7 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.AirbagStatus;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class AirbagStatusTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
index 0744aa221..c714cf765 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/AudioPassThruCapabilitiesTest.java
@@ -11,7 +11,7 @@ import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.AudioType;
 import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
 import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class AudioPassThruCapabilitiesTest extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
index 9c627d8a7..7ff72906c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BeltStatusTests.java
@@ -9,7 +9,7 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.BeltStatus;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class BeltStatusTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
index 93497bd5a..f042cb498 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/BodyInformationTests.java
@@ -10,7 +10,7 @@ import org.json.JSONObject;
 import com.smartdevicelink.proxy.rpc.BodyInformation;
 import com.smartdevicelink.proxy.rpc.enums.IgnitionStableStatus;
 import com.smartdevicelink.proxy.rpc.enums.IgnitionStatus;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class BodyInformationTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
index 39eacf3e6..a03336809 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ButtonCapabilitiesTests.java
@@ -9,7 +9,7 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.ButtonCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.ButtonName;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class ButtonCapabilitiesTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
index 0b6b5a37f..41339a7fc 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ChoiceTests.java
@@ -14,8 +14,8 @@ import com.smartdevicelink.marshal.JsonRPCMarshaller;
 import com.smartdevicelink.proxy.rpc.Choice;
 import com.smartdevicelink.proxy.rpc.Image;
 import com.smartdevicelink.proxy.rpc.enums.ImageType;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 
 public class ChoiceTests extends TestCase{
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
index 024309bfa..defa6166b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ClusterModeStatusTests.java
@@ -11,7 +11,7 @@ import com.smartdevicelink.proxy.rpc.ClusterModeStatus;
 import com.smartdevicelink.proxy.rpc.enums.CarModeStatus;
 import com.smartdevicelink.proxy.rpc.enums.PowerModeQualificationStatus;
 import com.smartdevicelink.proxy.rpc.enums.PowerModeStatus;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class ClusterModeStatusTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
index 76d685996..f9be94347 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DIDResultTests.java
@@ -9,7 +9,7 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.DIDResult;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class DIDResultTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DTCTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
index 744533037..5c50706a7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DTCTests.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.DTC;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class DTCTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
index 8933dac7a..ef7c0e5fc 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceInfoTests.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.DeviceInfo;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class DeviceInfoTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
index 8b460d625..90339c218 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DeviceStatusTests.java
@@ -10,7 +10,7 @@ import org.json.JSONObject;
 import com.smartdevicelink.proxy.rpc.DeviceStatus;
 import com.smartdevicelink.proxy.rpc.enums.DeviceLevelStatus;
 import com.smartdevicelink.proxy.rpc.enums.PrimaryAudioSource;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class DeviceStatusTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
index f196c6109..5f564c72f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/DisplayCapabilitiesTests.java
@@ -25,8 +25,8 @@ import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.ImageFieldName;
 import com.smartdevicelink.proxy.rpc.enums.MediaClockFormat;
 import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class DisplayCapabilitiesTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
index c3cef15e1..e817ebb88 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ECallInfoTests.java
@@ -10,7 +10,7 @@ import org.json.JSONObject;
 import com.smartdevicelink.proxy.rpc.ECallInfo;
 import com.smartdevicelink.proxy.rpc.enums.ECallConfirmationStatus;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataNotificationStatus;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class ECallInfoTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
index e01839811..61f2e60fc 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/EmergencyEventTests.java
@@ -11,7 +11,7 @@ import com.smartdevicelink.proxy.rpc.EmergencyEvent;
 import com.smartdevicelink.proxy.rpc.enums.EmergencyEventType;
 import com.smartdevicelink.proxy.rpc.enums.FuelCutoffStatus;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class EmergencyEventTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
index 3cc9efce2..0784d6076 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/GPSDataTests.java
@@ -10,7 +10,7 @@ import org.json.JSONObject;
 import com.smartdevicelink.proxy.rpc.GPSData;
 import com.smartdevicelink.proxy.rpc.enums.CompassDirection;
 import com.smartdevicelink.proxy.rpc.enums.Dimension;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class GPSDataTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
index ce8eba317..626547a8a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
@@ -11,7 +11,7 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.HMIPermissions;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class HMIPermissionsTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
index 275bac374..16c5151da 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadLampStatusTests.java
@@ -9,7 +9,7 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.HeadLampStatus;
 import com.smartdevicelink.proxy.rpc.enums.AmbientLightStatus;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class HeadLampStatusTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
index 34ec911d5..ac4492bdb 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/HeadersTests.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.Headers;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class HeadersTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
index 179277189..25eaaabc7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageFieldTests.java
@@ -16,8 +16,8 @@ import com.smartdevicelink.proxy.rpc.ImageField;
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.ImageFieldName;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class ImageFieldTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
index 1e999e420..4f2d8d307 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageResolutionTests.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.ImageResolution;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class ImageResolutionTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
index c9740b5a8..fd0ac9735 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ImageTests.java
@@ -9,8 +9,8 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.Image;
 import com.smartdevicelink.proxy.rpc.enums.ImageType;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class ImageTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
index 4683bc67f..8a4d581e7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/KeyboardPropertiesTests.java
@@ -13,8 +13,8 @@ import com.smartdevicelink.proxy.rpc.KeyboardProperties;
 import com.smartdevicelink.proxy.rpc.enums.KeyboardLayout;
 import com.smartdevicelink.proxy.rpc.enums.KeypressMode;
 import com.smartdevicelink.proxy.rpc.enums.Language;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class KeyboardPropertiesTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
index 3608325a0..08e7342f1 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MenuParamsTests.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.MenuParams;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class MenuParamsTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
index 3ea126e42..1017c95da 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/MyKeyTests.java
@@ -9,7 +9,7 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.MyKey;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataStatus;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class MyKeyTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
index 9d121555a..c2e704e36 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ParameterPermissionsTests.java
@@ -10,8 +10,8 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.ParameterPermissions;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class ParameterPermissionsTests extends TestCase{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
index 8b8ef2319..d5ee8caa0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PermissionItemTest.java
@@ -12,8 +12,8 @@ import com.smartdevicelink.proxy.rpc.HMIPermissions;
 import com.smartdevicelink.proxy.rpc.ParameterPermissions;
 import com.smartdevicelink.proxy.rpc.PermissionItem;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class PermissionItemTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
index 966989b72..e90f04be0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/PresetBankCapabilitiesTest.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.PresetBankCapabilities;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class PresetBankCapabilitiesTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
index db259c7d2..3b82645c7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/ScreenParamsTest.java
@@ -11,8 +11,8 @@ import com.smartdevicelink.marshal.JsonRPCMarshaller;
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.ScreenParams;
 import com.smartdevicelink.proxy.rpc.TouchEventCapabilities;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class ScreenParamsTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
index 481070443..903b28905 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SdlMsgVersionTest.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class SdlMsgVersionTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
index 1de754bef..af215121c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SingleTireStatusTest.java
@@ -9,7 +9,7 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.SingleTireStatus;
 import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class SingleTireStatusTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
index f3ad67c8b..3c23270fd 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonCapabilitiesTest.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.SoftButtonCapabilities;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class SoftButtonCapabilitiesTest extends TestCase {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
index 995883ce3..0d8404ffe 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/SoftButtonTest.java
@@ -14,8 +14,8 @@ import com.smartdevicelink.proxy.rpc.SoftButton;
 import com.smartdevicelink.proxy.rpc.enums.ImageType;
 import com.smartdevicelink.proxy.rpc.enums.SoftButtonType;
 import com.smartdevicelink.proxy.rpc.enums.SystemAction;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class SoftButtonTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
index a839c4dfc..a011c1b5f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/StartTimeTest.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.StartTime;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class StartTimeTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
index 860f46a43..088913344 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TTSChunkTest.java
@@ -9,7 +9,7 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.TTSChunk;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class TTSChunkTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
index 8c3393fa4..e3b981b8d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TextFieldTest.java
@@ -10,7 +10,7 @@ import org.json.JSONObject;
 import com.smartdevicelink.proxy.rpc.TextField;
 import com.smartdevicelink.proxy.rpc.enums.CharacterSet;
 import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class TextFieldTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
index 33336df37..1a7b23c99 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TireStatusTest.java
@@ -10,7 +10,7 @@ import com.smartdevicelink.proxy.rpc.SingleTireStatus;
 import com.smartdevicelink.proxy.rpc.TireStatus;
 import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;
 import com.smartdevicelink.proxy.rpc.enums.WarningLightStatus;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.Validator;
 
 public class TireStatusTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
index 756f27d39..23f464c86 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchCoordTest.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.TouchCoord;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class TouchCoordTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
index 2df69322e..0eebac913 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventCapabilitiesTest.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.TouchEventCapabilities;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class TouchEventCapabilitiesTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
index 687fc7c13..9bbab53f3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TouchEventTest.java
@@ -13,8 +13,8 @@ import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.TouchCoord;
 import com.smartdevicelink.proxy.rpc.TouchEvent;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class TouchEventTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TurnTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
index d5de17a04..16f2349d8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/TurnTests.java
@@ -8,7 +8,7 @@ import junit.framework.TestCase;
 import com.smartdevicelink.proxy.rpc.Image;
 import com.smartdevicelink.proxy.rpc.Turn;
 import com.smartdevicelink.proxy.rpc.enums.ImageType;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.Validator;
 
 public class TurnTests extends TestCase {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
index c56ddd7c5..bb2d5df01 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleDataResultTest.java
@@ -10,7 +10,7 @@ import org.json.JSONObject;
 import com.smartdevicelink.proxy.rpc.VehicleDataResult;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataType;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class VehicleDataResultTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
index e406543ca..8c91c7a10 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VehicleTypeTest.java
@@ -8,7 +8,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.smartdevicelink.proxy.rpc.VehicleType;
-import com.smartdevicelink.test.utils.JsonUtils;
+import com.smartdevicelink.test.JsonUtils;
 
 public class VehicleTypeTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
index 2ff4aa88a..6b5886e71 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/datatypes/VrHelpItemTest.java
@@ -12,8 +12,8 @@ import com.smartdevicelink.marshal.JsonRPCMarshaller;
 import com.smartdevicelink.proxy.rpc.Image;
 import com.smartdevicelink.proxy.rpc.VrHelpItem;
 import com.smartdevicelink.proxy.rpc.enums.ImageType;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class VrHelpItemTest extends TestCase {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
index 78b82677a..3fb510ca6 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnAudioPassThruTests.java
@@ -6,7 +6,7 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.OnAudioPassThru;
 import com.smartdevicelink.test.BaseRpcTests;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.Validator;
 
 public class OnAudioPassThruTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
index 652f61eae..09194ca12 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnPermissionsChangeTests.java
@@ -17,8 +17,8 @@ import com.smartdevicelink.proxy.rpc.ParameterPermissions;
 import com.smartdevicelink.proxy.rpc.PermissionItem;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
 import com.smartdevicelink.test.BaseRpcTests;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class OnPermissionsChangeTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
index 2a930e0a3..34135633f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSdlChoiceChosenTests.java
@@ -13,8 +13,8 @@ import com.smartdevicelink.proxy.rpc.OnSdlChoiceChosen;
 import com.smartdevicelink.proxy.rpc.OnSdlChoiceChosen.SdlChoice;
 import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
 import com.smartdevicelink.test.BaseRpcTests;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class OnSdlChoiceChosenTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
index 3b7d8c646..17f7aed5e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnSystemRequestTests.java
@@ -11,8 +11,8 @@ import com.smartdevicelink.proxy.rpc.OnSystemRequest;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.proxy.rpc.enums.RequestType;
 import com.smartdevicelink.test.BaseRpcTests;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 
 public class OnSystemRequestTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
index 8de819ebe..26ed92625 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnTouchEventTests.java
@@ -14,7 +14,7 @@ import com.smartdevicelink.proxy.rpc.TouchCoord;
 import com.smartdevicelink.proxy.rpc.TouchEvent;
 import com.smartdevicelink.proxy.rpc.enums.TouchType;
 import com.smartdevicelink.test.BaseRpcTests;
-import com.smartdevicelink.test.utils.Validator;
+import com.smartdevicelink.test.Validator;
 
 
 public class OnTouchEventTests extends BaseRpcTests{
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
index bcd0aead8..6f67af4b3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java
@@ -26,9 +26,9 @@ import com.smartdevicelink.proxy.rpc.enums.PRNDL;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
 import com.smartdevicelink.proxy.rpc.enums.WiperStatus;
 import com.smartdevicelink.test.BaseRpcTests;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
-import com.smartdevicelink.test.utils.VehicleDataHelper;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
+import com.smartdevicelink.test.VehicleDataHelper;
 
 
 public class OnVehicleDataTests extends BaseRpcTests{
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddCommandTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
index 7066fbcbb..afac34fc3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddCommandTests.java
@@ -15,9 +15,9 @@ import com.smartdevicelink.proxy.rpc.Image;
 import com.smartdevicelink.proxy.rpc.MenuParams;
 import com.smartdevicelink.proxy.rpc.enums.ImageType;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class AddCommandTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
index bf187fa61..6dd111464 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AddSubmenuTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.AddSubMenu;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class AddSubmenuTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
index e3e01b2d0..dbd148ac4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertManeuverTests.java
@@ -20,9 +20,9 @@ import com.smartdevicelink.proxy.rpc.enums.SoftButtonType;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.SystemAction;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class AlertManeuverTests extends BaseRpcTests {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertTests.java
index 0ec436f7e..98a6681f0 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/AlertTests.java
@@ -20,9 +20,9 @@ import com.smartdevicelink.proxy.rpc.enums.SoftButtonType;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.SystemAction;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class AlertTests extends BaseRpcTests{
     private static final int     DURATION           = 500;
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
index aafce7c54..a74e33a06 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ChangeRegistrationTests.java
@@ -11,8 +11,8 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ChangeRegistration;
 import com.smartdevicelink.proxy.rpc.enums.Language;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 
 public class ChangeRegistrationTests extends BaseRpcTests{
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
index c19a4df3f..39f5208e8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/CreateInteractionChoiceSetTests.java
@@ -14,9 +14,9 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.Choice;
 import com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSet;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class CreateInteractionChoiceSetTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
index 606b67501..51e9185e7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteCommandTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.DeleteCommand;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class DeleteCommandTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
index 641f07155..2150eed65 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteFileTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.DeleteFile;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class DeleteFileTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
index 10a47ff61..6094ac928 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteInteractionChoiceSetTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSet;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class DeleteInteractionChoiceSetTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
index 0680fb30d..b4363e75c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DeleteSubMenuTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.DeleteSubMenu;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class DeleteSubMenuTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
index 392118861..0b7539c7b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/DiagnosticMessageTests.java
@@ -12,9 +12,9 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.DiagnosticMessage;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class DiagnosticMessageTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
index 5e81e6a79..9f85393df 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/EndAudioPassThruTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.EndAudioPassThru;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class EndAudioPassThruTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
index b37fb2599..d38777d96 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetDTCsTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.GetDTCs;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class GetDTCsTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
index 96c23a475..406bc19a3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.GetVehicleData;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 @SuppressWarnings("deprecation")
 public class GetVehicleDataTests extends BaseRpcTests{
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ListFilesTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
index 8b4252bd0..58bb83312 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ListFilesTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ListFiles;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class ListFilesTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
index 363678bf7..7fadc4028 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformAudioPassThruTests.java
@@ -18,9 +18,9 @@ import com.smartdevicelink.proxy.rpc.enums.BitsPerSample;
 import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class PerformAudioPassThruTests extends BaseRpcTests {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformInteractionTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformInteractionTest.java
index 8ec608152..2614168e8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformInteractionTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PerformInteractionTest.java
@@ -22,9 +22,9 @@ import com.smartdevicelink.proxy.rpc.enums.InteractionMode;
 import com.smartdevicelink.proxy.rpc.enums.LayoutMode;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class PerformInteractionTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PutFileTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PutFileTest.java
index f004e6d84..619189d20 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PutFileTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/PutFileTest.java
@@ -13,9 +13,9 @@ import com.smartdevicelink.proxy.RPCStruct;
 import com.smartdevicelink.proxy.rpc.PutFile;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class PutFileTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ReadDIDTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ReadDIDTest.java
index 0c3193893..cb8f5dc6c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ReadDIDTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ReadDIDTest.java
@@ -12,9 +12,9 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ReadDID;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class ReadDIDTest extends BaseRpcTests {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTest.java
index fdf0fd01f..02864aa4f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/RegisterAppInterfaceTest.java
@@ -20,9 +20,9 @@ import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
 import com.smartdevicelink.proxy.rpc.enums.Language;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class RegisterAppInterfaceTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTest.java
index 03a380a05..6263475dd 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ResetGlobalPropertiesTest.java
@@ -14,8 +14,8 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ResetGlobalProperties;
 import com.smartdevicelink.proxy.rpc.enums.GlobalProperty;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class ResetGlobalPropertiesTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ScrollableMessageTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ScrollableMessageTest.java
index b4a23f098..cd0aec60a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ScrollableMessageTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ScrollableMessageTest.java
@@ -14,9 +14,9 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ScrollableMessage;
 import com.smartdevicelink.proxy.rpc.SoftButton;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class ScrollableMessageTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetAppIconTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetAppIconTest.java
index be29165ff..d5f093b8c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetAppIconTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetAppIconTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SetAppIcon;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SetAppIconTest extends BaseRpcTests {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTest.java
index d200142a9..e03e4376c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetDisplayLayoutTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SetDisplayLayout;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SetDisplayLayoutTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTest.java
index b29f1393d..4bac5576a 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetGlobalPropertiesTest.java
@@ -24,9 +24,9 @@ import com.smartdevicelink.proxy.rpc.enums.KeypressMode;
 import com.smartdevicelink.proxy.rpc.enums.Language;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class SetGlobalPropertiesTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTest.java
index c8868e0f6..b97079540 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SetMediaClockTimerTest.java
@@ -12,9 +12,9 @@ import com.smartdevicelink.proxy.rpc.SetMediaClockTimer;
 import com.smartdevicelink.proxy.rpc.StartTime;
 import com.smartdevicelink.proxy.rpc.enums.UpdateMode;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class SetMediaClockTimerTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
index 884e724f8..a1fdb45b1 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowConstantTbtTests.java
@@ -18,9 +18,9 @@ import com.smartdevicelink.proxy.rpc.enums.ImageType;
 import com.smartdevicelink.proxy.rpc.enums.SoftButtonType;
 import com.smartdevicelink.proxy.rpc.enums.SystemAction;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class ShowConstantTbtTests extends BaseRpcTests {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowTest.java
index 305932188..e9b89497c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/ShowTest.java
@@ -19,9 +19,9 @@ import com.smartdevicelink.proxy.rpc.enums.SoftButtonType;
 import com.smartdevicelink.proxy.rpc.enums.SystemAction;
 import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class ShowTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SliderTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SliderTest.java
index 362799f2a..7c2c2f29f 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SliderTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SliderTest.java
@@ -12,9 +12,9 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.Slider;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class SliderTest extends BaseRpcTests {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SpeakTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SpeakTest.java
index 50999d3ea..6a31d6c7c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SpeakTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SpeakTest.java
@@ -16,9 +16,9 @@ import com.smartdevicelink.proxy.rpc.Speak;
 import com.smartdevicelink.proxy.rpc.TTSChunk;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class SpeakTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeButtonTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeButtonTest.java
index ef5bd9e45..de6f8e169 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeButtonTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeButtonTest.java
@@ -11,8 +11,8 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SubscribeButton;
 import com.smartdevicelink.proxy.rpc.enums.ButtonName;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SubscribeButtonTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTest.java
index 6d9818b5f..10291bb73 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SubscribeVehicleData;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 @SuppressWarnings("deprecation")
 public class SubscribeVehicleDataTest extends BaseRpcTests {
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SystemRequestTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SystemRequestTest.java
index f690b12b8..d282e9a1c 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SystemRequestTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/SystemRequestTest.java
@@ -13,9 +13,9 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SystemRequest;
 import com.smartdevicelink.proxy.rpc.enums.RequestType;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class SystemRequestTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTest.java
index b66a33916..7efee3bc6 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnregisterAppInterfaceTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.UnregisterAppInterface;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class UnregisterAppInterfaceTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTest.java
index 31601dc7c..13086f039 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeButtonTest.java
@@ -11,8 +11,8 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.UnsubscribeButton;
 import com.smartdevicelink.proxy.rpc.enums.ButtonName;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class UnsubscribeButtonTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTest.java
index 804f1abef..b6b264a63 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTest.java
@@ -11,8 +11,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.UnsubscribeVehicleData;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 @SuppressWarnings("deprecation")
 public class UnsubscribeVehicleDataTest extends BaseRpcTests {
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
index 79d91aecf..e6b82cb2e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/requests/UpdateTurnListTests.java
@@ -19,9 +19,9 @@ import com.smartdevicelink.proxy.rpc.enums.ImageType;
 import com.smartdevicelink.proxy.rpc.enums.SoftButtonType;
 import com.smartdevicelink.proxy.rpc.enums.SystemAction;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class UpdateTurnListTests extends BaseRpcTests {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
index 4c325cfa1..fc9788236 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddCommandResponseTests.java
@@ -11,8 +11,8 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.AddCommand;
 import com.smartdevicelink.proxy.rpc.AddCommandResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class AddCommandResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
index 37b481866..99e66688b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AddSubmenuResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.AddSubMenuResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class AddSubmenuResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
index 9b873bb9d..aed634ebd 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertManeuverResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.AlertManeuverResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class AlertManeuverResponseTests extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
index 93e10da80..d9f46c21b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/AlertResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.AlertResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class AlertResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
index 9fac5ffb9..08bbddc94 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ChangeRegistrationResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ChangeRegistrationResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class ChangeRegistrationResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
index f31bb9b6b..c2917e4f9 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteCommandResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.DeleteCommandResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class DeleteCommandResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
index 5f3da23be..14e2f7752 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteFileResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.DeleteFileResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class DeleteFileResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
index 842d8dc4f..3dffd6e93 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteInteractionChoiceSetResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.DeleteInteractionChoiceSetResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class DeleteInteractionChoiceSetResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
index b52f9b755..c61a73043 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DeleteSubMenuResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.DeleteSubMenuResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class DeleteSubMenuResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
index f60efbed7..4cc9d8594 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/DiagnosticMessageResponseTests.java
@@ -12,9 +12,9 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.DiagnosticMessageResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class DiagnosticMessageResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
index 63755d9f7..346c89444 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/EndAudioPassThruResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.EndAudioPassThruResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class EndAudioPassThruResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
index 86503a133..745d4a8ac 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetDTCsResponseTests.java
@@ -12,9 +12,9 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.GetDTCsResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class GetDTCsResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
index 112b4edc1..6471629be 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java
@@ -27,10 +27,10 @@ import com.smartdevicelink.proxy.rpc.enums.PRNDL;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
 import com.smartdevicelink.proxy.rpc.enums.WiperStatus;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
+import com.smartdevicelink.test.VehicleDataHelper;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
-import com.smartdevicelink.test.utils.VehicleDataHelper;
 
 @SuppressWarnings("deprecation")
 public class GetVehicleDataResponseTests extends BaseRpcTests{
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
index 718b329ab..4e7ce5dfd 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ListFilesResponseTests.java
@@ -12,9 +12,9 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ListFilesResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class ListFilesResponseTests extends BaseRpcTests{
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
index ef03ef2d4..96b0b3816 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformAudioPassThruResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.PerformAudioPassThruResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class PerformAudioPassThruResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
index 25fe9a739..da7ccedc7 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PerformInteractionResponseTest.java
@@ -11,8 +11,8 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.PerformInteractionResponse;
 import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class PerformInteractionResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
index b22d173d7..8fed6a353 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/PutFileResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.PutFileResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class PutFileResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
index 641a43752..4933f4378 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ReadDIDResponseTest.java
@@ -15,9 +15,9 @@ import com.smartdevicelink.proxy.rpc.DIDResult;
 import com.smartdevicelink.proxy.rpc.ReadDIDResponse;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class ReadDIDResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
index e9e72b39a..47089ba4b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/RegisterAppInterfaceResponseTest.java
@@ -41,9 +41,9 @@ import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
 import com.smartdevicelink.proxy.rpc.enums.VrCapabilities;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 @SuppressWarnings("deprecation")
 public class RegisterAppInterfaceResponseTest extends BaseRpcTests {
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
index 7a1717b66..132587e04 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ResetGlobalPropertiesResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ResetGlobalPropertiesResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class ResetGlobalPropertiesResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
index fae2c702c..b2b810000 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ScrollableMessageResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ScrollableMessageResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class ScrollableMessageResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
index f7350d942..120ffaeb3 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SendLocationResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SendLocationResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SendLocationResponseTests extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
index fa2d0ee61..8e13a543d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetAppIconResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SetAppIconResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SetAppIconResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
index 70858b02f..9c5d35672 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetDisplayLayoutResponseTest.java
@@ -18,9 +18,9 @@ import com.smartdevicelink.proxy.rpc.SetDisplayLayoutResponse;
 import com.smartdevicelink.proxy.rpc.SoftButtonCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.DisplayType;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 public class SetDisplayLayoutResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
index 906b38981..50e022036 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetGlobalPropertiesResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SetGlobalPropertiesResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SetGlobalPropertiesResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
index e320b5141..37c611e94 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SetMediaClockTimerResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SetMediaClockTimerResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SetMediaClockTimerResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
index f47ba35cc..9869663b4 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowConstantTbtResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ShowConstantTbtResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class ShowConstantTbtResponseTests extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
index 340c3c5b9..e07d05828 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/ShowResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.ShowResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class ShowResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
index 289f5e142..196443d5d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SliderResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SliderResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SliderResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
index 402a7186e..ba8367201 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SpeakResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SpeakResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SpeakResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
index 84f713621..e236e124d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeButtonResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SubscribeButtonResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SubscribeButtonResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
index d7e1f2c14..cf76651f8 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java
@@ -13,9 +13,9 @@ import com.smartdevicelink.proxy.rpc.VehicleDataResult;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataType;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 @SuppressWarnings("deprecation")
 public class SubscribeVehicleDataResponseTest extends BaseRpcTests {
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
index d1f4cbef4..ac68ed78b 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/SystemRequestResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.SystemRequestResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class SystemRequestResponseTest extends BaseRpcTests {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
index 7351c77c5..b844046cb 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnregisterAppInterfaceResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.UnregisterAppInterfaceResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class UnregisterAppInterfaceResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
index 0153382f7..181e2d99e 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeButtonResponseTest.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.UnsubscribeButtonResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class UnsubscribeButtonResponseTest extends BaseRpcTests {
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
index b3bed8261..95e162c95 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java
@@ -14,9 +14,9 @@ import com.smartdevicelink.proxy.rpc.VehicleDataResult;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataType;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
+import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
-import com.smartdevicelink.test.utils.Validator;
 
 @SuppressWarnings("deprecation")
 public class UnsubscribeVehicleDataResponseTest extends BaseRpcTests {
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
index cfa9e8212..b9fe65889 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/rpc/responses/UpdateTurnListResponseTests.java
@@ -10,8 +10,8 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.rpc.UpdateTurnListResponse;
 import com.smartdevicelink.test.BaseRpcTests;
+import com.smartdevicelink.test.JsonUtils;
 import com.smartdevicelink.test.json.rpc.JsonFileReader;
-import com.smartdevicelink.test.utils.JsonUtils;
 
 public class UpdateTurnListResponseTests extends BaseRpcTests {
 	
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utils/BitConverterTests.java b/sdl_android_tests/src/com/smartdevicelink/test/util/BitConverterTests.java
index 55fb1e7e0..f585608db 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/utils/BitConverterTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/util/BitConverterTests.java
@@ -1,4 +1,4 @@
-package com.smartdevicelink.test.utils;
+package com.smartdevicelink.test.util;
 
 import java.util.Arrays;
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utils/ByteEnumerTests.java b/sdl_android_tests/src/com/smartdevicelink/test/util/ByteEnumerTests.java
index bd7f36ef1..9ad45ffaa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/utils/ByteEnumerTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/util/ByteEnumerTests.java
@@ -1,4 +1,4 @@
-package com.smartdevicelink.test.utils;
+package com.smartdevicelink.test.util;
 
 import java.util.Vector;
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utils/DebugToolTests.java b/sdl_android_tests/src/com/smartdevicelink/test/util/DebugToolTests.java
index 48093e490..fbd60276d 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/utils/DebugToolTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/util/DebugToolTests.java
@@ -1,4 +1,4 @@
-package com.smartdevicelink.test.utils;
+package com.smartdevicelink.test.util;
 
 import junit.framework.TestCase;
 
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utils/NativeLogToolTests.java b/sdl_android_tests/src/com/smartdevicelink/test/util/NativeLogToolTests.java
index 358febbe6..e748f23aa 100644
--- a/sdl_android_tests/src/com/smartdevicelink/test/utils/NativeLogToolTests.java
+++ b/sdl_android_tests/src/com/smartdevicelink/test/util/NativeLogToolTests.java
@@ -1,4 +1,4 @@
-package com.smartdevicelink.test.utils;
+package com.smartdevicelink.test.util;
 
 
 import com.smartdevicelink.util.NativeLogTool;
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java b/sdl_android_tests/src/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
new file mode 100644
index 000000000..f40aa1c38
--- /dev/null
+++ b/sdl_android_tests/src/com/smartdevicelink/test/util/SdlDataTypeConverterTests.java
@@ -0,0 +1,45 @@
+package com.smartdevicelink.test.util;
+
+import com.smartdevicelink.util.SdlDataTypeConverter;
+
+import junit.framework.TestCase;
+
+/**
+ * This is a unit test class for the SmartDeviceLink library project class : 
+ * {@link com.smartdevicelink.util.SdlDataTypeConverter}
+ */
+public class SdlDataTypeConverterTests extends TestCase {
+	
+	/**
+	 * This is a unit test for the following method : 
+	 * {@link com.smartdevicelink.util.SdlDataTypeConverter#objectToDouble(Object)}
+	 */
+	public void testObjectToDouble () {
+		
+		// Test Values
+		Long    testLong          = Long.valueOf(1);		
+		Short   testShort         = 1;		
+		Float   testFloat         = 1f;
+		Double  testDouble        = 1.0;		
+		Integer testInteger       = 1;
+		
+		// Comparison Values
+		Double expectedValue      = 1.0;		
+		Double actualNullValue    = SdlDataTypeConverter.objectToDouble(null);
+		Double actualLongValue    = SdlDataTypeConverter.objectToDouble(testLong);
+		Double actualShortValue   = SdlDataTypeConverter.objectToDouble(testShort);
+		Double actualFloatValue   = SdlDataTypeConverter.objectToDouble(testFloat);
+		Double actualDoubleValue  = SdlDataTypeConverter.objectToDouble(testDouble);
+		Double actualIntegerValue = SdlDataTypeConverter.objectToDouble(testInteger);
+		
+		// Valid Tests		
+		assertEquals("Values should match.", expectedValue, actualDoubleValue);
+		assertEquals("Values should match.", expectedValue, actualIntegerValue);
+		
+		// Null Tests
+		assertNull("Value should be null.", actualNullValue);
+		assertNull("Value should be null.", actualLongValue);
+		assertNull("Value should be null.", actualShortValue);
+		assertNull("Value should be null.", actualFloatValue);
+	}
+}
+\ No newline at end of file
diff --git a/sdl_android_tests/src/com/smartdevicelink/test/utils/SdlDataTypeConverterTests.java b/sdl_android_tests/src/com/smartdevicelink/test/utils/SdlDataTypeConverterTests.java
deleted file mode 100644
index 7be21eaef..000000000
--- a/sdl_android_tests/src/com/smartdevicelink/test/utils/SdlDataTypeConverterTests.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.smartdevicelink.test.utils;
-
-import com.smartdevicelink.util.SdlDataTypeConverter;
-
-import junit.framework.TestCase;
-
-public class SdlDataTypeConverterTests extends TestCase {
-	
-	public void testConverter () {
-		
-		final String MSG = "Values should match.";
-	
-		assertEquals(MSG, (Double) 1.0, SdlDataTypeConverter.objectToDouble((Integer) 1));
-		assertEquals(MSG, (Double) 1.0, SdlDataTypeConverter.objectToDouble((Double) 1.0));
-		assertNull(MSG, SdlDataTypeConverter.objectToDouble(null));
-	}
-}
-\ No newline at end of file
author	Mikayla Ray <mikayla@livioconnect.com>	2015-05-13 11:34:32 -0400
committer	Mikayla Ray <mikayla@livioconnect.com>	2015-05-13 11:34:32 -0400
commit	af6d11ec8ad8a9d031dca8c8fc0685929f45733d (patch)
tree	7a55c8fefeb7ebb80c89a6471a1444746379b775
parent	714c46f769258bbfdf67a77ccc748ee73bfdad0f (diff)
download	sdl_android-af6d11ec8ad8a9d031dca8c8fc0685929f45733d.tar.gz