diff --git a/content/io/cloudslang/base/json/get_keys.sl b/content/io/cloudslang/base/json/get_keys.sl
index a95791dca1..0fc9dce0c5 100644
--- a/content/io/cloudslang/base/json/get_keys.sl
+++ b/content/io/cloudslang/base/json/get_keys.sl
@@ -1,4 +1,4 @@
-#   (c) Copyright 2015-2017 EntIT Software LLC, a Micro Focus company, L.P.
+#   (c) Copyright 2015-2018 EntIT Software LLC, a Micro Focus company, L.P.
 #   All rights reserved. This program and the accompanying materials
 #   are made available under the terms of the Apache License v2.0 which accompany this distribution.
 #
@@ -16,16 +16,16 @@
 #! @description: Retrieves keys from a JSON object at a given JSON path.
 #!
 #! @input json_input: JSON from which to retrieve keys
-#!                    Example: '{"k1": {"k2": {"k3":"v3"}}}'
+#!                     Examples: {"one":1, "two":2}, {"one":{"a":"a","B":"B"}, "two":"two", "three":[1,2,3.4]}
 #! @input json_path: path from which to retrieve key represented as a list of keys and/or indices.
-#!                   Passing an empty list ([]) will retrieve top level keys.
-#!                   Example: ["k1", "k2"]
+#!                   Passing $ will retrieve top level keys.
+#!                   Example: $, $.one, one
 #!
 #! @output return_result: If any keys were found, list of keys found
 #!                        A JSON object is an unordered set of key/value pairs,
 #!                        therefore the order of the keys returned is arbitrary.
 #! @output return_code: "0" if parsing was successful, "-1" otherwise
-#! @output error_message: Error message if there was an error when executing, empty otherwise
+#! @output exception: Error message if there was an error when executing, empty otherwise
 #!
 #! @result SUCCESS: Parsing was successful (return_code == '0')
 #! @result FAILURE: Otherwise
@@ -39,41 +39,28 @@ operation:
 
   inputs:
     - json_input
+    - jsonInput:
+        default: ${get('json_input', '')}
+        required: false
+        private: true
+
     - json_path:
         required: false
+    - jsonPath:
+        default: ${get('json_path', '$')}
+        required: false
+        private: true
 
-  python_action:
-    script: |
-      try:
-        import json,re
-        quote = None
-        for c in json_input:
-          if c in ['\'', '\"']:
-            quote = c
-            break
-        if quote == '\'':
-          json_input = str(re.sub(r"(?<!\\)(\')",'"', json_input))
-          json_input = str(re.sub(r"(\\')",'\'', json_input))
-        decoded = json.loads(json_input)
-        for key in json_path.split(","):
-          if key in ["", ''] and key not in decoded:
-            pass
-          else:
-            decoded = decoded[key]
-        decoded = decoded.keys()
-        encoded = json.dumps(decoded, ensure_ascii=False)
-        if quote == '\'':
-          encoded = encoded.replace('\'','\\\'').replace('\"','\'')
-        return_code = '0'
-      except Exception as ex:
-        error_message = ex
-        return_code = '-1'
+  java_action:
+    gav: 'io.cloudslang.content:cs-json:0.0.9-SNAPSHOT'
+    class_name: 'io.cloudslang.content.json.actions.GetKeys'
+    method_name: 'execute'
 
   outputs:
-    - return_result: ${ encoded if return_code == '0' else '' }
-    - return_code
-    - error_message: ${ str(error_message) if return_code == '-1' else '' }
+    - return_result: ${get('returnResult', '')}
+    - return_code: ${get('returnCode', '')}
+    - exception: ${get('exception', '')}
 
   results:
-    - SUCCESS: ${ return_code == '0' }
+    - SUCCESS: ${returnCode=='0'}
     - FAILURE
diff --git a/content/io/cloudslang/base/json/get_value.sl b/content/io/cloudslang/base/json/get_value.sl
index 8779257c1e..be2577301d 100644
--- a/content/io/cloudslang/base/json/get_value.sl
+++ b/content/io/cloudslang/base/json/get_value.sl
@@ -1,4 +1,4 @@
-#   (c) Copyright 2014-2017 EntIT Software LLC, a Micro Focus company, L.P.
+#   (c) Copyright 2014-2018 EntIT Software LLC, a Micro Focus company, L.P.
 #   All rights reserved. This program and the accompanying materials
 #   are made available under the terms of the Apache License v2.0 which accompany this distribution.
 #
@@ -16,14 +16,13 @@
 #! @description: Parses the given JSON input to retrieve the corresponding value addressed by the json_path input.
 #!
 #! @input json_input: JSON data input
-#!                    Example: '{"k1": {"k2": ["v1", "v2"]}}'
+#!                    Examples: {"one":1, "two":2}, {"one":{"a":"a","B":"B"}, "two":"two", "three":[1,2,3.4]}
 #! @input json_path: path from which to retrieve value represented as a list of keys and/or indices.
-#!                   Passing an empty list ([]) will retrieve the entire json_input.
-#!                   Example: ["k1", "k2", 1]
+#!                   Example: one, $.one, $.one[1].a
 #!
 #! @output return_result: The corresponding value of the key referred to by json_path
 #! @output return_code: "0" if parsing was successful, "-1" otherwise
-#! @output error_message: Error message if there was an error when executing, empty otherwise
+#! @output exception: Error message if there was an error when executing, empty otherwise
 #!
 #! @result SUCCESS: Parsing was successful (return_code == '0')
 #! @result FAILURE: Otherwise
@@ -37,53 +36,28 @@ operation:
 
   inputs:
     - json_input
+    - jsonInput:
+        default: ${get('json_input', '')}
+        required: false
+        private: true
+
     - json_path:
         required: false
+    - jsonPath:
+        default: ${get('json_path','$')}
+        required: false
+        private: true
 
-  python_action:
-    script: |
-      def representsInt(s):
-          try:
-              int(s)
-              return True
-          except ValueError:
-              return False
-      try:
-        import json, re
-        quote = None
-        for c in json_input:
-          if c in ['\'', '\"']:
-            quote = c
-            break
-        if quote == '\'':
-          json_input = str(re.sub(r"(?<!\\)(\')",'"', json_input))
-          json_input = str(re.sub(r"(\\')",'\'', json_input))
-        decoded = json.loads(json_input)
-        for key in json_path.split(","):
-          if key in ["", ''] and key not in decoded:
-            pass
-          else:
-            if representsInt(key):
-              key = int(key)
-            decoded = decoded[key]
-        if type(decoded) in [dict, list]:
-          encoded = json.dumps(decoded, ensure_ascii=False)
-          if quote == '\'':
-            encoded = encoded.replace('\'','\\\'').replace('\"','\'')
-        elif decoded is None:
-          encoded = 'null'
-        else:
-          encoded = str(decoded)
-        return_code = '0'
-      except Exception as ex:
-        error_message = ex
-        return_code = '-1'
+  java_action:
+    gav: 'io.cloudslang.content:cs-json:0.0.9-SNAPSHOT'
+    class_name: 'io.cloudslang.content.json.actions.GetValue'
+    method_name: 'execute'
 
   outputs:
-    - return_result: ${ encoded if return_code == '0' else '' }
-    - return_code
-    - error_message: ${ str(error_message) if return_code == '-1' else '' }
+    - return_result: ${get('returnResult', '')}
+    - return_code: ${get('returnCode', '')}
+    - exception: ${get('exception', '')}
 
   results:
-    - SUCCESS: ${ return_code == '0' }
-    - FAILURE
+    - SUCCESS: ${returnCode=='0'}
+    - FAILURE
\ No newline at end of file
diff --git a/test/io/cloudslang/base/json/get_keys.inputs.yaml b/test/io/cloudslang/base/json/get_keys.inputs.yaml
index d2d1ed6fd2..3fc273157c 100644
--- a/test/io/cloudslang/base/json/get_keys.inputs.yaml
+++ b/test/io/cloudslang/base/json/get_keys.inputs.yaml
@@ -1,4 +1,4 @@
-#   (c) Copyright 2015-2017 EntIT Software LLC, a Micro Focus company, L.P.
+#   (c) Copyright 2015-2018 EntIT Software LLC, a Micro Focus company, L.P.
 #   All rights reserved. This program and the accompanying materials
 #   are made available under the terms of the Apache License v2.0 which accompany this distribution.
 #
@@ -16,11 +16,33 @@
 testGetKeysOuter:
   inputs:
     - json_input: '{"outer_key1": "outer_value1", "outer_key2": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}}'
-    - json_path: ""
+    - json_path: "$"
+  description: Tests that get_keys.sl correctly gets outer keys from a JSON
+  testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
+  outputs:
+    - return_result: '[outer_key1, outer_key2]'
+
+
+testGetKeysEmptyName:
+  inputs:
+    - json_input: '{"": "outer_value1", "outer_key2": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}}'
+    - json_path: "$"
+  description: Tests that get_keys.sl correctly gets outer keys from a JSON
+  testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
+  outputs:
+    - return_result: '[, outer_key2]'
+
+testGetKeysSingleEmptyName:
+  inputs:
+    - json_input: '{"": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}}'
+    - json_path: "$"
   description: Tests that get_keys.sl correctly gets outer keys from a JSON
   testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
   outputs:
-    - return_result: '["outer_key2", "outer_key1"]'
+    - return_result: '[]'
 
 testGetKeysInner:
   inputs:
@@ -28,8 +50,20 @@ testGetKeysInner:
     - json_path: "outer_key2"
   description: Tests that get_keys.sl correctly gets inner keys from a JSON
   testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
+  outputs:
+    - return_result: '[inner_key1, inner_key2]'
+
+testGetKeysDup:
+  inputs:
+    - json_input: '{"abc": "ok", "abc": "hei", "abc1": "hello"}'
+    - json_path: "abc"
+  description: Tests that get_keys.sl failure when are duplicate keys
+  testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
   outputs:
-    - return_result: '["inner_key1", "inner_key2"]'
+      - return_code: '-1'
+
 
 testGetKeysSingle:
   inputs:
@@ -37,17 +71,19 @@ testGetKeysSingle:
     - json_path: "outer_key2"
   description: Tests that get_keys.sl correctly gets a single key from a JSON
   testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
   outputs:
-    - return_result: '["inner_key1"]'
+    - return_result: '[inner_key1]'
 
 testGetKeysNone:
   inputs:
     - json_input: '{"outer_key1": "outer_value1", "outer_key2": {"inner_key1": "inner_value1"}}'
-    - json_path: "outer_key2,inner_key1"
+    - json_path: "$.outer_key2.inner_key1"
   description: Tests that get_keys.sl has a return_code of '-1' when there are no child keys
   testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
   outputs:
-    - return_result: ''
+    - return_result: 'There are no keys'
     - return_code: '-1'
 
 testGetKeysBadPath:
@@ -56,8 +92,8 @@ testGetKeysBadPath:
     - json_path: "outer_key3"
   description: Tests that get_keys.sl has a return_code of '-1' for a path that doesn't exist
   testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
   outputs:
-    - return_result: ''
     - return_code: '-1'
 
 testGetNoKeys:
@@ -66,82 +102,74 @@ testGetNoKeys:
     - json_path: ""
   description: Tests get_keys.sl when there are no keys
   testFlowPath: io.cloudslang.base.json.get_keys
-  result: SUCCESS
+  testSuites: [getKeys]
+  outputs:
+    - return_result: 'Invalid jsonPath provided!'
+    - return_code: '-1'
 
-testGetKeysSpecialCharacters:
+testGetNoKeys:
   inputs:
-    - json_input: '{"??":"japanese", "a1!#%@&*`|>-":"special characters"}'
-    - json_path: ""
-    - expected_keys: "??,a1!#%@&*`|>-"
-  description: Tests get_keys.sl when there are special Japanese characters
-  testFlowPath: io.cloudslang.base.json.test_get_keys
-  result: SUCCESS
+    - json_input: '{}'
+    - json_path: "$"
+  description: Tests get_keys.sl when the json_input is empty
+  testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
+  outputs:
+    - return_result: 'There are no keys'
+    - return_code: '-1'
+
+testGetKeysSpecialCharacter:
+  inputs:
+    - json_input: '{"k1": "v1","k1!#%@&*`|>-": "v2!#%@&*`?|>{[-"}'
+    - json_path: "$"
+  description: Tests get_keys.sl when there are special characters
+  testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
+  outputs:
+      - return_result: '[k1, k1!#%@&*`|>-]'
+
+
+testGetKeysEmptyArray:
+  inputs:
+    - json_input: '{"[]": "value"}'
+    - json_path: "$"
+  description: Tests get_keys.sl when there is an empty array
+  testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
+  outputs:
+    - return_result: '[[]]'
+
 
 testGetKeysOrder:
   inputs:
     - json_input: '{"outer_key1": "outer_value1", "outer_key2": "outer_value2", "outer_key3": "outer_value3"}'
-    - json_path: ""
-    - expected_keys: "outer_key1,outer_key2,outer_key3"
+    - json_path: "$"
+    - expected_keys: "[outer_key1, outer_key2, outer_key3]"
   description: Tests that get_keys.sl correctly gets all outer keys from a JSON
   testFlowPath: io.cloudslang.base.json.test_get_keys
+  testSuites: [getKeys]
   result: SUCCESS
 
+
 testGetKeysJSONArray:
   inputs:
-    - json_input: '{"[arraykey1,arraykey2]":"arrayvalue"}'
-    - json_path: ""
-    - expected_keys: "arraykey1,arraykey2"
+    - json_input: '{"[arraykey1, arraykey2]":"arrayvalue"}'
+    - json_path: "$"
+    - expected_keys: "[[arraykey1, arraykey2]]"
   description: Tests that get_keys.sl correctly gets key in the form of an array
   testFlowPath: io.cloudslang.base.json.test_get_keys
+  testSuites: [getKeys]
   result: SUCCESS
 
-testGetKeysSingleQuote:
-  inputs:
-    - json_input: "{'outer_key1': 'outer_value1', 'outer_key2': 'outer_value2', 'outer_key3': 'outer_value3'}"
-    - json_path: ""
-    - expected_keys: "outer_key2,outer_key1,outer_key3"
-  description: Tests that get_keys.sl correctly gets all outer keys from a JSON with single quotes
-  testFlowPath: io.cloudslang.base.json.test_get_keys
-  result: SUCCESS
 
 testGetKeysSingleQuoteSuccess:
   inputs:
-    - json_input:  "{
-                                                                       'server' : {
-                                                                                      'name' : 'server_3',
-                                                                                      'imageRef' : 'b67f9da0-4a89-4588-b0f5-bf4d19401743',
-                                                                                      'flavorRef' : '42',
-                                                                                      'block_device_mapping_v2' : [{
-                                                                                                                    'source_type' : 'image',
-                                                                                                                    'uuid' : 'b67f9da0-4a89-4588-b0f5-bf4d19401743',
-                                                                                                                    'boot_index' : '0',
-                                                                                                                    'delete_on_termination' : true
-                                                                                                     }
-                                                                                      ],
-                                                                                      'networks' : [],
-                                                                                      'availability_zone' : 'nova',
-                                                                                      'key_name' : 'default_key',
-                                                                                      'adminPass' : '{ENCRYPTED}EuA4xiNWgPmWZkcHvkvb0Q==',
-                                                                                      'user_data' : 'IyEvYmluL3NoCmFwdC1nZXQgdXBkYXRlCmFwdC1nZXQgaW5zdGFsbCBnaXQgLXk=',
-                                                                       'metadata' : {
-                                                                                      'My Server Name' : 'Apache1',
-                                                                                      'min_ram' : '2'
-                                                                       },
-                                                                                      'security_groups' : [{
-                                                                                                                    'name' : 'default'
-                                                                                                     }
-                                                                                      ],
-                                                                                      'personality' : [{
-                                                                                                                    'path' : '/etc/banner.txt',
-                                                                                                                    'contents' : 'ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=='
-                                                                                                     }
-                                                                                      ]
-                                                                       }
-                                                    }"
-    - json_path: "server,metadata"
-    - expected_keys: "min_ram,My Server Name"
+    - json_input: "{'outer_key1': 'outer_value1', 'outer_key2': {'inner_key1': 'inner_value1', 'inner_key2': ['list_item1', 'list_item2']}}"
+    - json_path: "outer_key2"
+    - expected_keys: "[inner_key1, inner_key2]"
   description: Tests that get_keys.sl correctly gets all keys from a JSON with single quotes
   testFlowPath: io.cloudslang.base.json.test_get_keys
+  testSuites: [getKeys]
   result: SUCCESS
 
 testGetKeysSingleQuoteFailure:
@@ -181,6 +209,6 @@ testGetKeysSingleQuoteFailure:
     - json_path: "server,name"
   description: Tests that get_keys.sl has a return_code of '-1' for a path that does not exist
   testFlowPath: io.cloudslang.base.json.get_keys
+  testSuites: [getKeys]
   outputs:
-    - return_result: ''
     - return_code: '-1'
\ No newline at end of file
diff --git a/test/io/cloudslang/base/json/get_value.inputs.yaml b/test/io/cloudslang/base/json/get_value.inputs.yaml
index f79cbfc739..05a3a6a216 100644
--- a/test/io/cloudslang/base/json/get_value.inputs.yaml
+++ b/test/io/cloudslang/base/json/get_value.inputs.yaml
@@ -1,4 +1,4 @@
-#   (c) Copyright 2015-2017 EntIT Software LLC, a Micro Focus company, L.P.
+#   (c) Copyright 2015-2018 EntIT Software LLC, a Micro Focus company, L.P.
 #   All rights reserved. This program and the accompanying materials
 #   are made available under the terms of the Apache License v2.0 which accompany this distribution.
 #
@@ -19,54 +19,70 @@ testGetValueOuter:
     - json_path: "outer_key1"
   description: Tests that get_value.sl correctly gets an outer value from a JSON
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   outputs:
     - return_result: 'outer_value1'
 
 testGetValueInner:
   inputs:
     - json_input: '{"outer_key1": "outer_value1", "outer_key2": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}}'
-    - json_path: "outer_key2,inner_key1"
+    - json_path: "$.outer_key2.inner_key1"
   description: Tests that get_value.sl correctly gets an inner value from a JSON
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   outputs:
     - return_result: 'inner_value1'
 
 testGetValueInnerArray:
   inputs:
     - json_input: '{"outer_key1": "outer_value1", "outer_key2": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}}'
-    - json_path: "outer_key2,inner_key2,1"
+    - json_path: "$.outer_key2.inner_key2[1]"
   description: Tests that get_value.sl correctly gets an inner array value from a JSON
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   outputs:
     - return_result: 'list_item2'
 
 testGetValueArray:
   inputs:
     - json_before: '{"outer_key1": "outer_value1", "outer_key2": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}}'
-    - json_path: "outer_key2,inner_key2"
-    - found_value: '["list_item1", "list_item2"]'
+    - json_path: "$.outer_key2.inner_key2"
+    - found_value: '["list_item1","list_item2"]'
   description: Tests that get_value.sl correctly gets an array from a JSON
   testFlowPath: io.cloudslang.base.json.test_get_value
+  testSuites: [getValue]
   result: SUCCESS
 
+
+estGetValueEmtpyInput2:
+  inputs:
+    - json_input: '{}'
+    - json_path: "city"
+  description: Tests that get_value.sl gets value from emptyInput
+  testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
+  result: FAILURE
+
 testGetValueObject:
   inputs:
     - json_before: '{"outer_key1": "outer_value1", "outer_key2": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}}'
     - json_path: "outer_key2"
     - found_value:
-        value: '{"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}'
+        value: '{"inner_key1":"inner_value1","inner_key2":["list_item1","list_item2"]}'
   description: Tests that get_value.sl correctly gets an object from a JSON
   testFlowPath: io.cloudslang.base.json.test_get_value
+  testSuites: [getValue]
   result: SUCCESS
 
 testGetEverything:
   inputs:
     - json_before: '{"outer_key1": "outer_value1", "outer_key2": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}}'
-    - json_path: ""
+    - json_path: "$"
     - found_value:
-        value: '{"outer_key2": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}, "outer_key1": "outer_value1"}'
+        value: '{"outer_key1":"outer_value1","outer_key2":{"inner_key1":"inner_value1","inner_key2":["list_item1","list_item2"]}}'
   description: Tests that get_value.sl correctly gets the entire JSON
   testFlowPath: io.cloudslang.base.json.test_get_value
+  testSuites: [getValue]
   result: SUCCESS
 
 testGetFromInexistentKey:
@@ -75,6 +91,7 @@ testGetFromInexistentKey:
     - json_path: "my_key"
   description: Tests that get_value.sl fails when the key does not exist
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   outputs:
     - return_code: '-1'
   result: FAILURE
@@ -85,6 +102,7 @@ testGetFromInexistentPath:
     - json_path: "outer_key2,inner_key1"
   description: Tests that get_value.sl fails when the key does not exist
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   outputs:
     - return_code: '-1'
   result: FAILURE
@@ -92,36 +110,53 @@ testGetFromInexistentPath:
 testGetScientificFloat:
   inputs:
     - json_before: '{"number1": 1.9e1, "outer_key2": {"number2": 2.9e+1, "inner_key2": ["list_item1", "list_item2"]}}'
-    - json_path: "outer_key2,number2"
+    - json_path: "$.outer_key2.number2"
     - found_value: '29.0'
   description: Tests that get_value.sl reads scientific format floats correctly
   testFlowPath: io.cloudslang.base.json.test_get_value
+  testSuites: [getValue]
   result: SUCCESS
 
 testGetPathIndexExceeded:
   inputs:
     - json_input: '{"number1": 1.9e1, "outer_key2": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}}'
-    - json_path: "outer_key2,inner_key2,2"
+    - json_path: "$.outer_key2.inner_key2[25]"
+    - found_value: ''
   description: Tests get_value.sl when path to value uses out of range indices
   testFlowPath: io.cloudslang.base.json.get_value
-  result: FAILURE
+  testSuites: [getValue]
+  outputs:
+      - return_code: '0'
 
 testGetFromEmptyJSON:
   inputs:
     - json_input: '{}'
-    - json_path: ""
+    - json_path: "$"
   description: Tests get_value.sl when source JSON is empty
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   outputs:
     - return_result: '{}'
   result: SUCCESS
 
+testGetValueFromEmptyPath:
+  inputs:
+    - json_input: '{}'
+    - json_path: ""
+  description: Tests get_value.sl when source JSON and path is empty
+  testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
+  outputs:
+    - return_code: '-1'
+  result: FAILURE
+
 testGetFromInvalidJSON:
   inputs:
     - json_input: '{"k1": {["v1", "v2"]}}'
     - json_path: "k1"
   description: Tests get_value.sl when source JSON is invalid
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   result: FAILURE
 
 testGetSpecialCharactersValue:
@@ -131,23 +166,37 @@ testGetSpecialCharactersValue:
     - found_value: 'v2!#%@&*`?|>{[-'
   description: Tests get_value.sl when value contains special characters (documented for cloudslang)
   testFlowPath: io.cloudslang.base.json.test_get_value
+  testSuites: [getValue]
   result: SUCCESS
 
 testGetBoolean1:
   inputs:
     - json_before: '{"number1": 1.9e1, "outer_key2": {"boolean": true, "inner_key2": ["list_item1", "list_item2"]}}'
-    - json_path: "outer_key2,boolean"
-    - found_value: "True"
+    - json_path: "$.outer_key2.boolean"
+    - found_value: "true"
   description: Tests that get_value.sl reads boolean values correctly
   testFlowPath: io.cloudslang.base.json.test_get_value
+  testSuites: [getValue]
   result: SUCCESS
 
+testGetValueDupKeys:
+  inputs:
+    - json_input: '{"k1": {["v1", "v2"]}, "k1":"v3"}'
+    - json_path: "k1"
+  description: Tests that get_value.sl reads values from dup keys
+  testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
+  result: FAILURE
+
+
+
 testGetNull:
   inputs:
     - json_input: '{"outer_key1": null, "outer_key2": {"inner_key1": "inner_value1", "inner_key2": ["list_item1", "list_item2"]}}'
     - json_path: "outer_key1"
   description: Tests that get_value.sl correctly gets a null value
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   outputs:
     - return_result: 'null'
   result: SUCCESS
@@ -158,6 +207,7 @@ testGetCaseSensitiveKeys1:
     - json_path: "Key"
   description: Tests that get_value.sl reads correct case-sensitive key
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   outputs:
     - return_result: 'rightValue'
   result: SUCCESS
@@ -168,58 +218,19 @@ testGetCaseSensitiveKeys2:
     - json_path: "key"
   description: Tests that get_value.sl searches for case-sensitive key
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   result: FAILURE
 
 testGetValueInnerArraySingleQuote:
   inputs:
     - json_input: "{'outer_key1': 'outer_value1', 'outer_key2': {'inner_key1': 'inner_value1', 'inner_key2': ['list_item1', 'list_item2']}}"
-    - json_path: 'outer_key2,inner_key2,1'
+    - json_path: '$.outer_key2.inner_key2[1]'
   description: Tests that get_value.sl correctly gets an inner array value from a JSON with single quote
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   outputs:
     - return_result: 'list_item2'
 
-testGetValueSingleQuoteSuccess:
-  inputs:
-    - json_input: "{
-                                                                                         'server' : {
-                                                                                                        'name' : 'server_3',
-                                                                                                        'imageRef' : 'b67f9da0-4a89-4588-b0f5-bf4d19401743',
-                                                                                                        'flavorRef' : '42',
-                                                                                                        'block_device_mapping_v2' : [{
-                                                                                                                                      'source_type' : 'image',
-                                                                                                                                      'uuid' : 'b67f9da0-4a89-4588-b0f5-bf4d19401743',
-                                                                                                                                      'boot_index' : '0',
-                                                                                                                                      'delete_on_termination' : true
-                                                                                                                       }
-                                                                                                        ],
-                                                                                                        'networks' : [],
-                                                                                                        'availability_zone' : 'nova',
-                                                                                                        'key_name' : 'default_key',
-                                                                                                        'adminPass' : '{ENCRYPTED}EuA4xiNWgPmWZkcHvkvb0Q==',
-                                                                                                        'user_data' : 'IyEvYmluL3NoCmFwdC1nZXQgdXBkYXRlCmFwdC1nZXQgaW5zdGFsbCBnaXQgLXk=',
-                                                                                         'metadata' : {
-                                                                                                        'My Server Name' : 'Apache1',
-                                                                                                        'min_ram' : '2'
-                                                                                         },
-                                                                                                        'security_groups' : [{
-                                                                                                                                      'name' : 'default'
-                                                                                                                       }
-                                                                                                        ],
-                                                                                                        'personality' : [{
-                                                                                                                                      'path' : '/etc/banner.txt',
-                                                                                                                                      'contents' : 'ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=='
-                                                                                                                       }
-                                                                                                        ]
-                                                                                         }
-                                                                      }"
-    - json_path: 'server,security_groups'
-  description: Tests that get_value.sl correctly gets an inner value from a JSON with single quotes
-  testFlowPath: io.cloudslang.base.json.get_value
-  outputs:
-    - return_result: "[{'name': 'default'}]"
-  result: SUCCESS
-
 testGetValueSingleQuoteFailure:
   inputs:
     - json_input: "{
@@ -257,7 +268,7 @@ testGetValueSingleQuoteFailure:
     - json_path: 'server,security_groups,personality'
   description: Tests that get_value.sl has a return_code of '-1' for a path that doesn't exist in a JSON with single quotes
   testFlowPath: io.cloudslang.base.json.get_value
+  testSuites: [getValue]
   outputs:
-    - return_result: ''
     - return_code: '-1'
   result: FAILURE
\ No newline at end of file